diff --git a/brightray/common/application_info.cc b/brightray/common/application_info.cc
index 9ae8ba464d78..2286f62c3e05 100644
--- a/brightray/common/application_info.cc
+++ b/brightray/common/application_info.cc
@@ -4,15 +4,15 @@ namespace brightray {
 
 namespace {
 
-std::string overriden_application_name_;
+std::string g_overriden_application_name;
 
 }
 
 void OverrideApplicationName(const std::string& name) {
-    overriden_application_name_ = name;
+  g_overriden_application_name = name;
 }
 std::string GetOverridenApplicationName() {
-    return overriden_application_name_;
+  return g_overriden_application_name;
 }
 
 }  // namespace brightray
diff --git a/brightray/common/application_info_win.cc b/brightray/common/application_info_win.cc
index ceef665ef929..09f094604e5d 100644
--- a/brightray/common/application_info_win.cc
+++ b/brightray/common/application_info_win.cc
@@ -16,7 +16,7 @@ namespace brightray {
 
 namespace {
 
-base::string16 app_user_model_id_;
+base::string16 g_app_user_model_id;
 
 }
 
@@ -37,15 +37,15 @@ std::string GetApplicationVersion() {
 }
 
 void SetAppUserModelID(const base::string16& name) {
-  app_user_model_id_ = name;
-  SetCurrentProcessExplicitAppUserModelID(app_user_model_id_.c_str());
+  g_app_user_model_id = name;
+  SetCurrentProcessExplicitAppUserModelID(g_app_user_model_id.c_str());
 }
 
 PCWSTR GetRawAppUserModelID() {
-  if (app_user_model_id_.empty()) {
+  if (g_app_user_model_id.empty()) {
     PWSTR current_app_id;
     if (SUCCEEDED(GetCurrentProcessExplicitAppUserModelID(&current_app_id))) {
-      app_user_model_id_ = current_app_id;
+      g_app_user_model_id = current_app_id;
     } else {
       std::string name = GetOverridenApplicationName();
       if (name.empty()) {
@@ -58,7 +58,7 @@ PCWSTR GetRawAppUserModelID() {
     CoTaskMemFree(current_app_id);
   }
 
-  return app_user_model_id_.c_str();
+  return g_app_user_model_id.c_str();
 }
 
 bool GetAppUserModelID(ScopedHString* app_id) {