diff --git a/script/lint.js b/script/lint.js
index 8ebf271564f6..aa564d917b01 100755
--- a/script/lint.js
+++ b/script/lint.js
@@ -11,21 +11,21 @@ const SOURCE_ROOT = path.normalize(path.dirname(__dirname))
 const DEPOT_TOOLS = path.resolve(SOURCE_ROOT, '..', 'third_party', 'depot_tools')
 
 const BLACKLIST = new Set([
-  ['atom', 'browser', 'mac', 'atom_application.h'],
-  ['atom', 'browser', 'mac', 'atom_application_delegate.h'],
-  ['atom', 'browser', 'resources', 'win', 'resource.h'],
-  ['atom', 'browser', 'notifications', 'mac', 'notification_center_delegate.h'],
-  ['atom', 'browser', 'ui', 'cocoa', 'atom_menu_controller.h'],
-  ['atom', 'browser', 'ui', 'cocoa', 'atom_ns_window.h'],
-  ['atom', 'browser', 'ui', 'cocoa', 'atom_ns_window_delegate.h'],
-  ['atom', 'browser', 'ui', 'cocoa', 'atom_preview_item.h'],
-  ['atom', 'browser', 'ui', 'cocoa', 'atom_touch_bar.h'],
-  ['atom', 'browser', 'ui', 'cocoa', 'atom_inspectable_web_contents_view.h'],
-  ['atom', 'browser', 'ui', 'cocoa', 'event_dispatching_window.h'],
-  ['atom', 'browser', 'ui', 'cocoa', 'touch_bar_forward_declarations.h'],
-  ['atom', 'browser', 'ui', 'cocoa', 'NSColor+Hex.h'],
-  ['atom', 'browser', 'ui', 'cocoa', 'NSString+ANSI.h'],
-  ['atom', 'common', 'node_includes.h'],
+  ['shell', 'browser', 'mac', 'atom_application.h'],
+  ['shell', 'browser', 'mac', 'atom_application_delegate.h'],
+  ['shell', 'browser', 'resources', 'win', 'resource.h'],
+  ['shell', 'browser', 'notifications', 'mac', 'notification_center_delegate.h'],
+  ['shell', 'browser', 'ui', 'cocoa', 'atom_menu_controller.h'],
+  ['shell', 'browser', 'ui', 'cocoa', 'atom_ns_window.h'],
+  ['shell', 'browser', 'ui', 'cocoa', 'atom_ns_window_delegate.h'],
+  ['shell', 'browser', 'ui', 'cocoa', 'atom_preview_item.h'],
+  ['shell', 'browser', 'ui', 'cocoa', 'atom_touch_bar.h'],
+  ['shell', 'browser', 'ui', 'cocoa', 'atom_inspectable_web_contents_view.h'],
+  ['shell', 'browser', 'ui', 'cocoa', 'event_dispatching_window.h'],
+  ['shell', 'browser', 'ui', 'cocoa', 'touch_bar_forward_declarations.h'],
+  ['shell', 'browser', 'ui', 'cocoa', 'NSColor+Hex.h'],
+  ['shell', 'browser', 'ui', 'cocoa', 'NSString+ANSI.h'],
+  ['shell', 'common', 'node_includes.h'],
   ['spec', 'static', 'jquery-2.0.3.min.js'],
   ['spec', 'ts-smoke', 'electron', 'main.ts'],
   ['spec', 'ts-smoke', 'electron', 'renderer.ts'],
@@ -55,7 +55,7 @@ function cpplint (args) {
 
 const LINTERS = [ {
   key: 'c++',
-  roots: ['atom', 'native_mate'],
+  roots: ['shell', 'native_mate'],
   test: filename => filename.endsWith('.cc') || filename.endsWith('.h'),
   run: (opts, filenames) => {
     if (opts.fix) {
@@ -67,7 +67,7 @@ const LINTERS = [ {
   }
 }, {
   key: 'objc',
-  roots: ['atom'],
+  roots: ['shell'],
   test: filename => filename.endsWith('.mm'),
   run: (opts, filenames) => {
     if (opts.fix) {
diff --git a/shell/app/atom_content_client.h b/shell/app/atom_content_client.h
index 9c7034df435a..f5f4528f38e6 100644
--- a/shell/app/atom_content_client.h
+++ b/shell/app/atom_content_client.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_APP_ATOM_CONTENT_CLIENT_H_
-#define ATOM_APP_ATOM_CONTENT_CLIENT_H_
+#ifndef SHELL_APP_ATOM_CONTENT_CLIENT_H_
+#define SHELL_APP_ATOM_CONTENT_CLIENT_H_
 
 #include <set>
 #include <string>
@@ -39,4 +39,4 @@ class AtomContentClient : public content::ContentClient {
 
 }  // namespace atom
 
-#endif  // ATOM_APP_ATOM_CONTENT_CLIENT_H_
+#endif  // SHELL_APP_ATOM_CONTENT_CLIENT_H_
diff --git a/shell/app/atom_library_main.h b/shell/app/atom_library_main.h
index 71207f0fd790..c5d6f6542580 100644
--- a/shell/app/atom_library_main.h
+++ b/shell/app/atom_library_main.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_APP_ATOM_LIBRARY_MAIN_H_
-#define ATOM_APP_ATOM_LIBRARY_MAIN_H_
+#ifndef SHELL_APP_ATOM_LIBRARY_MAIN_H_
+#define SHELL_APP_ATOM_LIBRARY_MAIN_H_
 
 #include "build/build_config.h"
 #include "electron/buildflags/buildflags.h"
@@ -20,4 +20,4 @@ __attribute__((visibility("default"))) int AtomInitializeICUandStartNode(
 }
 #endif  // OS_MACOSX
 
-#endif  // ATOM_APP_ATOM_LIBRARY_MAIN_H_
+#endif  // SHELL_APP_ATOM_LIBRARY_MAIN_H_
diff --git a/shell/app/atom_main.h b/shell/app/atom_main.h
index 30663a429e93..611eeec830e2 100644
--- a/shell/app/atom_main.h
+++ b/shell/app/atom_main.h
@@ -2,9 +2,9 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_APP_ATOM_MAIN_H_
-#define ATOM_APP_ATOM_MAIN_H_
+#ifndef SHELL_APP_ATOM_MAIN_H_
+#define SHELL_APP_ATOM_MAIN_H_
 
 #include "content/public/app/content_main.h"
 
-#endif  // ATOM_APP_ATOM_MAIN_H_
+#endif  // SHELL_APP_ATOM_MAIN_H_
diff --git a/shell/app/atom_main_delegate.h b/shell/app/atom_main_delegate.h
index de30536a061e..0a1c9f392c75 100644
--- a/shell/app/atom_main_delegate.h
+++ b/shell/app/atom_main_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_APP_ATOM_MAIN_DELEGATE_H_
-#define ATOM_APP_ATOM_MAIN_DELEGATE_H_
+#ifndef SHELL_APP_ATOM_MAIN_DELEGATE_H_
+#define SHELL_APP_ATOM_MAIN_DELEGATE_H_
 
 #include <memory>
 #include <string>
@@ -58,4 +58,4 @@ class AtomMainDelegate : public content::ContentMainDelegate {
 
 }  // namespace atom
 
-#endif  // ATOM_APP_ATOM_MAIN_DELEGATE_H_
+#endif  // SHELL_APP_ATOM_MAIN_DELEGATE_H_
diff --git a/shell/app/atom_main_delegate_mac.h b/shell/app/atom_main_delegate_mac.h
index 18b65da6ee19..766ec316b779 100644
--- a/shell/app/atom_main_delegate_mac.h
+++ b/shell/app/atom_main_delegate_mac.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_APP_ATOM_MAIN_DELEGATE_MAC_H_
-#define ATOM_APP_ATOM_MAIN_DELEGATE_MAC_H_
+#ifndef SHELL_APP_ATOM_MAIN_DELEGATE_MAC_H_
+#define SHELL_APP_ATOM_MAIN_DELEGATE_MAC_H_
 
 namespace atom {
 
@@ -12,4 +12,4 @@ void RegisterAtomCrApp();
 
 }  // namespace atom
 
-#endif  // ATOM_APP_ATOM_MAIN_DELEGATE_MAC_H_
+#endif  // SHELL_APP_ATOM_MAIN_DELEGATE_MAC_H_
diff --git a/shell/app/command_line_args.h b/shell/app/command_line_args.h
index 2c0acc1648ff..6f416d916a19 100644
--- a/shell/app/command_line_args.h
+++ b/shell/app/command_line_args.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_APP_COMMAND_LINE_ARGS_H_
-#define ATOM_APP_COMMAND_LINE_ARGS_H_
+#ifndef SHELL_APP_COMMAND_LINE_ARGS_H_
+#define SHELL_APP_COMMAND_LINE_ARGS_H_
 
 #include "base/command_line.h"
 
@@ -13,4 +13,4 @@ bool CheckCommandLineArguments(int argc, base::CommandLine::CharType** argv);
 
 }  // namespace atom
 
-#endif  // ATOM_APP_COMMAND_LINE_ARGS_H_
+#endif  // SHELL_APP_COMMAND_LINE_ARGS_H_
diff --git a/shell/app/manifests.h b/shell/app/manifests.h
index 2602d954783f..3996cbdadab0 100644
--- a/shell/app/manifests.h
+++ b/shell/app/manifests.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_APP_MANIFESTS_H_
-#define ATOM_APP_MANIFESTS_H_
+#ifndef SHELL_APP_MANIFESTS_H_
+#define SHELL_APP_MANIFESTS_H_
 
 #include <vector>
 
@@ -13,4 +13,4 @@ const service_manager::Manifest& GetElectronContentBrowserOverlayManifest();
 const std::vector<service_manager::Manifest>&
 GetElectronBuiltinServiceManifests();
 
-#endif  // ATOM_APP_MANIFESTS_H_
+#endif  // SHELL_APP_MANIFESTS_H_
diff --git a/shell/app/node_main.h b/shell/app/node_main.h
index b02b7cd5aca5..e1475284aa26 100644
--- a/shell/app/node_main.h
+++ b/shell/app/node_main.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_APP_NODE_MAIN_H_
-#define ATOM_APP_NODE_MAIN_H_
+#ifndef SHELL_APP_NODE_MAIN_H_
+#define SHELL_APP_NODE_MAIN_H_
 
 namespace atom {
 
@@ -11,4 +11,4 @@ int NodeMain(int argc, char* argv[]);
 
 }  // namespace atom
 
-#endif  // ATOM_APP_NODE_MAIN_H_
+#endif  // SHELL_APP_NODE_MAIN_H_
diff --git a/shell/app/uv_task_runner.h b/shell/app/uv_task_runner.h
index 578024d70486..8928cc54aa9a 100644
--- a/shell/app/uv_task_runner.h
+++ b/shell/app/uv_task_runner.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_APP_UV_TASK_RUNNER_H_
-#define ATOM_APP_UV_TASK_RUNNER_H_
+#ifndef SHELL_APP_UV_TASK_RUNNER_H_
+#define SHELL_APP_UV_TASK_RUNNER_H_
 
 #include <map>
 
@@ -42,4 +42,4 @@ class UvTaskRunner : public base::SingleThreadTaskRunner {
 
 }  // namespace atom
 
-#endif  // ATOM_APP_UV_TASK_RUNNER_H_
+#endif  // SHELL_APP_UV_TASK_RUNNER_H_
diff --git a/shell/browser/api/atom_api_app.h b/shell/browser/api/atom_api_app.h
index 5fa556f03c21..07725980de35 100644
--- a/shell/browser/api/atom_api_app.h
+++ b/shell/browser/api/atom_api_app.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_APP_H_
-#define ATOM_BROWSER_API_ATOM_API_APP_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_APP_H_
+#define SHELL_BROWSER_API_ATOM_API_APP_H_
 
 #include <memory>
 #include <string>
@@ -246,4 +246,4 @@ class App : public AtomBrowserClient::Delegate,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_APP_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_APP_H_
diff --git a/shell/browser/api/atom_api_auto_updater.h b/shell/browser/api/atom_api_auto_updater.h
index 6f3d337d1777..40e048e6749b 100644
--- a/shell/browser/api/atom_api_auto_updater.h
+++ b/shell/browser/api/atom_api_auto_updater.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_AUTO_UPDATER_H_
-#define ATOM_BROWSER_API_ATOM_API_AUTO_UPDATER_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_AUTO_UPDATER_H_
+#define SHELL_BROWSER_API_ATOM_API_AUTO_UPDATER_H_
 
 #include <string>
 
@@ -58,4 +58,4 @@ class AutoUpdater : public mate::EventEmitter<AutoUpdater>,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_AUTO_UPDATER_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_AUTO_UPDATER_H_
diff --git a/shell/browser/api/atom_api_browser_view.h b/shell/browser/api/atom_api_browser_view.h
index 24fb992a18c6..5ed8be71c9aa 100644
--- a/shell/browser/api/atom_api_browser_view.h
+++ b/shell/browser/api/atom_api_browser_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_BROWSER_VIEW_H_
-#define ATOM_BROWSER_API_ATOM_API_BROWSER_VIEW_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_BROWSER_VIEW_H_
+#define SHELL_BROWSER_API_ATOM_API_BROWSER_VIEW_H_
 
 #include <memory>
 #include <string>
@@ -75,4 +75,4 @@ class BrowserView : public mate::TrackableObject<BrowserView>,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_BROWSER_VIEW_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_BROWSER_VIEW_H_
diff --git a/shell/browser/api/atom_api_browser_window.h b/shell/browser/api/atom_api_browser_window.h
index e61cf7b0d1b9..a266c334f261 100644
--- a/shell/browser/api/atom_api_browser_window.h
+++ b/shell/browser/api/atom_api_browser_window.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_BROWSER_WINDOW_H_
-#define ATOM_BROWSER_API_ATOM_API_BROWSER_WINDOW_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_BROWSER_WINDOW_H_
+#define SHELL_BROWSER_API_ATOM_API_BROWSER_WINDOW_H_
 
 #include <memory>
 #include <string>
@@ -127,4 +127,4 @@ class BrowserWindow : public TopLevelWindow,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_BROWSER_WINDOW_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_BROWSER_WINDOW_H_
diff --git a/shell/browser/api/atom_api_cookies.h b/shell/browser/api/atom_api_cookies.h
index ca31c8e0fa4d..3c46f4555736 100644
--- a/shell/browser/api/atom_api_cookies.h
+++ b/shell/browser/api/atom_api_cookies.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_COOKIES_H_
-#define ATOM_BROWSER_API_ATOM_API_COOKIES_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_COOKIES_H_
+#define SHELL_BROWSER_API_ATOM_API_COOKIES_H_
 
 #include <memory>
 #include <string>
@@ -62,4 +62,4 @@ class Cookies : public mate::TrackableObject<Cookies> {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_COOKIES_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_COOKIES_H_
diff --git a/shell/browser/api/atom_api_debugger.h b/shell/browser/api/atom_api_debugger.h
index 1991b19c2b6d..18f5a5a51513 100644
--- a/shell/browser/api/atom_api_debugger.h
+++ b/shell/browser/api/atom_api_debugger.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_DEBUGGER_H_
-#define ATOM_BROWSER_API_ATOM_API_DEBUGGER_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_DEBUGGER_H_
+#define SHELL_BROWSER_API_ATOM_API_DEBUGGER_H_
 
 #include <map>
 #include <string>
@@ -75,4 +75,4 @@ class Debugger : public mate::TrackableObject<Debugger>,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_DEBUGGER_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_DEBUGGER_H_
diff --git a/shell/browser/api/atom_api_desktop_capturer.h b/shell/browser/api/atom_api_desktop_capturer.h
index a2e42ad33cb7..af7a141bea12 100644
--- a/shell/browser/api/atom_api_desktop_capturer.h
+++ b/shell/browser/api/atom_api_desktop_capturer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_DESKTOP_CAPTURER_H_
-#define ATOM_BROWSER_API_ATOM_API_DESKTOP_CAPTURER_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_DESKTOP_CAPTURER_H_
+#define SHELL_BROWSER_API_ATOM_API_DESKTOP_CAPTURER_H_
 
 #include <memory>
 #include <string>
@@ -75,4 +75,4 @@ class DesktopCapturer : public mate::TrackableObject<DesktopCapturer>,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_DESKTOP_CAPTURER_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_DESKTOP_CAPTURER_H_
diff --git a/shell/browser/api/atom_api_download_item.h b/shell/browser/api/atom_api_download_item.h
index 41aa0734355f..e65884605087 100644
--- a/shell/browser/api/atom_api_download_item.h
+++ b/shell/browser/api/atom_api_download_item.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_DOWNLOAD_ITEM_H_
-#define ATOM_BROWSER_API_ATOM_API_DOWNLOAD_ITEM_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_DOWNLOAD_ITEM_H_
+#define SHELL_BROWSER_API_ATOM_API_DOWNLOAD_ITEM_H_
 
 #include <string>
 #include <vector>
@@ -71,4 +71,4 @@ class DownloadItem : public mate::TrackableObject<DownloadItem>,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_DOWNLOAD_ITEM_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_DOWNLOAD_ITEM_H_
diff --git a/shell/browser/api/atom_api_global_shortcut.h b/shell/browser/api/atom_api_global_shortcut.h
index d780aca156d3..ec580dcf1521 100644
--- a/shell/browser/api/atom_api_global_shortcut.h
+++ b/shell/browser/api/atom_api_global_shortcut.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_GLOBAL_SHORTCUT_H_
-#define ATOM_BROWSER_API_ATOM_API_GLOBAL_SHORTCUT_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_GLOBAL_SHORTCUT_H_
+#define SHELL_BROWSER_API_ATOM_API_GLOBAL_SHORTCUT_H_
 
 #include <map>
 #include <string>
@@ -55,4 +55,4 @@ class GlobalShortcut : public extensions::GlobalShortcutListener::Observer,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_GLOBAL_SHORTCUT_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_GLOBAL_SHORTCUT_H_
diff --git a/shell/browser/api/atom_api_in_app_purchase.h b/shell/browser/api/atom_api_in_app_purchase.h
index a05b66dfe53b..f595f26a2cd2 100644
--- a/shell/browser/api/atom_api_in_app_purchase.h
+++ b/shell/browser/api/atom_api_in_app_purchase.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_IN_APP_PURCHASE_H_
-#define ATOM_BROWSER_API_ATOM_API_IN_APP_PURCHASE_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_IN_APP_PURCHASE_H_
+#define SHELL_BROWSER_API_ATOM_API_IN_APP_PURCHASE_H_
 
 #include <string>
 #include <vector>
@@ -49,4 +49,4 @@ class InAppPurchase : public mate::EventEmitter<InAppPurchase>,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_IN_APP_PURCHASE_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_IN_APP_PURCHASE_H_
diff --git a/shell/browser/api/atom_api_menu.h b/shell/browser/api/atom_api_menu.h
index a41e3f3f3898..10530138eff3 100644
--- a/shell/browser/api/atom_api_menu.h
+++ b/shell/browser/api/atom_api_menu.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_MENU_H_
-#define ATOM_BROWSER_API_ATOM_API_MENU_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_MENU_H_
+#define SHELL_BROWSER_API_ATOM_API_MENU_H_
 
 #include <memory>
 #include <string>
@@ -142,4 +142,4 @@ struct Converter<atom::AtomMenuModel*> {
 
 }  // namespace mate
 
-#endif  // ATOM_BROWSER_API_ATOM_API_MENU_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_MENU_H_
diff --git a/shell/browser/api/atom_api_menu_mac.h b/shell/browser/api/atom_api_menu_mac.h
index 82c93e026056..68130495e9be 100644
--- a/shell/browser/api/atom_api_menu_mac.h
+++ b/shell/browser/api/atom_api_menu_mac.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_MENU_MAC_H_
-#define ATOM_BROWSER_API_ATOM_API_MENU_MAC_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_MENU_MAC_H_
+#define SHELL_BROWSER_API_ATOM_API_MENU_MAC_H_
 
 #include "shell/browser/api/atom_api_menu.h"
 
@@ -55,4 +55,4 @@ class MenuMac : public Menu {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_MENU_MAC_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_MENU_MAC_H_
diff --git a/shell/browser/api/atom_api_menu_views.h b/shell/browser/api/atom_api_menu_views.h
index e11bd6a83815..329dad6f4463 100644
--- a/shell/browser/api/atom_api_menu_views.h
+++ b/shell/browser/api/atom_api_menu_views.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_MENU_VIEWS_H_
-#define ATOM_BROWSER_API_ATOM_API_MENU_VIEWS_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_MENU_VIEWS_H_
+#define SHELL_BROWSER_API_ATOM_API_MENU_VIEWS_H_
 
 #include <map>
 #include <memory>
@@ -45,4 +45,4 @@ class MenuViews : public Menu {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_MENU_VIEWS_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_MENU_VIEWS_H_
diff --git a/shell/browser/api/atom_api_net.h b/shell/browser/api/atom_api_net.h
index 7f44e1645959..67b10798fd16 100644
--- a/shell/browser/api/atom_api_net.h
+++ b/shell/browser/api/atom_api_net.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_NET_H_
-#define ATOM_BROWSER_API_ATOM_API_NET_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_NET_H_
+#define SHELL_BROWSER_API_ATOM_API_NET_H_
 
 #include "shell/browser/api/event_emitter.h"
 
@@ -32,4 +32,4 @@ class Net : public mate::EventEmitter<Net> {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_NET_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_NET_H_
diff --git a/shell/browser/api/atom_api_net_log.h b/shell/browser/api/atom_api_net_log.h
index 684edd40b3f5..e170c318a2d9 100644
--- a/shell/browser/api/atom_api_net_log.h
+++ b/shell/browser/api/atom_api_net_log.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_NET_LOG_H_
-#define ATOM_BROWSER_API_ATOM_API_NET_LOG_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_NET_LOG_H_
+#define SHELL_BROWSER_API_ATOM_API_NET_LOG_H_
 
 #include <list>
 #include <memory>
@@ -65,4 +65,4 @@ class NetLog : public mate::TrackableObject<NetLog> {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_NET_LOG_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_NET_LOG_H_
diff --git a/shell/browser/api/atom_api_notification.h b/shell/browser/api/atom_api_notification.h
index 71969fb67a09..014eb9080fe1 100644
--- a/shell/browser/api/atom_api_notification.h
+++ b/shell/browser/api/atom_api_notification.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_NOTIFICATION_H_
-#define ATOM_BROWSER_API_ATOM_API_NOTIFICATION_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_NOTIFICATION_H_
+#define SHELL_BROWSER_API_ATOM_API_NOTIFICATION_H_
 
 #include <memory>
 #include <string>
@@ -94,4 +94,4 @@ class Notification : public mate::TrackableObject<Notification>,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_NOTIFICATION_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_NOTIFICATION_H_
diff --git a/shell/browser/api/atom_api_power_monitor.h b/shell/browser/api/atom_api_power_monitor.h
index c551fede6f37..95f937c6aa80 100644
--- a/shell/browser/api/atom_api_power_monitor.h
+++ b/shell/browser/api/atom_api_power_monitor.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_POWER_MONITOR_H_
-#define ATOM_BROWSER_API_ATOM_API_POWER_MONITOR_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_POWER_MONITOR_H_
+#define SHELL_BROWSER_API_ATOM_API_POWER_MONITOR_H_
 
 #include "base/compiler_specific.h"
 #include "native_mate/handle.h"
@@ -78,4 +78,4 @@ class PowerMonitor : public mate::TrackableObject<PowerMonitor>,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_POWER_MONITOR_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_POWER_MONITOR_H_
diff --git a/shell/browser/api/atom_api_power_save_blocker.h b/shell/browser/api/atom_api_power_save_blocker.h
index de4ce1165254..f125900ec283 100644
--- a/shell/browser/api/atom_api_power_save_blocker.h
+++ b/shell/browser/api/atom_api_power_save_blocker.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_POWER_SAVE_BLOCKER_H_
-#define ATOM_BROWSER_API_ATOM_API_POWER_SAVE_BLOCKER_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_POWER_SAVE_BLOCKER_H_
+#define SHELL_BROWSER_API_ATOM_API_POWER_SAVE_BLOCKER_H_
 
 #include <map>
 #include <memory>
@@ -58,4 +58,4 @@ class PowerSaveBlocker : public gin::Wrappable<PowerSaveBlocker> {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_POWER_SAVE_BLOCKER_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_POWER_SAVE_BLOCKER_H_
diff --git a/shell/browser/api/atom_api_protocol.h b/shell/browser/api/atom_api_protocol.h
index 6ef33cbf1a29..f6f4026342a5 100644
--- a/shell/browser/api/atom_api_protocol.h
+++ b/shell/browser/api/atom_api_protocol.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_PROTOCOL_H_
-#define ATOM_BROWSER_API_ATOM_API_PROTOCOL_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_PROTOCOL_H_
+#define SHELL_BROWSER_API_ATOM_API_PROTOCOL_H_
 
 #include <map>
 #include <memory>
@@ -195,4 +195,4 @@ class Protocol : public mate::TrackableObject<Protocol> {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_PROTOCOL_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_PROTOCOL_H_
diff --git a/shell/browser/api/atom_api_protocol_ns.h b/shell/browser/api/atom_api_protocol_ns.h
index 2eb683cdc0c1..c5e806ca4353 100644
--- a/shell/browser/api/atom_api_protocol_ns.h
+++ b/shell/browser/api/atom_api_protocol_ns.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_PROTOCOL_NS_H_
-#define ATOM_BROWSER_API_ATOM_API_PROTOCOL_NS_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_PROTOCOL_NS_H_
+#define SHELL_BROWSER_API_ATOM_API_PROTOCOL_NS_H_
 
 #include <string>
 
@@ -92,4 +92,4 @@ class ProtocolNS : public mate::TrackableObject<ProtocolNS> {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_PROTOCOL_NS_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_PROTOCOL_NS_H_
diff --git a/shell/browser/api/atom_api_screen.h b/shell/browser/api/atom_api_screen.h
index fff1942b9ff9..c68e872eaed3 100644
--- a/shell/browser/api/atom_api_screen.h
+++ b/shell/browser/api/atom_api_screen.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_SCREEN_H_
-#define ATOM_BROWSER_API_ATOM_API_SCREEN_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_SCREEN_H_
+#define SHELL_BROWSER_API_ATOM_API_SCREEN_H_
 
 #include <vector>
 
@@ -56,4 +56,4 @@ class Screen : public mate::EventEmitter<Screen>,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_SCREEN_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_SCREEN_H_
diff --git a/shell/browser/api/atom_api_session.h b/shell/browser/api/atom_api_session.h
index ad89f52a31aa..d08e6fa5bd32 100644
--- a/shell/browser/api/atom_api_session.h
+++ b/shell/browser/api/atom_api_session.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_SESSION_H_
-#define ATOM_BROWSER_API_ATOM_API_SESSION_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_SESSION_H_
+#define SHELL_BROWSER_API_ATOM_API_SESSION_H_
 
 #include <string>
 #include <vector>
@@ -113,4 +113,4 @@ class Session : public mate::TrackableObject<Session>,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_SESSION_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_SESSION_H_
diff --git a/shell/browser/api/atom_api_system_preferences.h b/shell/browser/api/atom_api_system_preferences.h
index 519502621c68..25da9fa28cdc 100644
--- a/shell/browser/api/atom_api_system_preferences.h
+++ b/shell/browser/api/atom_api_system_preferences.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_SYSTEM_PREFERENCES_H_
-#define ATOM_BROWSER_API_ATOM_API_SYSTEM_PREFERENCES_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_SYSTEM_PREFERENCES_H_
+#define SHELL_BROWSER_API_ATOM_API_SYSTEM_PREFERENCES_H_
 
 #include <memory>
 #include <string>
@@ -168,4 +168,4 @@ class SystemPreferences : public mate::EventEmitter<SystemPreferences>
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_SYSTEM_PREFERENCES_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_SYSTEM_PREFERENCES_H_
diff --git a/shell/browser/api/atom_api_top_level_window.h b/shell/browser/api/atom_api_top_level_window.h
index 665f1bd2579e..564e13a49d21 100644
--- a/shell/browser/api/atom_api_top_level_window.h
+++ b/shell/browser/api/atom_api_top_level_window.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_TOP_LEVEL_WINDOW_H_
-#define ATOM_BROWSER_API_ATOM_API_TOP_LEVEL_WINDOW_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_TOP_LEVEL_WINDOW_H_
+#define SHELL_BROWSER_API_ATOM_API_TOP_LEVEL_WINDOW_H_
 
 #include <map>
 #include <memory>
@@ -283,4 +283,4 @@ struct Converter<atom::NativeWindow*> {
 
 }  // namespace mate
 
-#endif  // ATOM_BROWSER_API_ATOM_API_TOP_LEVEL_WINDOW_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_TOP_LEVEL_WINDOW_H_
diff --git a/shell/browser/api/atom_api_tray.h b/shell/browser/api/atom_api_tray.h
index 52c2bcf3c7ab..b0f6ebdd9309 100644
--- a/shell/browser/api/atom_api_tray.h
+++ b/shell/browser/api/atom_api_tray.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_TRAY_H_
-#define ATOM_BROWSER_API_ATOM_API_TRAY_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_TRAY_H_
+#define SHELL_BROWSER_API_ATOM_API_TRAY_H_
 
 #include <memory>
 #include <string>
@@ -89,4 +89,4 @@ class Tray : public mate::TrackableObject<Tray>, public TrayIconObserver {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_TRAY_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_TRAY_H_
diff --git a/shell/browser/api/atom_api_url_request.h b/shell/browser/api/atom_api_url_request.h
index 020fe7ed0748..9dd717ffec70 100644
--- a/shell/browser/api/atom_api_url_request.h
+++ b/shell/browser/api/atom_api_url_request.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_URL_REQUEST_H_
-#define ATOM_BROWSER_API_ATOM_API_URL_REQUEST_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_URL_REQUEST_H_
+#define SHELL_BROWSER_API_ATOM_API_URL_REQUEST_H_
 
 #include <array>
 #include <string>
@@ -211,4 +211,4 @@ class URLRequest : public mate::EventEmitter<URLRequest> {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_URL_REQUEST_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_URL_REQUEST_H_
diff --git a/shell/browser/api/atom_api_view.h b/shell/browser/api/atom_api_view.h
index d706274f1f5f..32dc3723fbde 100644
--- a/shell/browser/api/atom_api_view.h
+++ b/shell/browser/api/atom_api_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_VIEW_H_
-#define ATOM_BROWSER_API_ATOM_API_VIEW_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_VIEW_H_
+#define SHELL_BROWSER_API_ATOM_API_VIEW_H_
 
 #include <memory>
 #include <vector>
@@ -71,4 +71,4 @@ struct Converter<views::View*> {
 
 }  // namespace mate
 
-#endif  // ATOM_BROWSER_API_ATOM_API_VIEW_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_VIEW_H_
diff --git a/shell/browser/api/atom_api_web_contents.h b/shell/browser/api/atom_api_web_contents.h
index 7e0b3f34438e..6e2b11b81f5a 100644
--- a/shell/browser/api/atom_api_web_contents.h
+++ b/shell/browser/api/atom_api_web_contents.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_WEB_CONTENTS_H_
-#define ATOM_BROWSER_API_ATOM_API_WEB_CONTENTS_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_WEB_CONTENTS_H_
+#define SHELL_BROWSER_API_ATOM_API_WEB_CONTENTS_H_
 
 #include <map>
 #include <memory>
@@ -575,4 +575,4 @@ class WebContents : public mate::TrackableObject<WebContents>,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_WEB_CONTENTS_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_WEB_CONTENTS_H_
diff --git a/shell/browser/api/atom_api_web_contents_view.h b/shell/browser/api/atom_api_web_contents_view.h
index eebc0db3e1e7..e0328fc13250 100644
--- a/shell/browser/api/atom_api_web_contents_view.h
+++ b/shell/browser/api/atom_api_web_contents_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_WEB_CONTENTS_VIEW_H_
-#define ATOM_BROWSER_API_ATOM_API_WEB_CONTENTS_VIEW_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_WEB_CONTENTS_VIEW_H_
+#define SHELL_BROWSER_API_ATOM_API_WEB_CONTENTS_VIEW_H_
 
 #include "content/public/browser/web_contents_observer.h"
 #include "native_mate/handle.h"
@@ -46,4 +46,4 @@ class WebContentsView : public View, public content::WebContentsObserver {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_WEB_CONTENTS_VIEW_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_WEB_CONTENTS_VIEW_H_
diff --git a/shell/browser/api/atom_api_web_request.h b/shell/browser/api/atom_api_web_request.h
index 091ff75e4f94..1f9f3eb6ae8c 100644
--- a/shell/browser/api/atom_api_web_request.h
+++ b/shell/browser/api/atom_api_web_request.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_API_WEB_REQUEST_H_
-#define ATOM_BROWSER_API_ATOM_API_WEB_REQUEST_H_
+#ifndef SHELL_BROWSER_API_ATOM_API_WEB_REQUEST_H_
+#define SHELL_BROWSER_API_ATOM_API_WEB_REQUEST_H_
 
 #include "native_mate/arguments.h"
 #include "native_mate/handle.h"
@@ -46,4 +46,4 @@ class WebRequest : public mate::TrackableObject<WebRequest> {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_WEB_REQUEST_H_
+#endif  // SHELL_BROWSER_API_ATOM_API_WEB_REQUEST_H_
diff --git a/shell/browser/api/event.h b/shell/browser/api/event.h
index be4bd8f03a63..c08b0bcecd5e 100644
--- a/shell/browser/api/event.h
+++ b/shell/browser/api/event.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_EVENT_H_
-#define ATOM_BROWSER_API_EVENT_H_
+#ifndef SHELL_BROWSER_API_EVENT_H_
+#define SHELL_BROWSER_API_EVENT_H_
 
 #include "base/optional.h"
 #include "content/public/browser/web_contents_observer.h"
@@ -56,4 +56,4 @@ class Event : public Wrappable<Event>, public content::WebContentsObserver {
 
 }  // namespace mate
 
-#endif  // ATOM_BROWSER_API_EVENT_H_
+#endif  // SHELL_BROWSER_API_EVENT_H_
diff --git a/shell/browser/api/event_emitter.h b/shell/browser/api/event_emitter.h
index 9d326e14dda7..264ad3c57669 100644
--- a/shell/browser/api/event_emitter.h
+++ b/shell/browser/api/event_emitter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_EVENT_EMITTER_H_
-#define ATOM_BROWSER_API_EVENT_EMITTER_H_
+#ifndef SHELL_BROWSER_API_EVENT_EMITTER_H_
+#define SHELL_BROWSER_API_EVENT_EMITTER_H_
 
 #include <utility>
 #include <vector>
@@ -122,4 +122,4 @@ class EventEmitter : public Wrappable<T> {
 
 }  // namespace mate
 
-#endif  // ATOM_BROWSER_API_EVENT_EMITTER_H_
+#endif  // SHELL_BROWSER_API_EVENT_EMITTER_H_
diff --git a/shell/browser/api/frame_subscriber.h b/shell/browser/api/frame_subscriber.h
index 8e6bf310c027..77229768c1a1 100644
--- a/shell/browser/api/frame_subscriber.h
+++ b/shell/browser/api/frame_subscriber.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_FRAME_SUBSCRIBER_H_
-#define ATOM_BROWSER_API_FRAME_SUBSCRIBER_H_
+#ifndef SHELL_BROWSER_API_FRAME_SUBSCRIBER_H_
+#define SHELL_BROWSER_API_FRAME_SUBSCRIBER_H_
 
 #include <memory>
 
@@ -72,4 +72,4 @@ class FrameSubscriber : public content::WebContentsObserver,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_FRAME_SUBSCRIBER_H_
+#endif  // SHELL_BROWSER_API_FRAME_SUBSCRIBER_H_
diff --git a/shell/browser/api/gpu_info_enumerator.h b/shell/browser/api/gpu_info_enumerator.h
index 6f842abd7c2c..8bfac8255aaf 100644
--- a/shell/browser/api/gpu_info_enumerator.h
+++ b/shell/browser/api/gpu_info_enumerator.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_GPU_INFO_ENUMERATOR_H_
-#define ATOM_BROWSER_API_GPU_INFO_ENUMERATOR_H_
+#ifndef SHELL_BROWSER_API_GPU_INFO_ENUMERATOR_H_
+#define SHELL_BROWSER_API_GPU_INFO_ENUMERATOR_H_
 
 #include <memory>
 #include <stack>
@@ -57,4 +57,4 @@ class GPUInfoEnumerator final : public gpu::GPUInfo::Enumerator {
 };
 
 }  // namespace atom
-#endif  // ATOM_BROWSER_API_GPU_INFO_ENUMERATOR_H_
+#endif  // SHELL_BROWSER_API_GPU_INFO_ENUMERATOR_H_
diff --git a/shell/browser/api/gpuinfo_manager.h b/shell/browser/api/gpuinfo_manager.h
index 6b9ba08787ec..8af5f4e6bc9b 100644
--- a/shell/browser/api/gpuinfo_manager.h
+++ b/shell/browser/api/gpuinfo_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_GPUINFO_MANAGER_H_
-#define ATOM_BROWSER_API_GPUINFO_MANAGER_H_
+#ifndef SHELL_BROWSER_API_GPUINFO_MANAGER_H_
+#define SHELL_BROWSER_API_GPUINFO_MANAGER_H_
 
 #include <memory>
 #include <unordered_set>
@@ -46,4 +46,4 @@ class GPUInfoManager : public content::GpuDataManagerObserver {
 };
 
 }  // namespace atom
-#endif  // ATOM_BROWSER_API_GPUINFO_MANAGER_H_
+#endif  // SHELL_BROWSER_API_GPUINFO_MANAGER_H_
diff --git a/shell/browser/api/process_metric.h b/shell/browser/api/process_metric.h
index e8aaecad4d11..a51f1e930627 100644
--- a/shell/browser/api/process_metric.h
+++ b/shell/browser/api/process_metric.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_PROCESS_METRIC_H_
-#define ATOM_BROWSER_API_PROCESS_METRIC_H_
+#ifndef SHELL_BROWSER_API_PROCESS_METRIC_H_
+#define SHELL_BROWSER_API_PROCESS_METRIC_H_
 
 #include <memory>
 
@@ -43,4 +43,4 @@ struct ProcessMetric {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_PROCESS_METRIC_H_
+#endif  // SHELL_BROWSER_API_PROCESS_METRIC_H_
diff --git a/shell/browser/api/save_page_handler.h b/shell/browser/api/save_page_handler.h
index d87e62fc8b67..2eaf21601e8c 100644
--- a/shell/browser/api/save_page_handler.h
+++ b/shell/browser/api/save_page_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_SAVE_PAGE_HANDLER_H_
-#define ATOM_BROWSER_API_SAVE_PAGE_HANDLER_H_
+#ifndef SHELL_BROWSER_API_SAVE_PAGE_HANDLER_H_
+#define SHELL_BROWSER_API_SAVE_PAGE_HANDLER_H_
 
 #include <string>
 
@@ -54,4 +54,4 @@ class SavePageHandler : public content::DownloadManager::Observer,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_SAVE_PAGE_HANDLER_H_
+#endif  // SHELL_BROWSER_API_SAVE_PAGE_HANDLER_H_
diff --git a/shell/browser/api/stream_subscriber.h b/shell/browser/api/stream_subscriber.h
index 62c63dbb6d8c..83aacb154e5f 100644
--- a/shell/browser/api/stream_subscriber.h
+++ b/shell/browser/api/stream_subscriber.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_STREAM_SUBSCRIBER_H_
-#define ATOM_BROWSER_API_STREAM_SUBSCRIBER_H_
+#ifndef SHELL_BROWSER_API_STREAM_SUBSCRIBER_H_
+#define SHELL_BROWSER_API_STREAM_SUBSCRIBER_H_
 
 #include <map>
 #include <memory>
@@ -65,4 +65,4 @@ class StreamSubscriber
 
 }  // namespace mate
 
-#endif  // ATOM_BROWSER_API_STREAM_SUBSCRIBER_H_
+#endif  // SHELL_BROWSER_API_STREAM_SUBSCRIBER_H_
diff --git a/shell/browser/api/trackable_object.h b/shell/browser/api/trackable_object.h
index 28f22a76d577..55063d85f95c 100644
--- a/shell/browser/api/trackable_object.h
+++ b/shell/browser/api/trackable_object.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_TRACKABLE_OBJECT_H_
-#define ATOM_BROWSER_API_TRACKABLE_OBJECT_H_
+#ifndef SHELL_BROWSER_API_TRACKABLE_OBJECT_H_
+#define SHELL_BROWSER_API_TRACKABLE_OBJECT_H_
 
 #include <vector>
 
@@ -134,4 +134,4 @@ atom::KeyWeakMap<int32_t>* TrackableObject<T>::weak_map_ = nullptr;
 
 }  // namespace mate
 
-#endif  // ATOM_BROWSER_API_TRACKABLE_OBJECT_H_
+#endif  // SHELL_BROWSER_API_TRACKABLE_OBJECT_H_
diff --git a/shell/browser/api/views/atom_api_box_layout.h b/shell/browser/api/views/atom_api_box_layout.h
index db95e131322e..73b989ccb150 100644
--- a/shell/browser/api/views/atom_api_box_layout.h
+++ b/shell/browser/api/views/atom_api_box_layout.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_VIEWS_ATOM_API_BOX_LAYOUT_H_
-#define ATOM_BROWSER_API_VIEWS_ATOM_API_BOX_LAYOUT_H_
+#ifndef SHELL_BROWSER_API_VIEWS_ATOM_API_BOX_LAYOUT_H_
+#define SHELL_BROWSER_API_VIEWS_ATOM_API_BOX_LAYOUT_H_
 
 #include "native_mate/handle.h"
 #include "shell/browser/api/views/atom_api_layout_manager.h"
@@ -37,4 +37,4 @@ class BoxLayout : public LayoutManager {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_VIEWS_ATOM_API_BOX_LAYOUT_H_
+#endif  // SHELL_BROWSER_API_VIEWS_ATOM_API_BOX_LAYOUT_H_
diff --git a/shell/browser/api/views/atom_api_button.h b/shell/browser/api/views/atom_api_button.h
index a0b5867fb7c8..bfbdf3ad0264 100644
--- a/shell/browser/api/views/atom_api_button.h
+++ b/shell/browser/api/views/atom_api_button.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_VIEWS_ATOM_API_BUTTON_H_
-#define ATOM_BROWSER_API_VIEWS_ATOM_API_BUTTON_H_
+#ifndef SHELL_BROWSER_API_VIEWS_ATOM_API_BUTTON_H_
+#define SHELL_BROWSER_API_VIEWS_ATOM_API_BUTTON_H_
 
 #include "native_mate/handle.h"
 #include "shell/browser/api/atom_api_view.h"
@@ -37,4 +37,4 @@ class Button : public View, public views::ButtonListener {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_VIEWS_ATOM_API_BUTTON_H_
+#endif  // SHELL_BROWSER_API_VIEWS_ATOM_API_BUTTON_H_
diff --git a/shell/browser/api/views/atom_api_label_button.h b/shell/browser/api/views/atom_api_label_button.h
index ea92c420c9f7..9e63e14406ad 100644
--- a/shell/browser/api/views/atom_api_label_button.h
+++ b/shell/browser/api/views/atom_api_label_button.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_VIEWS_ATOM_API_LABEL_BUTTON_H_
-#define ATOM_BROWSER_API_VIEWS_ATOM_API_LABEL_BUTTON_H_
+#ifndef SHELL_BROWSER_API_VIEWS_ATOM_API_LABEL_BUTTON_H_
+#define SHELL_BROWSER_API_VIEWS_ATOM_API_LABEL_BUTTON_H_
 
 #include <string>
 
@@ -44,4 +44,4 @@ class LabelButton : public Button {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_VIEWS_ATOM_API_LABEL_BUTTON_H_
+#endif  // SHELL_BROWSER_API_VIEWS_ATOM_API_LABEL_BUTTON_H_
diff --git a/shell/browser/api/views/atom_api_layout_manager.h b/shell/browser/api/views/atom_api_layout_manager.h
index 39c6da574d0a..a71ec544244c 100644
--- a/shell/browser/api/views/atom_api_layout_manager.h
+++ b/shell/browser/api/views/atom_api_layout_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_VIEWS_ATOM_API_LAYOUT_MANAGER_H_
-#define ATOM_BROWSER_API_VIEWS_ATOM_API_LAYOUT_MANAGER_H_
+#ifndef SHELL_BROWSER_API_VIEWS_ATOM_API_LAYOUT_MANAGER_H_
+#define SHELL_BROWSER_API_VIEWS_ATOM_API_LAYOUT_MANAGER_H_
 
 #include <memory>
 
@@ -41,4 +41,4 @@ class LayoutManager : public mate::TrackableObject<LayoutManager> {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_VIEWS_ATOM_API_LAYOUT_MANAGER_H_
+#endif  // SHELL_BROWSER_API_VIEWS_ATOM_API_LAYOUT_MANAGER_H_
diff --git a/shell/browser/api/views/atom_api_md_text_button.h b/shell/browser/api/views/atom_api_md_text_button.h
index 6b4563810076..3d01fd26661d 100644
--- a/shell/browser/api/views/atom_api_md_text_button.h
+++ b/shell/browser/api/views/atom_api_md_text_button.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_VIEWS_ATOM_API_MD_TEXT_BUTTON_H_
-#define ATOM_BROWSER_API_VIEWS_ATOM_API_MD_TEXT_BUTTON_H_
+#ifndef SHELL_BROWSER_API_VIEWS_ATOM_API_MD_TEXT_BUTTON_H_
+#define SHELL_BROWSER_API_VIEWS_ATOM_API_MD_TEXT_BUTTON_H_
 
 #include <string>
 
@@ -38,4 +38,4 @@ class MdTextButton : public LabelButton {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_VIEWS_ATOM_API_MD_TEXT_BUTTON_H_
+#endif  // SHELL_BROWSER_API_VIEWS_ATOM_API_MD_TEXT_BUTTON_H_
diff --git a/shell/browser/api/views/atom_api_resize_area.h b/shell/browser/api/views/atom_api_resize_area.h
index 937efe8460d1..b8b8867814e5 100644
--- a/shell/browser/api/views/atom_api_resize_area.h
+++ b/shell/browser/api/views/atom_api_resize_area.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_VIEWS_ATOM_API_RESIZE_AREA_H_
-#define ATOM_BROWSER_API_VIEWS_ATOM_API_RESIZE_AREA_H_
+#ifndef SHELL_BROWSER_API_VIEWS_ATOM_API_RESIZE_AREA_H_
+#define SHELL_BROWSER_API_VIEWS_ATOM_API_RESIZE_AREA_H_
 
 #include "native_mate/handle.h"
 #include "shell/browser/api/atom_api_view.h"
@@ -40,4 +40,4 @@ class ResizeArea : public View, protected views::ResizeAreaDelegate {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_VIEWS_ATOM_API_RESIZE_AREA_H_
+#endif  // SHELL_BROWSER_API_VIEWS_ATOM_API_RESIZE_AREA_H_
diff --git a/shell/browser/api/views/atom_api_text_field.h b/shell/browser/api/views/atom_api_text_field.h
index 95afa055acb1..7f68d51c325a 100644
--- a/shell/browser/api/views/atom_api_text_field.h
+++ b/shell/browser/api/views/atom_api_text_field.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_VIEWS_ATOM_API_TEXT_FIELD_H_
-#define ATOM_BROWSER_API_VIEWS_ATOM_API_TEXT_FIELD_H_
+#ifndef SHELL_BROWSER_API_VIEWS_ATOM_API_TEXT_FIELD_H_
+#define SHELL_BROWSER_API_VIEWS_ATOM_API_TEXT_FIELD_H_
 
 #include "native_mate/handle.h"
 #include "shell/browser/api/atom_api_view.h"
@@ -39,4 +39,4 @@ class TextField : public View {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_VIEWS_ATOM_API_TEXT_FIELD_H_
+#endif  // SHELL_BROWSER_API_VIEWS_ATOM_API_TEXT_FIELD_H_
diff --git a/shell/browser/atom_blob_reader.h b/shell/browser/atom_blob_reader.h
index 7afdda5d2657..27938db24652 100644
--- a/shell/browser/atom_blob_reader.h
+++ b/shell/browser/atom_blob_reader.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_ATOM_BLOB_READER_H_
-#define ATOM_BROWSER_ATOM_BLOB_READER_H_
+#ifndef SHELL_BROWSER_ATOM_BLOB_READER_H_
+#define SHELL_BROWSER_ATOM_BLOB_READER_H_
 
 #include <memory>
 #include <string>
@@ -72,4 +72,4 @@ class AtomBlobReader {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_ATOM_BLOB_READER_H_
+#endif  // SHELL_BROWSER_ATOM_BLOB_READER_H_
diff --git a/shell/browser/atom_browser_client.h b/shell/browser/atom_browser_client.h
index 4cc72e139b15..ceccd0184f08 100644
--- a/shell/browser/atom_browser_client.h
+++ b/shell/browser/atom_browser_client.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_ATOM_BROWSER_CLIENT_H_
-#define ATOM_BROWSER_ATOM_BROWSER_CLIENT_H_
+#ifndef SHELL_BROWSER_ATOM_BROWSER_CLIENT_H_
+#define SHELL_BROWSER_ATOM_BROWSER_CLIENT_H_
 
 #include <map>
 #include <memory>
@@ -260,4 +260,4 @@ class AtomBrowserClient : public content::ContentBrowserClient,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_ATOM_BROWSER_CLIENT_H_
+#endif  // SHELL_BROWSER_ATOM_BROWSER_CLIENT_H_
diff --git a/shell/browser/atom_browser_context.h b/shell/browser/atom_browser_context.h
index 76db20d83fe8..34badf03d7e2 100644
--- a/shell/browser/atom_browser_context.h
+++ b/shell/browser/atom_browser_context.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_ATOM_BROWSER_CONTEXT_H_
-#define ATOM_BROWSER_ATOM_BROWSER_CONTEXT_H_
+#ifndef SHELL_BROWSER_ATOM_BROWSER_CONTEXT_H_
+#define SHELL_BROWSER_ATOM_BROWSER_CONTEXT_H_
 
 #include <map>
 #include <memory>
@@ -177,4 +177,4 @@ class AtomBrowserContext
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_ATOM_BROWSER_CONTEXT_H_
+#endif  // SHELL_BROWSER_ATOM_BROWSER_CONTEXT_H_
diff --git a/shell/browser/atom_browser_main_parts.h b/shell/browser/atom_browser_main_parts.h
index f9dc99d9d94b..a8a295dbc886 100644
--- a/shell/browser/atom_browser_main_parts.h
+++ b/shell/browser/atom_browser_main_parts.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_ATOM_BROWSER_MAIN_PARTS_H_
-#define ATOM_BROWSER_ATOM_BROWSER_MAIN_PARTS_H_
+#ifndef SHELL_BROWSER_ATOM_BROWSER_MAIN_PARTS_H_
+#define SHELL_BROWSER_ATOM_BROWSER_MAIN_PARTS_H_
 
 #include <list>
 #include <memory>
@@ -143,4 +143,4 @@ class AtomBrowserMainParts : public content::BrowserMainParts {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_ATOM_BROWSER_MAIN_PARTS_H_
+#endif  // SHELL_BROWSER_ATOM_BROWSER_MAIN_PARTS_H_
diff --git a/shell/browser/atom_download_manager_delegate.h b/shell/browser/atom_download_manager_delegate.h
index d9905ea8fb0a..d6539eca1dc9 100644
--- a/shell/browser/atom_download_manager_delegate.h
+++ b/shell/browser/atom_download_manager_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_ATOM_DOWNLOAD_MANAGER_DELEGATE_H_
-#define ATOM_BROWSER_ATOM_DOWNLOAD_MANAGER_DELEGATE_H_
+#ifndef SHELL_BROWSER_ATOM_DOWNLOAD_MANAGER_DELEGATE_H_
+#define SHELL_BROWSER_ATOM_DOWNLOAD_MANAGER_DELEGATE_H_
 
 #include <string>
 
@@ -58,4 +58,4 @@ class AtomDownloadManagerDelegate : public content::DownloadManagerDelegate {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_ATOM_DOWNLOAD_MANAGER_DELEGATE_H_
+#endif  // SHELL_BROWSER_ATOM_DOWNLOAD_MANAGER_DELEGATE_H_
diff --git a/shell/browser/atom_gpu_client.h b/shell/browser/atom_gpu_client.h
index cfa180725c3d..391e1a762832 100644
--- a/shell/browser/atom_gpu_client.h
+++ b/shell/browser/atom_gpu_client.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_ATOM_GPU_CLIENT_H_
-#define ATOM_BROWSER_ATOM_GPU_CLIENT_H_
+#ifndef SHELL_BROWSER_ATOM_GPU_CLIENT_H_
+#define SHELL_BROWSER_ATOM_GPU_CLIENT_H_
 
 #include "content/public/gpu/content_gpu_client.h"
 
@@ -22,4 +22,4 @@ class AtomGpuClient : public content::ContentGpuClient {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_ATOM_GPU_CLIENT_H_
+#endif  // SHELL_BROWSER_ATOM_GPU_CLIENT_H_
diff --git a/shell/browser/atom_javascript_dialog_manager.h b/shell/browser/atom_javascript_dialog_manager.h
index 2996b5d206ed..8acc994046dc 100644
--- a/shell/browser/atom_javascript_dialog_manager.h
+++ b/shell/browser/atom_javascript_dialog_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_ATOM_JAVASCRIPT_DIALOG_MANAGER_H_
-#define ATOM_BROWSER_ATOM_JAVASCRIPT_DIALOG_MANAGER_H_
+#ifndef SHELL_BROWSER_ATOM_JAVASCRIPT_DIALOG_MANAGER_H_
+#define SHELL_BROWSER_ATOM_JAVASCRIPT_DIALOG_MANAGER_H_
 
 #include <map>
 #include <string>
@@ -48,4 +48,4 @@ class AtomJavaScriptDialogManager : public content::JavaScriptDialogManager {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_ATOM_JAVASCRIPT_DIALOG_MANAGER_H_
+#endif  // SHELL_BROWSER_ATOM_JAVASCRIPT_DIALOG_MANAGER_H_
diff --git a/shell/browser/atom_navigation_throttle.h b/shell/browser/atom_navigation_throttle.h
index 779258aa14f4..8e57735e3302 100644
--- a/shell/browser/atom_navigation_throttle.h
+++ b/shell/browser/atom_navigation_throttle.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_ATOM_NAVIGATION_THROTTLE_H_
-#define ATOM_BROWSER_ATOM_NAVIGATION_THROTTLE_H_
+#ifndef SHELL_BROWSER_ATOM_NAVIGATION_THROTTLE_H_
+#define SHELL_BROWSER_ATOM_NAVIGATION_THROTTLE_H_
 
 #include "content/public/browser/navigation_throttle.h"
 
@@ -24,4 +24,4 @@ class AtomNavigationThrottle : public content::NavigationThrottle {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_ATOM_NAVIGATION_THROTTLE_H_
+#endif  // SHELL_BROWSER_ATOM_NAVIGATION_THROTTLE_H_
diff --git a/shell/browser/atom_paths.h b/shell/browser/atom_paths.h
index 01e03056a908..dae4354eb08e 100644
--- a/shell/browser/atom_paths.h
+++ b/shell/browser/atom_paths.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_ATOM_PATHS_H_
-#define ATOM_BROWSER_ATOM_PATHS_H_
+#ifndef SHELL_BROWSER_ATOM_PATHS_H_
+#define SHELL_BROWSER_ATOM_PATHS_H_
 
 #include "base/base_paths.h"
 
@@ -47,4 +47,4 @@ static_assert(PATH_START < PATH_END, "invalid PATH boundaries");
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_ATOM_PATHS_H_
+#endif  // SHELL_BROWSER_ATOM_PATHS_H_
diff --git a/shell/browser/atom_permission_manager.h b/shell/browser/atom_permission_manager.h
index 69329ba9898a..27e5e34f7212 100644
--- a/shell/browser/atom_permission_manager.h
+++ b/shell/browser/atom_permission_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_ATOM_PERMISSION_MANAGER_H_
-#define ATOM_BROWSER_ATOM_PERMISSION_MANAGER_H_
+#ifndef SHELL_BROWSER_ATOM_PERMISSION_MANAGER_H_
+#define SHELL_BROWSER_ATOM_PERMISSION_MANAGER_H_
 
 #include <map>
 #include <memory>
@@ -112,4 +112,4 @@ class AtomPermissionManager : public content::PermissionControllerDelegate {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_ATOM_PERMISSION_MANAGER_H_
+#endif  // SHELL_BROWSER_ATOM_PERMISSION_MANAGER_H_
diff --git a/shell/browser/atom_quota_permission_context.h b/shell/browser/atom_quota_permission_context.h
index 1b04f8e05b16..00c536560a07 100644
--- a/shell/browser/atom_quota_permission_context.h
+++ b/shell/browser/atom_quota_permission_context.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_ATOM_QUOTA_PERMISSION_CONTEXT_H_
-#define ATOM_BROWSER_ATOM_QUOTA_PERMISSION_CONTEXT_H_
+#ifndef SHELL_BROWSER_ATOM_QUOTA_PERMISSION_CONTEXT_H_
+#define SHELL_BROWSER_ATOM_QUOTA_PERMISSION_CONTEXT_H_
 
 #include "content/public/browser/quota_permission_context.h"
 #include "content/public/common/storage_quota_params.h"
@@ -29,4 +29,4 @@ class AtomQuotaPermissionContext : public content::QuotaPermissionContext {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_ATOM_QUOTA_PERMISSION_CONTEXT_H_
+#endif  // SHELL_BROWSER_ATOM_QUOTA_PERMISSION_CONTEXT_H_
diff --git a/shell/browser/atom_speech_recognition_manager_delegate.h b/shell/browser/atom_speech_recognition_manager_delegate.h
index c551c1739d03..f35b99482d5a 100644
--- a/shell/browser/atom_speech_recognition_manager_delegate.h
+++ b/shell/browser/atom_speech_recognition_manager_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_ATOM_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_
-#define ATOM_BROWSER_ATOM_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_
+#ifndef SHELL_BROWSER_ATOM_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_
+#define SHELL_BROWSER_ATOM_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_
 
 #include <string>
 #include <vector>
@@ -53,4 +53,4 @@ class AtomSpeechRecognitionManagerDelegate
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_ATOM_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_
+#endif  // SHELL_BROWSER_ATOM_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_
diff --git a/shell/browser/atom_web_ui_controller_factory.h b/shell/browser/atom_web_ui_controller_factory.h
index 36c76d1b8419..ae9b0856d601 100644
--- a/shell/browser/atom_web_ui_controller_factory.h
+++ b/shell/browser/atom_web_ui_controller_factory.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_ATOM_WEB_UI_CONTROLLER_FACTORY_H_
-#define ATOM_BROWSER_ATOM_WEB_UI_CONTROLLER_FACTORY_H_
+#ifndef SHELL_BROWSER_ATOM_WEB_UI_CONTROLLER_FACTORY_H_
+#define SHELL_BROWSER_ATOM_WEB_UI_CONTROLLER_FACTORY_H_
 
 #include <memory>
 
@@ -40,4 +40,4 @@ class AtomWebUIControllerFactory : public content::WebUIControllerFactory {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_ATOM_WEB_UI_CONTROLLER_FACTORY_H_
+#endif  // SHELL_BROWSER_ATOM_WEB_UI_CONTROLLER_FACTORY_H_
diff --git a/shell/browser/auto_updater.h b/shell/browser/auto_updater.h
index 7be3e56db3e9..98f1ef6a9464 100644
--- a/shell/browser/auto_updater.h
+++ b/shell/browser/auto_updater.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_AUTO_UPDATER_H_
-#define ATOM_BROWSER_AUTO_UPDATER_H_
+#ifndef SHELL_BROWSER_AUTO_UPDATER_H_
+#define SHELL_BROWSER_AUTO_UPDATER_H_
 
 #include <map>
 #include <string>
@@ -67,4 +67,4 @@ class AutoUpdater {
 
 }  // namespace auto_updater
 
-#endif  // ATOM_BROWSER_AUTO_UPDATER_H_
+#endif  // SHELL_BROWSER_AUTO_UPDATER_H_
diff --git a/shell/browser/browser.h b/shell/browser/browser.h
index 7f30c8a28358..fe6279970f13 100644
--- a/shell/browser/browser.h
+++ b/shell/browser/browser.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_BROWSER_H_
-#define ATOM_BROWSER_BROWSER_H_
+#ifndef SHELL_BROWSER_BROWSER_H_
+#define SHELL_BROWSER_BROWSER_H_
 
 #include <memory>
 #include <string>
@@ -314,4 +314,4 @@ class Browser : public WindowListObserver {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_BROWSER_H_
+#endif  // SHELL_BROWSER_BROWSER_H_
diff --git a/shell/browser/browser_observer.h b/shell/browser/browser_observer.h
index 01bd23af7009..02fe91f47f36 100644
--- a/shell/browser/browser_observer.h
+++ b/shell/browser/browser_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_BROWSER_OBSERVER_H_
-#define ATOM_BROWSER_BROWSER_OBSERVER_H_
+#ifndef SHELL_BROWSER_BROWSER_OBSERVER_H_
+#define SHELL_BROWSER_BROWSER_OBSERVER_H_
 
 #include <string>
 
@@ -89,4 +89,4 @@ class BrowserObserver : public base::CheckedObserver {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_BROWSER_OBSERVER_H_
+#endif  // SHELL_BROWSER_BROWSER_OBSERVER_H_
diff --git a/shell/browser/browser_process_impl.h b/shell/browser/browser_process_impl.h
index 64967d46d03b..23a483957819 100644
--- a/shell/browser/browser_process_impl.h
+++ b/shell/browser/browser_process_impl.h
@@ -7,8 +7,8 @@
 // will return NULL if the service is not available, so callers must check for
 // this condition.
 
-#ifndef ATOM_BROWSER_BROWSER_PROCESS_IMPL_H_
-#define ATOM_BROWSER_BROWSER_PROCESS_IMPL_H_
+#ifndef SHELL_BROWSER_BROWSER_PROCESS_IMPL_H_
+#define SHELL_BROWSER_BROWSER_PROCESS_IMPL_H_
 
 #include <memory>
 #include <string>
@@ -127,4 +127,4 @@ class BrowserProcessImpl : public BrowserProcess {
   DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl);
 };
 
-#endif  // ATOM_BROWSER_BROWSER_PROCESS_IMPL_H_
+#endif  // SHELL_BROWSER_BROWSER_PROCESS_IMPL_H_
diff --git a/shell/browser/child_web_contents_tracker.h b/shell/browser/child_web_contents_tracker.h
index 05f981ab073d..9da6b9af411f 100644
--- a/shell/browser/child_web_contents_tracker.h
+++ b/shell/browser/child_web_contents_tracker.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_CHILD_WEB_CONTENTS_TRACKER_H_
-#define ATOM_BROWSER_CHILD_WEB_CONTENTS_TRACKER_H_
+#ifndef SHELL_BROWSER_CHILD_WEB_CONTENTS_TRACKER_H_
+#define SHELL_BROWSER_CHILD_WEB_CONTENTS_TRACKER_H_
 
 #include <string>
 
@@ -29,4 +29,4 @@ struct ChildWebContentsTracker
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_CHILD_WEB_CONTENTS_TRACKER_H_
+#endif  // SHELL_BROWSER_CHILD_WEB_CONTENTS_TRACKER_H_
diff --git a/shell/browser/common_web_contents_delegate.h b/shell/browser/common_web_contents_delegate.h
index 7347d1dbdf3c..c475054e2e64 100644
--- a/shell/browser/common_web_contents_delegate.h
+++ b/shell/browser/common_web_contents_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_COMMON_WEB_CONTENTS_DELEGATE_H_
-#define ATOM_BROWSER_COMMON_WEB_CONTENTS_DELEGATE_H_
+#ifndef SHELL_BROWSER_COMMON_WEB_CONTENTS_DELEGATE_H_
+#define SHELL_BROWSER_COMMON_WEB_CONTENTS_DELEGATE_H_
 
 #include <map>
 #include <memory>
@@ -215,4 +215,4 @@ class CommonWebContentsDelegate : public content::WebContentsDelegate,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_COMMON_WEB_CONTENTS_DELEGATE_H_
+#endif  // SHELL_BROWSER_COMMON_WEB_CONTENTS_DELEGATE_H_
diff --git a/shell/browser/cookie_change_notifier.h b/shell/browser/cookie_change_notifier.h
index 49a0ea50bf97..0b8c8badf1d2 100644
--- a/shell/browser/cookie_change_notifier.h
+++ b/shell/browser/cookie_change_notifier.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_COOKIE_CHANGE_NOTIFIER_H_
-#define ATOM_BROWSER_COOKIE_CHANGE_NOTIFIER_H_
+#ifndef SHELL_BROWSER_COOKIE_CHANGE_NOTIFIER_H_
+#define SHELL_BROWSER_COOKIE_CHANGE_NOTIFIER_H_
 
 #include <memory>
 
@@ -45,4 +45,4 @@ class CookieChangeNotifier : public network::mojom::CookieChangeListener {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_COOKIE_CHANGE_NOTIFIER_H_
+#endif  // SHELL_BROWSER_COOKIE_CHANGE_NOTIFIER_H_
diff --git a/shell/browser/fake_location_provider.h b/shell/browser/fake_location_provider.h
index 666d384c8c85..ebac4d12e013 100644
--- a/shell/browser/fake_location_provider.h
+++ b/shell/browser/fake_location_provider.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_FAKE_LOCATION_PROVIDER_H_
-#define ATOM_BROWSER_FAKE_LOCATION_PROVIDER_H_
+#ifndef SHELL_BROWSER_FAKE_LOCATION_PROVIDER_H_
+#define SHELL_BROWSER_FAKE_LOCATION_PROVIDER_H_
 
 #include "base/macros.h"
 #include "services/device/public/cpp/geolocation/location_provider.h"
@@ -33,4 +33,4 @@ class FakeLocationProvider : public device::LocationProvider {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_FAKE_LOCATION_PROVIDER_H_
+#endif  // SHELL_BROWSER_FAKE_LOCATION_PROVIDER_H_
diff --git a/shell/browser/feature_list.h b/shell/browser/feature_list.h
index 0d3902f63060..bafad71d8497 100644
--- a/shell/browser/feature_list.h
+++ b/shell/browser/feature_list.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_FEATURE_LIST_H_
-#define ATOM_BROWSER_FEATURE_LIST_H_
+#ifndef SHELL_BROWSER_FEATURE_LIST_H_
+#define SHELL_BROWSER_FEATURE_LIST_H_
 
 namespace atom {
 void InitializeFeatureList();
 }
 
-#endif  // ATOM_BROWSER_FEATURE_LIST_H_
+#endif  // SHELL_BROWSER_FEATURE_LIST_H_
diff --git a/shell/browser/font_defaults.h b/shell/browser/font_defaults.h
index 95ffe6b0194f..c19e14db90b8 100644
--- a/shell/browser/font_defaults.h
+++ b/shell/browser/font_defaults.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_FONT_DEFAULTS_H_
-#define ATOM_BROWSER_FONT_DEFAULTS_H_
+#ifndef SHELL_BROWSER_FONT_DEFAULTS_H_
+#define SHELL_BROWSER_FONT_DEFAULTS_H_
 
 namespace content {
 struct WebPreferences;
@@ -15,4 +15,4 @@ void SetFontDefaults(content::WebPreferences* prefs);
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_FONT_DEFAULTS_H_
+#endif  // SHELL_BROWSER_FONT_DEFAULTS_H_
diff --git a/shell/browser/io_thread.h b/shell/browser/io_thread.h
index c5baca3e3299..4250d25a0a62 100644
--- a/shell/browser/io_thread.h
+++ b/shell/browser/io_thread.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_IO_THREAD_H_
-#define ATOM_BROWSER_IO_THREAD_H_
+#ifndef SHELL_BROWSER_IO_THREAD_H_
+#define SHELL_BROWSER_IO_THREAD_H_
 
 #include <memory>
 #include <set>
@@ -72,4 +72,4 @@ class IOThread : public content::BrowserThreadDelegate {
   DISALLOW_COPY_AND_ASSIGN(IOThread);
 };
 
-#endif  // ATOM_BROWSER_IO_THREAD_H_
+#endif  // SHELL_BROWSER_IO_THREAD_H_
diff --git a/shell/browser/javascript_environment.h b/shell/browser/javascript_environment.h
index e1a3d921d360..354398d9576f 100644
--- a/shell/browser/javascript_environment.h
+++ b/shell/browser/javascript_environment.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_JAVASCRIPT_ENVIRONMENT_H_
-#define ATOM_BROWSER_JAVASCRIPT_ENVIRONMENT_H_
+#ifndef SHELL_BROWSER_JAVASCRIPT_ENVIRONMENT_H_
+#define SHELL_BROWSER_JAVASCRIPT_ENVIRONMENT_H_
 
 #include <memory>
 
@@ -66,4 +66,4 @@ class NodeEnvironment {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_JAVASCRIPT_ENVIRONMENT_H_
+#endif  // SHELL_BROWSER_JAVASCRIPT_ENVIRONMENT_H_
diff --git a/shell/browser/lib/bluetooth_chooser.h b/shell/browser/lib/bluetooth_chooser.h
index 50ce671624af..f9346ccf8d41 100644
--- a/shell/browser/lib/bluetooth_chooser.h
+++ b/shell/browser/lib/bluetooth_chooser.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_LIB_BLUETOOTH_CHOOSER_H_
-#define ATOM_BROWSER_LIB_BLUETOOTH_CHOOSER_H_
+#ifndef SHELL_BROWSER_LIB_BLUETOOTH_CHOOSER_H_
+#define SHELL_BROWSER_LIB_BLUETOOTH_CHOOSER_H_
 
 #include <map>
 #include <string>
@@ -47,4 +47,4 @@ class BluetoothChooser : public content::BluetoothChooser {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_LIB_BLUETOOTH_CHOOSER_H_
+#endif  // SHELL_BROWSER_LIB_BLUETOOTH_CHOOSER_H_
diff --git a/shell/browser/lib/power_observer.h b/shell/browser/lib/power_observer.h
index 2409e1fc9baa..5d7e729020ac 100644
--- a/shell/browser/lib/power_observer.h
+++ b/shell/browser/lib/power_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_LIB_POWER_OBSERVER_H_
-#define ATOM_BROWSER_LIB_POWER_OBSERVER_H_
+#ifndef SHELL_BROWSER_LIB_POWER_OBSERVER_H_
+#define SHELL_BROWSER_LIB_POWER_OBSERVER_H_
 
 #include "base/macros.h"
 
@@ -23,4 +23,4 @@ typedef base::PowerObserver PowerObserver;
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_LIB_POWER_OBSERVER_H_
+#endif  // SHELL_BROWSER_LIB_POWER_OBSERVER_H_
diff --git a/shell/browser/lib/power_observer_linux.h b/shell/browser/lib/power_observer_linux.h
index f3173e600159..5ccf5af594fe 100644
--- a/shell/browser/lib/power_observer_linux.h
+++ b/shell/browser/lib/power_observer_linux.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_LIB_POWER_OBSERVER_LINUX_H_
-#define ATOM_BROWSER_LIB_POWER_OBSERVER_LINUX_H_
+#ifndef SHELL_BROWSER_LIB_POWER_OBSERVER_LINUX_H_
+#define SHELL_BROWSER_LIB_POWER_OBSERVER_LINUX_H_
 
 #include <string>
 
@@ -51,4 +51,4 @@ class PowerObserverLinux : public base::PowerObserver {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_LIB_POWER_OBSERVER_LINUX_H_
+#endif  // SHELL_BROWSER_LIB_POWER_OBSERVER_LINUX_H_
diff --git a/shell/browser/loader/layered_resource_handler.h b/shell/browser/loader/layered_resource_handler.h
index 78bb275050e2..23d95d8e6430 100644
--- a/shell/browser/loader/layered_resource_handler.h
+++ b/shell/browser/loader/layered_resource_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_LOADER_LAYERED_RESOURCE_HANDLER_H_
-#define ATOM_BROWSER_LOADER_LAYERED_RESOURCE_HANDLER_H_
+#ifndef SHELL_BROWSER_LOADER_LAYERED_RESOURCE_HANDLER_H_
+#define SHELL_BROWSER_LOADER_LAYERED_RESOURCE_HANDLER_H_
 
 #include <memory>
 
@@ -41,4 +41,4 @@ class LayeredResourceHandler : public content::LayeredResourceHandler {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_LOADER_LAYERED_RESOURCE_HANDLER_H_
+#endif  // SHELL_BROWSER_LOADER_LAYERED_RESOURCE_HANDLER_H_
diff --git a/shell/browser/login_handler.h b/shell/browser/login_handler.h
index 771e82139af5..76b3325ee228 100644
--- a/shell/browser/login_handler.h
+++ b/shell/browser/login_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_LOGIN_HANDLER_H_
-#define ATOM_BROWSER_LOGIN_HANDLER_H_
+#ifndef SHELL_BROWSER_LOGIN_HANDLER_H_
+#define SHELL_BROWSER_LOGIN_HANDLER_H_
 
 #include <memory>
 
@@ -74,4 +74,4 @@ class LoginHandler : public base::RefCountedThreadSafe<LoginHandler> {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_LOGIN_HANDLER_H_
+#endif  // SHELL_BROWSER_LOGIN_HANDLER_H_
diff --git a/shell/browser/mac/dict_util.h b/shell/browser/mac/dict_util.h
index 740f2c71377d..242a9e570416 100644
--- a/shell/browser/mac/dict_util.h
+++ b/shell/browser/mac/dict_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_MAC_DICT_UTIL_H_
-#define ATOM_BROWSER_MAC_DICT_UTIL_H_
+#ifndef SHELL_BROWSER_MAC_DICT_UTIL_H_
+#define SHELL_BROWSER_MAC_DICT_UTIL_H_
 
 #include <memory>
 
@@ -27,4 +27,4 @@ std::unique_ptr<base::DictionaryValue> NSDictionaryToDictionaryValue(
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_MAC_DICT_UTIL_H_
+#endif  // SHELL_BROWSER_MAC_DICT_UTIL_H_
diff --git a/shell/browser/mac/in_app_purchase.h b/shell/browser/mac/in_app_purchase.h
index 852a60199a07..7534823aa10c 100644
--- a/shell/browser/mac/in_app_purchase.h
+++ b/shell/browser/mac/in_app_purchase.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_MAC_IN_APP_PURCHASE_H_
-#define ATOM_BROWSER_MAC_IN_APP_PURCHASE_H_
+#ifndef SHELL_BROWSER_MAC_IN_APP_PURCHASE_H_
+#define SHELL_BROWSER_MAC_IN_APP_PURCHASE_H_
 
 #include <string>
 
@@ -31,4 +31,4 @@ void PurchaseProduct(const std::string& productID,
 
 }  // namespace in_app_purchase
 
-#endif  // ATOM_BROWSER_MAC_IN_APP_PURCHASE_H_
+#endif  // SHELL_BROWSER_MAC_IN_APP_PURCHASE_H_
diff --git a/shell/browser/mac/in_app_purchase_observer.h b/shell/browser/mac/in_app_purchase_observer.h
index 845898d17a05..f16af8696f02 100644
--- a/shell/browser/mac/in_app_purchase_observer.h
+++ b/shell/browser/mac/in_app_purchase_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_MAC_IN_APP_PURCHASE_OBSERVER_H_
-#define ATOM_BROWSER_MAC_IN_APP_PURCHASE_OBSERVER_H_
+#ifndef SHELL_BROWSER_MAC_IN_APP_PURCHASE_OBSERVER_H_
+#define SHELL_BROWSER_MAC_IN_APP_PURCHASE_OBSERVER_H_
 
 #include <string>
 #include <vector>
@@ -60,4 +60,4 @@ class TransactionObserver {
 
 }  // namespace in_app_purchase
 
-#endif  // ATOM_BROWSER_MAC_IN_APP_PURCHASE_OBSERVER_H_
+#endif  // SHELL_BROWSER_MAC_IN_APP_PURCHASE_OBSERVER_H_
diff --git a/shell/browser/mac/in_app_purchase_product.h b/shell/browser/mac/in_app_purchase_product.h
index daf15aa891f6..718629180529 100644
--- a/shell/browser/mac/in_app_purchase_product.h
+++ b/shell/browser/mac/in_app_purchase_product.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_MAC_IN_APP_PURCHASE_PRODUCT_H_
-#define ATOM_BROWSER_MAC_IN_APP_PURCHASE_PRODUCT_H_
+#ifndef SHELL_BROWSER_MAC_IN_APP_PURCHASE_PRODUCT_H_
+#define SHELL_BROWSER_MAC_IN_APP_PURCHASE_PRODUCT_H_
 
 #include <string>
 #include <vector>
@@ -48,4 +48,4 @@ void GetProducts(const std::vector<std::string>& productIDs,
 
 }  // namespace in_app_purchase
 
-#endif  // ATOM_BROWSER_MAC_IN_APP_PURCHASE_PRODUCT_H_
+#endif  // SHELL_BROWSER_MAC_IN_APP_PURCHASE_PRODUCT_H_
diff --git a/shell/browser/media/media_capture_devices_dispatcher.h b/shell/browser/media/media_capture_devices_dispatcher.h
index 581032031def..3077f2618af9 100644
--- a/shell/browser/media/media_capture_devices_dispatcher.h
+++ b/shell/browser/media/media_capture_devices_dispatcher.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef ATOM_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_
-#define ATOM_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_
+#ifndef SHELL_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_
+#define SHELL_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_
 
 #include <string>
 
@@ -87,4 +87,4 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_
+#endif  // SHELL_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_
diff --git a/shell/browser/media/media_device_id_salt.h b/shell/browser/media/media_device_id_salt.h
index ffe862c3c9a3..8ab02afead07 100644
--- a/shell/browser/media/media_device_id_salt.h
+++ b/shell/browser/media/media_device_id_salt.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_MEDIA_MEDIA_DEVICE_ID_SALT_H_
-#define ATOM_BROWSER_MEDIA_MEDIA_DEVICE_ID_SALT_H_
+#ifndef SHELL_BROWSER_MEDIA_MEDIA_DEVICE_ID_SALT_H_
+#define SHELL_BROWSER_MEDIA_MEDIA_DEVICE_ID_SALT_H_
 
 #include <string>
 
@@ -36,4 +36,4 @@ class MediaDeviceIDSalt {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_MEDIA_MEDIA_DEVICE_ID_SALT_H_
+#endif  // SHELL_BROWSER_MEDIA_MEDIA_DEVICE_ID_SALT_H_
diff --git a/shell/browser/media/media_stream_devices_controller.h b/shell/browser/media/media_stream_devices_controller.h
index 058ad18ad7fa..dc339752b8d5 100644
--- a/shell/browser/media/media_stream_devices_controller.h
+++ b/shell/browser/media/media_stream_devices_controller.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef ATOM_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_
-#define ATOM_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_
+#ifndef SHELL_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_
+#define SHELL_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_
 
 #include "content/public/browser/web_contents_delegate.h"
 #include "third_party/blink/public/common/mediastream/media_stream_request.h"
@@ -43,4 +43,4 @@ class MediaStreamDevicesController {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_
+#endif  // SHELL_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_
diff --git a/shell/browser/microtasks_runner.h b/shell/browser/microtasks_runner.h
index c4c8e6d80052..0c516a521863 100644
--- a/shell/browser/microtasks_runner.h
+++ b/shell/browser/microtasks_runner.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_MICROTASKS_RUNNER_H_
-#define ATOM_BROWSER_MICROTASKS_RUNNER_H_
+#ifndef SHELL_BROWSER_MICROTASKS_RUNNER_H_
+#define SHELL_BROWSER_MICROTASKS_RUNNER_H_
 
 #include "base/message_loop/message_loop.h"
 
@@ -33,4 +33,4 @@ class MicrotasksRunner : public base::MessageLoop::TaskObserver {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_MICROTASKS_RUNNER_H_
+#endif  // SHELL_BROWSER_MICROTASKS_RUNNER_H_
diff --git a/shell/browser/native_browser_view.h b/shell/browser/native_browser_view.h
index 3e72f263c2cd..3acc2cddeadf 100644
--- a/shell/browser/native_browser_view.h
+++ b/shell/browser/native_browser_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NATIVE_BROWSER_VIEW_H_
-#define ATOM_BROWSER_NATIVE_BROWSER_VIEW_H_
+#ifndef SHELL_BROWSER_NATIVE_BROWSER_VIEW_H_
+#define SHELL_BROWSER_NATIVE_BROWSER_VIEW_H_
 
 #include <vector>
 
@@ -60,4 +60,4 @@ class NativeBrowserView {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NATIVE_BROWSER_VIEW_H_
+#endif  // SHELL_BROWSER_NATIVE_BROWSER_VIEW_H_
diff --git a/shell/browser/native_browser_view_mac.h b/shell/browser/native_browser_view_mac.h
index bc93f9c59fe2..d76cabb1d739 100644
--- a/shell/browser/native_browser_view_mac.h
+++ b/shell/browser/native_browser_view_mac.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NATIVE_BROWSER_VIEW_MAC_H_
-#define ATOM_BROWSER_NATIVE_BROWSER_VIEW_MAC_H_
+#ifndef SHELL_BROWSER_NATIVE_BROWSER_VIEW_MAC_H_
+#define SHELL_BROWSER_NATIVE_BROWSER_VIEW_MAC_H_
 
 #import <Cocoa/Cocoa.h>
 #include <vector>
@@ -32,4 +32,4 @@ class NativeBrowserViewMac : public NativeBrowserView {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NATIVE_BROWSER_VIEW_MAC_H_
+#endif  // SHELL_BROWSER_NATIVE_BROWSER_VIEW_MAC_H_
diff --git a/shell/browser/native_browser_view_views.h b/shell/browser/native_browser_view_views.h
index 6f02ff2ddf51..7708a30e4c6e 100644
--- a/shell/browser/native_browser_view_views.h
+++ b/shell/browser/native_browser_view_views.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NATIVE_BROWSER_VIEW_VIEWS_H_
-#define ATOM_BROWSER_NATIVE_BROWSER_VIEW_VIEWS_H_
+#ifndef SHELL_BROWSER_NATIVE_BROWSER_VIEW_VIEWS_H_
+#define SHELL_BROWSER_NATIVE_BROWSER_VIEW_VIEWS_H_
 
 #include "shell/browser/native_browser_view.h"
 
@@ -44,4 +44,4 @@ class NativeBrowserViewViews : public NativeBrowserView {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NATIVE_BROWSER_VIEW_VIEWS_H_
+#endif  // SHELL_BROWSER_NATIVE_BROWSER_VIEW_VIEWS_H_
diff --git a/shell/browser/native_window.h b/shell/browser/native_window.h
index 53b3c80ae695..358878342942 100644
--- a/shell/browser/native_window.h
+++ b/shell/browser/native_window.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NATIVE_WINDOW_H_
-#define ATOM_BROWSER_NATIVE_WINDOW_H_
+#ifndef SHELL_BROWSER_NATIVE_WINDOW_H_
+#define SHELL_BROWSER_NATIVE_WINDOW_H_
 
 #include <list>
 #include <map>
@@ -378,4 +378,4 @@ class NativeWindowRelay
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NATIVE_WINDOW_H_
+#endif  // SHELL_BROWSER_NATIVE_WINDOW_H_
diff --git a/shell/browser/native_window_mac.h b/shell/browser/native_window_mac.h
index cc9dddb3b67e..c1ab14ecb15b 100644
--- a/shell/browser/native_window_mac.h
+++ b/shell/browser/native_window_mac.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NATIVE_WINDOW_MAC_H_
-#define ATOM_BROWSER_NATIVE_WINDOW_MAC_H_
+#ifndef SHELL_BROWSER_NATIVE_WINDOW_MAC_H_
+#define SHELL_BROWSER_NATIVE_WINDOW_MAC_H_
 
 #import <Cocoa/Cocoa.h>
 
@@ -226,4 +226,4 @@ class NativeWindowMac : public NativeWindow {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NATIVE_WINDOW_MAC_H_
+#endif  // SHELL_BROWSER_NATIVE_WINDOW_MAC_H_
diff --git a/shell/browser/native_window_observer.h b/shell/browser/native_window_observer.h
index aeb8c4856b6e..3402b9e540da 100644
--- a/shell/browser/native_window_observer.h
+++ b/shell/browser/native_window_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NATIVE_WINDOW_OBSERVER_H_
-#define ATOM_BROWSER_NATIVE_WINDOW_OBSERVER_H_
+#ifndef SHELL_BROWSER_NATIVE_WINDOW_OBSERVER_H_
+#define SHELL_BROWSER_NATIVE_WINDOW_OBSERVER_H_
 
 #include <string>
 
@@ -101,4 +101,4 @@ class NativeWindowObserver : public base::CheckedObserver {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NATIVE_WINDOW_OBSERVER_H_
+#endif  // SHELL_BROWSER_NATIVE_WINDOW_OBSERVER_H_
diff --git a/shell/browser/native_window_views.h b/shell/browser/native_window_views.h
index f2de967a524c..a4e0be5b7009 100644
--- a/shell/browser/native_window_views.h
+++ b/shell/browser/native_window_views.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NATIVE_WINDOW_VIEWS_H_
-#define ATOM_BROWSER_NATIVE_WINDOW_VIEWS_H_
+#ifndef SHELL_BROWSER_NATIVE_WINDOW_VIEWS_H_
+#define SHELL_BROWSER_NATIVE_WINDOW_VIEWS_H_
 
 #include "shell/browser/native_window.h"
 
@@ -310,4 +310,4 @@ class NativeWindowViews : public NativeWindow,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NATIVE_WINDOW_VIEWS_H_
+#endif  // SHELL_BROWSER_NATIVE_WINDOW_VIEWS_H_
diff --git a/shell/browser/net/about_protocol_handler.h b/shell/browser/net/about_protocol_handler.h
index ad120604e618..d2bbc39c443e 100644
--- a/shell/browser/net/about_protocol_handler.h
+++ b/shell/browser/net/about_protocol_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_ABOUT_PROTOCOL_HANDLER_H_
-#define ATOM_BROWSER_NET_ABOUT_PROTOCOL_HANDLER_H_
+#ifndef SHELL_BROWSER_NET_ABOUT_PROTOCOL_HANDLER_H_
+#define SHELL_BROWSER_NET_ABOUT_PROTOCOL_HANDLER_H_
 
 #include "net/url_request/url_request_job_factory.h"
 
@@ -26,4 +26,4 @@ class AboutProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NET_ABOUT_PROTOCOL_HANDLER_H_
+#endif  // SHELL_BROWSER_NET_ABOUT_PROTOCOL_HANDLER_H_
diff --git a/shell/browser/net/asar/asar_protocol_handler.h b/shell/browser/net/asar/asar_protocol_handler.h
index f431b55b7170..a9b4859d6f4e 100644
--- a/shell/browser/net/asar/asar_protocol_handler.h
+++ b/shell/browser/net/asar/asar_protocol_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_ASAR_ASAR_PROTOCOL_HANDLER_H_
-#define ATOM_BROWSER_NET_ASAR_ASAR_PROTOCOL_HANDLER_H_
+#ifndef SHELL_BROWSER_NET_ASAR_ASAR_PROTOCOL_HANDLER_H_
+#define SHELL_BROWSER_NET_ASAR_ASAR_PROTOCOL_HANDLER_H_
 
 #include "base/memory/ref_counted.h"
 #include "net/url_request/url_request_job_factory.h"
@@ -34,4 +34,4 @@ class AsarProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
 
 }  // namespace asar
 
-#endif  // ATOM_BROWSER_NET_ASAR_ASAR_PROTOCOL_HANDLER_H_
+#endif  // SHELL_BROWSER_NET_ASAR_ASAR_PROTOCOL_HANDLER_H_
diff --git a/shell/browser/net/asar/asar_url_loader.h b/shell/browser/net/asar/asar_url_loader.h
index 2df17c79218f..be9e2b63167f 100644
--- a/shell/browser/net/asar/asar_url_loader.h
+++ b/shell/browser/net/asar/asar_url_loader.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_ASAR_ASAR_URL_LOADER_H_
-#define ATOM_BROWSER_NET_ASAR_ASAR_URL_LOADER_H_
+#ifndef SHELL_BROWSER_NET_ASAR_ASAR_URL_LOADER_H_
+#define SHELL_BROWSER_NET_ASAR_ASAR_URL_LOADER_H_
 
 #include "services/network/public/mojom/url_loader.mojom.h"
 
@@ -17,4 +17,4 @@ void CreateAsarURLLoader(
 
 }  // namespace asar
 
-#endif  // ATOM_BROWSER_NET_ASAR_ASAR_URL_LOADER_H_
+#endif  // SHELL_BROWSER_NET_ASAR_ASAR_URL_LOADER_H_
diff --git a/shell/browser/net/asar/url_request_asar_job.h b/shell/browser/net/asar/url_request_asar_job.h
index c73ee68ac285..da21e9aaf347 100644
--- a/shell/browser/net/asar/url_request_asar_job.h
+++ b/shell/browser/net/asar/url_request_asar_job.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_ASAR_URL_REQUEST_ASAR_JOB_H_
-#define ATOM_BROWSER_NET_ASAR_URL_REQUEST_ASAR_JOB_H_
+#ifndef SHELL_BROWSER_NET_ASAR_URL_REQUEST_ASAR_JOB_H_
+#define SHELL_BROWSER_NET_ASAR_URL_REQUEST_ASAR_JOB_H_
 
 #include <memory>
 #include <string>
@@ -134,4 +134,4 @@ class URLRequestAsarJob : public net::URLRequestJob {
 
 }  // namespace asar
 
-#endif  // ATOM_BROWSER_NET_ASAR_URL_REQUEST_ASAR_JOB_H_
+#endif  // SHELL_BROWSER_NET_ASAR_URL_REQUEST_ASAR_JOB_H_
diff --git a/shell/browser/net/atom_cert_verifier.h b/shell/browser/net/atom_cert_verifier.h
index 676fe353f740..ef2a0c6e8b4d 100644
--- a/shell/browser/net/atom_cert_verifier.h
+++ b/shell/browser/net/atom_cert_verifier.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_ATOM_CERT_VERIFIER_H_
-#define ATOM_BROWSER_NET_ATOM_CERT_VERIFIER_H_
+#ifndef SHELL_BROWSER_NET_ATOM_CERT_VERIFIER_H_
+#define SHELL_BROWSER_NET_ATOM_CERT_VERIFIER_H_
 
 #include <map>
 #include <memory>
@@ -68,4 +68,4 @@ class AtomCertVerifier : public net::CertVerifier {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NET_ATOM_CERT_VERIFIER_H_
+#endif  // SHELL_BROWSER_NET_ATOM_CERT_VERIFIER_H_
diff --git a/shell/browser/net/atom_network_delegate.h b/shell/browser/net/atom_network_delegate.h
index 006f718ec38e..cdd44429cb94 100644
--- a/shell/browser/net/atom_network_delegate.h
+++ b/shell/browser/net/atom_network_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_ATOM_NETWORK_DELEGATE_H_
-#define ATOM_BROWSER_NET_ATOM_NETWORK_DELEGATE_H_
+#ifndef SHELL_BROWSER_NET_ATOM_NETWORK_DELEGATE_H_
+#define SHELL_BROWSER_NET_ATOM_NETWORK_DELEGATE_H_
 
 #include <map>
 #include <memory>
@@ -180,4 +180,4 @@ class AtomNetworkDelegate : public net::NetworkDelegate {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NET_ATOM_NETWORK_DELEGATE_H_
+#endif  // SHELL_BROWSER_NET_ATOM_NETWORK_DELEGATE_H_
diff --git a/shell/browser/net/atom_url_loader_factory.h b/shell/browser/net/atom_url_loader_factory.h
index 64f366fb1ee9..c59fe43e2fc3 100644
--- a/shell/browser/net/atom_url_loader_factory.h
+++ b/shell/browser/net/atom_url_loader_factory.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_ATOM_URL_LOADER_FACTORY_H_
-#define ATOM_BROWSER_NET_ATOM_URL_LOADER_FACTORY_H_
+#ifndef SHELL_BROWSER_NET_ATOM_URL_LOADER_FACTORY_H_
+#define SHELL_BROWSER_NET_ATOM_URL_LOADER_FACTORY_H_
 
 #include <map>
 #include <string>
@@ -108,4 +108,4 @@ class AtomURLLoaderFactory : public network::mojom::URLLoaderFactory {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NET_ATOM_URL_LOADER_FACTORY_H_
+#endif  // SHELL_BROWSER_NET_ATOM_URL_LOADER_FACTORY_H_
diff --git a/shell/browser/net/atom_url_request.h b/shell/browser/net/atom_url_request.h
index 2ae4b808d931..86af07cd52cf 100644
--- a/shell/browser/net/atom_url_request.h
+++ b/shell/browser/net/atom_url_request.h
@@ -3,8 +3,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_ATOM_URL_REQUEST_H_
-#define ATOM_BROWSER_NET_ATOM_URL_REQUEST_H_
+#ifndef SHELL_BROWSER_NET_ATOM_URL_REQUEST_H_
+#define SHELL_BROWSER_NET_ATOM_URL_REQUEST_H_
 
 #include <memory>
 #include <string>
@@ -119,4 +119,4 @@ class AtomURLRequest : public base::RefCountedThreadSafe<AtomURLRequest>,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NET_ATOM_URL_REQUEST_H_
+#endif  // SHELL_BROWSER_NET_ATOM_URL_REQUEST_H_
diff --git a/shell/browser/net/atom_url_request_job_factory.h b/shell/browser/net/atom_url_request_job_factory.h
index fe965e237be0..477f8ba136de 100644
--- a/shell/browser/net/atom_url_request_job_factory.h
+++ b/shell/browser/net/atom_url_request_job_factory.h
@@ -3,8 +3,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_ATOM_URL_REQUEST_JOB_FACTORY_H_
-#define ATOM_BROWSER_NET_ATOM_URL_REQUEST_JOB_FACTORY_H_
+#ifndef SHELL_BROWSER_NET_ATOM_URL_REQUEST_JOB_FACTORY_H_
+#define SHELL_BROWSER_NET_ATOM_URL_REQUEST_JOB_FACTORY_H_
 
 #include <map>
 #include <memory>
@@ -76,4 +76,4 @@ class AtomURLRequestJobFactory : public net::URLRequestJobFactory {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NET_ATOM_URL_REQUEST_JOB_FACTORY_H_
+#endif  // SHELL_BROWSER_NET_ATOM_URL_REQUEST_JOB_FACTORY_H_
diff --git a/shell/browser/net/cookie_details.h b/shell/browser/net/cookie_details.h
index 82ad8d6f7aa1..1cc8cfba85af 100644
--- a/shell/browser/net/cookie_details.h
+++ b/shell/browser/net/cookie_details.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_COOKIE_DETAILS_H_
-#define ATOM_BROWSER_NET_COOKIE_DETAILS_H_
+#ifndef SHELL_BROWSER_NET_COOKIE_DETAILS_H_
+#define SHELL_BROWSER_NET_COOKIE_DETAILS_H_
 
 #include "base/macros.h"
 #include "services/network/public/mojom/cookie_manager.mojom.h"
@@ -28,4 +28,4 @@ struct CookieDetails {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NET_COOKIE_DETAILS_H_
+#endif  // SHELL_BROWSER_NET_COOKIE_DETAILS_H_
diff --git a/shell/browser/net/http_protocol_handler.h b/shell/browser/net/http_protocol_handler.h
index 39e1ff2ad29b..8ec9fa2fd975 100644
--- a/shell/browser/net/http_protocol_handler.h
+++ b/shell/browser/net/http_protocol_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_HTTP_PROTOCOL_HANDLER_H_
-#define ATOM_BROWSER_NET_HTTP_PROTOCOL_HANDLER_H_
+#ifndef SHELL_BROWSER_NET_HTTP_PROTOCOL_HANDLER_H_
+#define SHELL_BROWSER_NET_HTTP_PROTOCOL_HANDLER_H_
 
 #include <string>
 
@@ -27,4 +27,4 @@ class HttpProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NET_HTTP_PROTOCOL_HANDLER_H_
+#endif  // SHELL_BROWSER_NET_HTTP_PROTOCOL_HANDLER_H_
diff --git a/shell/browser/net/js_asker.h b/shell/browser/net/js_asker.h
index 3bcd26f785f5..7f4d5a52205a 100644
--- a/shell/browser/net/js_asker.h
+++ b/shell/browser/net/js_asker.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_JS_ASKER_H_
-#define ATOM_BROWSER_NET_JS_ASKER_H_
+#ifndef SHELL_BROWSER_NET_JS_ASKER_H_
+#define SHELL_BROWSER_NET_JS_ASKER_H_
 
 #include <memory>
 
@@ -55,4 +55,4 @@ class JsAsker {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NET_JS_ASKER_H_
+#endif  // SHELL_BROWSER_NET_JS_ASKER_H_
diff --git a/shell/browser/net/network_context_service.h b/shell/browser/net/network_context_service.h
index 304d047c45ec..db6cc02b4a4e 100644
--- a/shell/browser/net/network_context_service.h
+++ b/shell/browser/net/network_context_service.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_NETWORK_CONTEXT_SERVICE_H_
-#define ATOM_BROWSER_NET_NETWORK_CONTEXT_SERVICE_H_
+#ifndef SHELL_BROWSER_NET_NETWORK_CONTEXT_SERVICE_H_
+#define SHELL_BROWSER_NET_NETWORK_CONTEXT_SERVICE_H_
 
 #include "base/files/file_path.h"
 #include "chrome/browser/net/proxy_config_monitor.h"
@@ -38,4 +38,4 @@ class NetworkContextService : public KeyedService {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NET_NETWORK_CONTEXT_SERVICE_H_
+#endif  // SHELL_BROWSER_NET_NETWORK_CONTEXT_SERVICE_H_
diff --git a/shell/browser/net/network_context_service_factory.h b/shell/browser/net/network_context_service_factory.h
index b41e5afc384f..1d154c7f6408 100644
--- a/shell/browser/net/network_context_service_factory.h
+++ b/shell/browser/net/network_context_service_factory.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_NETWORK_CONTEXT_SERVICE_FACTORY_H_
-#define ATOM_BROWSER_NET_NETWORK_CONTEXT_SERVICE_FACTORY_H_
+#ifndef SHELL_BROWSER_NET_NETWORK_CONTEXT_SERVICE_FACTORY_H_
+#define SHELL_BROWSER_NET_NETWORK_CONTEXT_SERVICE_FACTORY_H_
 
 #include "base/memory/singleton.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
@@ -47,4 +47,4 @@ class NetworkContextServiceFactory : public BrowserContextKeyedServiceFactory {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NET_NETWORK_CONTEXT_SERVICE_FACTORY_H_
+#endif  // SHELL_BROWSER_NET_NETWORK_CONTEXT_SERVICE_FACTORY_H_
diff --git a/shell/browser/net/node_stream_loader.h b/shell/browser/net/node_stream_loader.h
index 8955b2ad289e..787cf865d25b 100644
--- a/shell/browser/net/node_stream_loader.h
+++ b/shell/browser/net/node_stream_loader.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_NODE_STREAM_LOADER_H_
-#define ATOM_BROWSER_NET_NODE_STREAM_LOADER_H_
+#ifndef SHELL_BROWSER_NET_NODE_STREAM_LOADER_H_
+#define SHELL_BROWSER_NET_NODE_STREAM_LOADER_H_
 
 #include <map>
 #include <memory>
@@ -84,4 +84,4 @@ class NodeStreamLoader : public network::mojom::URLLoader {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NET_NODE_STREAM_LOADER_H_
+#endif  // SHELL_BROWSER_NET_NODE_STREAM_LOADER_H_
diff --git a/shell/browser/net/proxying_url_loader_factory.h b/shell/browser/net/proxying_url_loader_factory.h
index c311d09ec16f..924f048e189a 100644
--- a/shell/browser/net/proxying_url_loader_factory.h
+++ b/shell/browser/net/proxying_url_loader_factory.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_PROXYING_URL_LOADER_FACTORY_H_
-#define ATOM_BROWSER_NET_PROXYING_URL_LOADER_FACTORY_H_
+#ifndef SHELL_BROWSER_NET_PROXYING_URL_LOADER_FACTORY_H_
+#define SHELL_BROWSER_NET_PROXYING_URL_LOADER_FACTORY_H_
 
 #include "shell/browser/net/atom_url_loader_factory.h"
 
@@ -49,4 +49,4 @@ class ProxyingURLLoaderFactory : public network::mojom::URLLoaderFactory {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NET_PROXYING_URL_LOADER_FACTORY_H_
+#endif  // SHELL_BROWSER_NET_PROXYING_URL_LOADER_FACTORY_H_
diff --git a/shell/browser/net/require_ct_delegate.h b/shell/browser/net/require_ct_delegate.h
index 15ec3ec170a7..a6324b5b4f37 100644
--- a/shell/browser/net/require_ct_delegate.h
+++ b/shell/browser/net/require_ct_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_REQUIRE_CT_DELEGATE_H_
-#define ATOM_BROWSER_NET_REQUIRE_CT_DELEGATE_H_
+#ifndef SHELL_BROWSER_NET_REQUIRE_CT_DELEGATE_H_
+#define SHELL_BROWSER_NET_REQUIRE_CT_DELEGATE_H_
 
 #include <set>
 #include <string>
@@ -34,4 +34,4 @@ class RequireCTDelegate
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NET_REQUIRE_CT_DELEGATE_H_
+#endif  // SHELL_BROWSER_NET_REQUIRE_CT_DELEGATE_H_
diff --git a/shell/browser/net/resolve_proxy_helper.h b/shell/browser/net/resolve_proxy_helper.h
index 39269d948392..45deded1e88d 100644
--- a/shell/browser/net/resolve_proxy_helper.h
+++ b/shell/browser/net/resolve_proxy_helper.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_RESOLVE_PROXY_HELPER_H_
-#define ATOM_BROWSER_NET_RESOLVE_PROXY_HELPER_H_
+#ifndef SHELL_BROWSER_NET_RESOLVE_PROXY_HELPER_H_
+#define SHELL_BROWSER_NET_RESOLVE_PROXY_HELPER_H_
 
 #include <deque>
 #include <string>
@@ -72,4 +72,4 @@ class ResolveProxyHelper
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NET_RESOLVE_PROXY_HELPER_H_
+#endif  // SHELL_BROWSER_NET_RESOLVE_PROXY_HELPER_H_
diff --git a/shell/browser/net/system_network_context_manager.h b/shell/browser/net/system_network_context_manager.h
index 0e3761787448..8d36a764e05b 100644
--- a/shell/browser/net/system_network_context_manager.h
+++ b/shell/browser/net/system_network_context_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_SYSTEM_NETWORK_CONTEXT_MANAGER_H_
-#define ATOM_BROWSER_NET_SYSTEM_NETWORK_CONTEXT_MANAGER_H_
+#ifndef SHELL_BROWSER_NET_SYSTEM_NETWORK_CONTEXT_MANAGER_H_
+#define SHELL_BROWSER_NET_SYSTEM_NETWORK_CONTEXT_MANAGER_H_
 
 #include <memory>
 #include <string>
@@ -125,4 +125,4 @@ class SystemNetworkContextManager {
   DISALLOW_COPY_AND_ASSIGN(SystemNetworkContextManager);
 };
 
-#endif  // ATOM_BROWSER_NET_SYSTEM_NETWORK_CONTEXT_MANAGER_H_
+#endif  // SHELL_BROWSER_NET_SYSTEM_NETWORK_CONTEXT_MANAGER_H_
diff --git a/shell/browser/net/url_pipe_loader.h b/shell/browser/net/url_pipe_loader.h
index b41629b65de4..d188f7faa18e 100644
--- a/shell/browser/net/url_pipe_loader.h
+++ b/shell/browser/net/url_pipe_loader.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_URL_PIPE_LOADER_H_
-#define ATOM_BROWSER_NET_URL_PIPE_LOADER_H_
+#ifndef SHELL_BROWSER_NET_URL_PIPE_LOADER_H_
+#define SHELL_BROWSER_NET_URL_PIPE_LOADER_H_
 
 #include <memory>
 #include <string>
@@ -79,4 +79,4 @@ class URLPipeLoader : public network::mojom::URLLoader,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NET_URL_PIPE_LOADER_H_
+#endif  // SHELL_BROWSER_NET_URL_PIPE_LOADER_H_
diff --git a/shell/browser/net/url_request_about_job.h b/shell/browser/net/url_request_about_job.h
index ed237895cbf1..3eb813281546 100644
--- a/shell/browser/net/url_request_about_job.h
+++ b/shell/browser/net/url_request_about_job.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_URL_REQUEST_ABOUT_JOB_H_
-#define ATOM_BROWSER_NET_URL_REQUEST_ABOUT_JOB_H_
+#ifndef SHELL_BROWSER_NET_URL_REQUEST_ABOUT_JOB_H_
+#define SHELL_BROWSER_NET_URL_REQUEST_ABOUT_JOB_H_
 
 #include <string>
 
@@ -32,4 +32,4 @@ class URLRequestAboutJob : public net::URLRequestJob {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NET_URL_REQUEST_ABOUT_JOB_H_
+#endif  // SHELL_BROWSER_NET_URL_REQUEST_ABOUT_JOB_H_
diff --git a/shell/browser/net/url_request_async_asar_job.h b/shell/browser/net/url_request_async_asar_job.h
index bc4dda13c680..1095d236edc6 100644
--- a/shell/browser/net/url_request_async_asar_job.h
+++ b/shell/browser/net/url_request_async_asar_job.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_URL_REQUEST_ASYNC_ASAR_JOB_H_
-#define ATOM_BROWSER_NET_URL_REQUEST_ASYNC_ASAR_JOB_H_
+#ifndef SHELL_BROWSER_NET_URL_REQUEST_ASYNC_ASAR_JOB_H_
+#define SHELL_BROWSER_NET_URL_REQUEST_ASYNC_ASAR_JOB_H_
 
 #include <memory>
 
@@ -34,4 +34,4 @@ class URLRequestAsyncAsarJob : public asar::URLRequestAsarJob, public JsAsker {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NET_URL_REQUEST_ASYNC_ASAR_JOB_H_
+#endif  // SHELL_BROWSER_NET_URL_REQUEST_ASYNC_ASAR_JOB_H_
diff --git a/shell/browser/net/url_request_buffer_job.h b/shell/browser/net/url_request_buffer_job.h
index 99a83e7802cf..48e3af2951c6 100644
--- a/shell/browser/net/url_request_buffer_job.h
+++ b/shell/browser/net/url_request_buffer_job.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_URL_REQUEST_BUFFER_JOB_H_
-#define ATOM_BROWSER_NET_URL_REQUEST_BUFFER_JOB_H_
+#ifndef SHELL_BROWSER_NET_URL_REQUEST_BUFFER_JOB_H_
+#define SHELL_BROWSER_NET_URL_REQUEST_BUFFER_JOB_H_
 
 #include <memory>
 #include <string>
@@ -46,4 +46,4 @@ class URLRequestBufferJob : public JsAsker, public net::URLRequestSimpleJob {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NET_URL_REQUEST_BUFFER_JOB_H_
+#endif  // SHELL_BROWSER_NET_URL_REQUEST_BUFFER_JOB_H_
diff --git a/shell/browser/net/url_request_context_getter.h b/shell/browser/net/url_request_context_getter.h
index 01566c0abd63..40b0af7aa904 100644
--- a/shell/browser/net/url_request_context_getter.h
+++ b/shell/browser/net/url_request_context_getter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_URL_REQUEST_CONTEXT_GETTER_H_
-#define ATOM_BROWSER_NET_URL_REQUEST_CONTEXT_GETTER_H_
+#ifndef SHELL_BROWSER_NET_URL_REQUEST_CONTEXT_GETTER_H_
+#define SHELL_BROWSER_NET_URL_REQUEST_CONTEXT_GETTER_H_
 
 #include <memory>
 #include <string>
@@ -111,4 +111,4 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NET_URL_REQUEST_CONTEXT_GETTER_H_
+#endif  // SHELL_BROWSER_NET_URL_REQUEST_CONTEXT_GETTER_H_
diff --git a/shell/browser/net/url_request_fetch_job.h b/shell/browser/net/url_request_fetch_job.h
index 8879f33ba6f8..140222ee8023 100644
--- a/shell/browser/net/url_request_fetch_job.h
+++ b/shell/browser/net/url_request_fetch_job.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_URL_REQUEST_FETCH_JOB_H_
-#define ATOM_BROWSER_NET_URL_REQUEST_FETCH_JOB_H_
+#ifndef SHELL_BROWSER_NET_URL_REQUEST_FETCH_JOB_H_
+#define SHELL_BROWSER_NET_URL_REQUEST_FETCH_JOB_H_
 
 #include <memory>
 #include <string>
@@ -78,4 +78,4 @@ class URLRequestFetchJob : public JsAsker,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NET_URL_REQUEST_FETCH_JOB_H_
+#endif  // SHELL_BROWSER_NET_URL_REQUEST_FETCH_JOB_H_
diff --git a/shell/browser/net/url_request_stream_job.h b/shell/browser/net/url_request_stream_job.h
index b82b1442f9bf..8e84ca768d91 100644
--- a/shell/browser/net/url_request_stream_job.h
+++ b/shell/browser/net/url_request_stream_job.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_URL_REQUEST_STREAM_JOB_H_
-#define ATOM_BROWSER_NET_URL_REQUEST_STREAM_JOB_H_
+#ifndef SHELL_BROWSER_NET_URL_REQUEST_STREAM_JOB_H_
+#define SHELL_BROWSER_NET_URL_REQUEST_STREAM_JOB_H_
 
 #include <memory>
 #include <string>
@@ -70,4 +70,4 @@ class URLRequestStreamJob : public JsAsker, public net::URLRequestJob {
 };
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NET_URL_REQUEST_STREAM_JOB_H_
+#endif  // SHELL_BROWSER_NET_URL_REQUEST_STREAM_JOB_H_
diff --git a/shell/browser/net/url_request_string_job.h b/shell/browser/net/url_request_string_job.h
index 3aab55e8d690..4b857b96216e 100644
--- a/shell/browser/net/url_request_string_job.h
+++ b/shell/browser/net/url_request_string_job.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NET_URL_REQUEST_STRING_JOB_H_
-#define ATOM_BROWSER_NET_URL_REQUEST_STRING_JOB_H_
+#ifndef SHELL_BROWSER_NET_URL_REQUEST_STRING_JOB_H_
+#define SHELL_BROWSER_NET_URL_REQUEST_STRING_JOB_H_
 
 #include <memory>
 #include <string>
@@ -43,4 +43,4 @@ class URLRequestStringJob : public JsAsker, public net::URLRequestSimpleJob {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NET_URL_REQUEST_STRING_JOB_H_
+#endif  // SHELL_BROWSER_NET_URL_REQUEST_STRING_JOB_H_
diff --git a/shell/browser/node_debugger.h b/shell/browser/node_debugger.h
index eb173d6908a0..321992c07ed8 100644
--- a/shell/browser/node_debugger.h
+++ b/shell/browser/node_debugger.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NODE_DEBUGGER_H_
-#define ATOM_BROWSER_NODE_DEBUGGER_H_
+#ifndef SHELL_BROWSER_NODE_DEBUGGER_H_
+#define SHELL_BROWSER_NODE_DEBUGGER_H_
 
 #include "base/macros.h"
 
@@ -30,4 +30,4 @@ class NodeDebugger {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NODE_DEBUGGER_H_
+#endif  // SHELL_BROWSER_NODE_DEBUGGER_H_
diff --git a/shell/browser/notifications/linux/libnotify_notification.h b/shell/browser/notifications/linux/libnotify_notification.h
index bda2a785902d..b3b819d11391 100644
--- a/shell/browser/notifications/linux/libnotify_notification.h
+++ b/shell/browser/notifications/linux/libnotify_notification.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NOTIFICATIONS_LINUX_LIBNOTIFY_NOTIFICATION_H_
-#define ATOM_BROWSER_NOTIFICATIONS_LINUX_LIBNOTIFY_NOTIFICATION_H_
+#ifndef SHELL_BROWSER_NOTIFICATIONS_LINUX_LIBNOTIFY_NOTIFICATION_H_
+#define SHELL_BROWSER_NOTIFICATIONS_LINUX_LIBNOTIFY_NOTIFICATION_H_
 
 #include <string>
 #include <vector>
@@ -44,4 +44,4 @@ class LibnotifyNotification : public Notification {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NOTIFICATIONS_LINUX_LIBNOTIFY_NOTIFICATION_H_
+#endif  // SHELL_BROWSER_NOTIFICATIONS_LINUX_LIBNOTIFY_NOTIFICATION_H_
diff --git a/shell/browser/notifications/linux/notification_presenter_linux.h b/shell/browser/notifications/linux/notification_presenter_linux.h
index 01d6127ed191..cbcceed3413a 100644
--- a/shell/browser/notifications/linux/notification_presenter_linux.h
+++ b/shell/browser/notifications/linux/notification_presenter_linux.h
@@ -3,8 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef ATOM_BROWSER_NOTIFICATIONS_LINUX_NOTIFICATION_PRESENTER_LINUX_H_
-#define ATOM_BROWSER_NOTIFICATIONS_LINUX_NOTIFICATION_PRESENTER_LINUX_H_
+#ifndef SHELL_BROWSER_NOTIFICATIONS_LINUX_NOTIFICATION_PRESENTER_LINUX_H_
+#define SHELL_BROWSER_NOTIFICATIONS_LINUX_NOTIFICATION_PRESENTER_LINUX_H_
 
 #include "shell/browser/notifications/notification_presenter.h"
 
@@ -24,4 +24,4 @@ class NotificationPresenterLinux : public NotificationPresenter {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NOTIFICATIONS_LINUX_NOTIFICATION_PRESENTER_LINUX_H_
+#endif  // SHELL_BROWSER_NOTIFICATIONS_LINUX_NOTIFICATION_PRESENTER_LINUX_H_
diff --git a/shell/browser/notifications/mac/cocoa_notification.h b/shell/browser/notifications/mac/cocoa_notification.h
index 98f657b164c7..5baca177e38f 100644
--- a/shell/browser/notifications/mac/cocoa_notification.h
+++ b/shell/browser/notifications/mac/cocoa_notification.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NOTIFICATIONS_MAC_COCOA_NOTIFICATION_H_
-#define ATOM_BROWSER_NOTIFICATIONS_MAC_COCOA_NOTIFICATION_H_
+#ifndef SHELL_BROWSER_NOTIFICATIONS_MAC_COCOA_NOTIFICATION_H_
+#define SHELL_BROWSER_NOTIFICATIONS_MAC_COCOA_NOTIFICATION_H_
 
 #import <Foundation/Foundation.h>
 
@@ -46,4 +46,4 @@ class CocoaNotification : public Notification {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NOTIFICATIONS_MAC_COCOA_NOTIFICATION_H_
+#endif  // SHELL_BROWSER_NOTIFICATIONS_MAC_COCOA_NOTIFICATION_H_
diff --git a/shell/browser/notifications/mac/notification_center_delegate.h b/shell/browser/notifications/mac/notification_center_delegate.h
index b1a7b18e88e4..c916dfc88544 100644
--- a/shell/browser/notifications/mac/notification_center_delegate.h
+++ b/shell/browser/notifications/mac/notification_center_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NOTIFICATIONS_MAC_NOTIFICATION_CENTER_DELEGATE_H_
-#define ATOM_BROWSER_NOTIFICATIONS_MAC_NOTIFICATION_CENTER_DELEGATE_H_
+#ifndef SHELL_BROWSER_NOTIFICATIONS_MAC_NOTIFICATION_CENTER_DELEGATE_H_
+#define SHELL_BROWSER_NOTIFICATIONS_MAC_NOTIFICATION_CENTER_DELEGATE_H_
 
 #import <Foundation/Foundation.h>
 
@@ -19,4 +19,4 @@ class NotificationPresenterMac;
 - (instancetype)initWithPresenter:(atom::NotificationPresenterMac*)presenter;
 @end
 
-#endif  // ATOM_BROWSER_NOTIFICATIONS_MAC_NOTIFICATION_CENTER_DELEGATE_H_
+#endif  // SHELL_BROWSER_NOTIFICATIONS_MAC_NOTIFICATION_CENTER_DELEGATE_H_
diff --git a/shell/browser/notifications/mac/notification_presenter_mac.h b/shell/browser/notifications/mac/notification_presenter_mac.h
index 5d8d1c9c4fd1..d32f1e24a6b4 100644
--- a/shell/browser/notifications/mac/notification_presenter_mac.h
+++ b/shell/browser/notifications/mac/notification_presenter_mac.h
@@ -3,8 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef ATOM_BROWSER_NOTIFICATIONS_MAC_NOTIFICATION_PRESENTER_MAC_H_
-#define ATOM_BROWSER_NOTIFICATIONS_MAC_NOTIFICATION_PRESENTER_MAC_H_
+#ifndef SHELL_BROWSER_NOTIFICATIONS_MAC_NOTIFICATION_PRESENTER_MAC_H_
+#define SHELL_BROWSER_NOTIFICATIONS_MAC_NOTIFICATION_PRESENTER_MAC_H_
 
 #include "base/mac/scoped_nsobject.h"
 #include "shell/browser/notifications/mac/notification_center_delegate.h"
@@ -33,4 +33,4 @@ class NotificationPresenterMac : public NotificationPresenter {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NOTIFICATIONS_MAC_NOTIFICATION_PRESENTER_MAC_H_
+#endif  // SHELL_BROWSER_NOTIFICATIONS_MAC_NOTIFICATION_PRESENTER_MAC_H_
diff --git a/shell/browser/notifications/notification.h b/shell/browser/notifications/notification.h
index d95c768e6a74..8e6237785a74 100644
--- a/shell/browser/notifications/notification.h
+++ b/shell/browser/notifications/notification.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NOTIFICATIONS_NOTIFICATION_H_
-#define ATOM_BROWSER_NOTIFICATIONS_NOTIFICATION_H_
+#ifndef SHELL_BROWSER_NOTIFICATIONS_NOTIFICATION_H_
+#define SHELL_BROWSER_NOTIFICATIONS_NOTIFICATION_H_
 
 #include <string>
 #include <vector>
@@ -86,4 +86,4 @@ class Notification {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NOTIFICATIONS_NOTIFICATION_H_
+#endif  // SHELL_BROWSER_NOTIFICATIONS_NOTIFICATION_H_
diff --git a/shell/browser/notifications/notification_delegate.h b/shell/browser/notifications/notification_delegate.h
index 37098841df99..a039aec5aaf9 100644
--- a/shell/browser/notifications/notification_delegate.h
+++ b/shell/browser/notifications/notification_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NOTIFICATIONS_NOTIFICATION_DELEGATE_H_
-#define ATOM_BROWSER_NOTIFICATIONS_NOTIFICATION_DELEGATE_H_
+#ifndef SHELL_BROWSER_NOTIFICATIONS_NOTIFICATION_DELEGATE_H_
+#define SHELL_BROWSER_NOTIFICATIONS_NOTIFICATION_DELEGATE_H_
 
 #include <string>
 
@@ -32,4 +32,4 @@ class NotificationDelegate {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NOTIFICATIONS_NOTIFICATION_DELEGATE_H_
+#endif  // SHELL_BROWSER_NOTIFICATIONS_NOTIFICATION_DELEGATE_H_
diff --git a/shell/browser/notifications/notification_presenter.h b/shell/browser/notifications/notification_presenter.h
index f1647d478978..014a894b5e27 100644
--- a/shell/browser/notifications/notification_presenter.h
+++ b/shell/browser/notifications/notification_presenter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NOTIFICATIONS_NOTIFICATION_PRESENTER_H_
-#define ATOM_BROWSER_NOTIFICATIONS_NOTIFICATION_PRESENTER_H_
+#ifndef SHELL_BROWSER_NOTIFICATIONS_NOTIFICATION_PRESENTER_H_
+#define SHELL_BROWSER_NOTIFICATIONS_NOTIFICATION_PRESENTER_H_
 
 #include <set>
 #include <string>
@@ -45,4 +45,4 @@ class NotificationPresenter {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NOTIFICATIONS_NOTIFICATION_PRESENTER_H_
+#endif  // SHELL_BROWSER_NOTIFICATIONS_NOTIFICATION_PRESENTER_H_
diff --git a/shell/browser/notifications/platform_notification_service.h b/shell/browser/notifications/platform_notification_service.h
index d0abaedebdb7..9fcfc1a7c5ae 100644
--- a/shell/browser/notifications/platform_notification_service.h
+++ b/shell/browser/notifications/platform_notification_service.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef ATOM_BROWSER_NOTIFICATIONS_PLATFORM_NOTIFICATION_SERVICE_H_
-#define ATOM_BROWSER_NOTIFICATIONS_PLATFORM_NOTIFICATION_SERVICE_H_
+#ifndef SHELL_BROWSER_NOTIFICATIONS_PLATFORM_NOTIFICATION_SERVICE_H_
+#define SHELL_BROWSER_NOTIFICATIONS_PLATFORM_NOTIFICATION_SERVICE_H_
 
 #include <set>
 #include <string>
@@ -52,4 +52,4 @@ class PlatformNotificationService
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NOTIFICATIONS_PLATFORM_NOTIFICATION_SERVICE_H_
+#endif  // SHELL_BROWSER_NOTIFICATIONS_PLATFORM_NOTIFICATION_SERVICE_H_
diff --git a/shell/browser/notifications/win/notification_presenter_win.h b/shell/browser/notifications/win/notification_presenter_win.h
index de154f6cb509..20983fa04664 100644
--- a/shell/browser/notifications/win/notification_presenter_win.h
+++ b/shell/browser/notifications/win/notification_presenter_win.h
@@ -20,8 +20,8 @@
 //   console.log("Notification dismissed")
 // };
 
-#ifndef ATOM_BROWSER_NOTIFICATIONS_WIN_NOTIFICATION_PRESENTER_WIN_H_
-#define ATOM_BROWSER_NOTIFICATIONS_WIN_NOTIFICATION_PRESENTER_WIN_H_
+#ifndef SHELL_BROWSER_NOTIFICATIONS_WIN_NOTIFICATION_PRESENTER_WIN_H_
+#define SHELL_BROWSER_NOTIFICATIONS_WIN_NOTIFICATION_PRESENTER_WIN_H_
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/strings/string16.h"
@@ -52,4 +52,4 @@ class NotificationPresenterWin : public NotificationPresenter {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NOTIFICATIONS_WIN_NOTIFICATION_PRESENTER_WIN_H_
+#endif  // SHELL_BROWSER_NOTIFICATIONS_WIN_NOTIFICATION_PRESENTER_WIN_H_
diff --git a/shell/browser/notifications/win/notification_presenter_win7.h b/shell/browser/notifications/win/notification_presenter_win7.h
index 9b77c6ca062d..a6e807b47864 100644
--- a/shell/browser/notifications/win/notification_presenter_win7.h
+++ b/shell/browser/notifications/win/notification_presenter_win7.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NOTIFICATIONS_WIN_NOTIFICATION_PRESENTER_WIN7_H_
-#define ATOM_BROWSER_NOTIFICATIONS_WIN_NOTIFICATION_PRESENTER_WIN7_H_
+#ifndef SHELL_BROWSER_NOTIFICATIONS_WIN_NOTIFICATION_PRESENTER_WIN7_H_
+#define SHELL_BROWSER_NOTIFICATIONS_WIN_NOTIFICATION_PRESENTER_WIN7_H_
 
 #include <string>
 
@@ -36,4 +36,4 @@ class NotificationPresenterWin7 : public NotificationPresenter,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NOTIFICATIONS_WIN_NOTIFICATION_PRESENTER_WIN7_H_
+#endif  // SHELL_BROWSER_NOTIFICATIONS_WIN_NOTIFICATION_PRESENTER_WIN7_H_
diff --git a/shell/browser/notifications/win/win32_desktop_notifications/common.h b/shell/browser/notifications/win/win32_desktop_notifications/common.h
index 8b409bbb1a5e..b27bb8443971 100644
--- a/shell/browser/notifications/win/win32_desktop_notifications/common.h
+++ b/shell/browser/notifications/win/win32_desktop_notifications/common.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_COMMON_H_
-#define ATOM_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_COMMON_H_
+#ifndef SHELL_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_COMMON_H_
+#define SHELL_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_COMMON_H_
 
 #include <Windows.h>
 
@@ -65,4 +65,4 @@ struct ScreenMetrics {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_COMMON_H_
+#endif  // SHELL_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_COMMON_H_
diff --git a/shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.h b/shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.h
index 3ba9409b011c..00e72d4325bd 100644
--- a/shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.h
+++ b/shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_DESKTOP_NOTIFICATION_CONTROLLER_H_
-#define ATOM_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_DESKTOP_NOTIFICATION_CONTROLLER_H_
+#ifndef SHELL_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_DESKTOP_NOTIFICATION_CONTROLLER_H_
+#define SHELL_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_DESKTOP_NOTIFICATION_CONTROLLER_H_
 
 #include <Windows.h>
 #include <deque>
@@ -111,4 +111,4 @@ class DesktopNotificationController::Notification {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_DESKTOP_NOTIFICATION_CONTROLLER_H_
+#endif  // SHELL_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_DESKTOP_NOTIFICATION_CONTROLLER_H_
diff --git a/shell/browser/notifications/win/win32_desktop_notifications/toast.h b/shell/browser/notifications/win/win32_desktop_notifications/toast.h
index 0a1f7cd33d12..ce52ad37d26e 100644
--- a/shell/browser/notifications/win/win32_desktop_notifications/toast.h
+++ b/shell/browser/notifications/win/win32_desktop_notifications/toast.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_TOAST_H_
-#define ATOM_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_TOAST_H_
+#ifndef SHELL_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_TOAST_H_
+#define SHELL_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_TOAST_H_
 
 #include <memory>
 
@@ -104,4 +104,4 @@ class DesktopNotificationController::Toast {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_TOAST_H_
+#endif  // SHELL_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_TOAST_H_
diff --git a/shell/browser/notifications/win/win32_desktop_notifications/toast_uia.h b/shell/browser/notifications/win/win32_desktop_notifications/toast_uia.h
index 41cc44ab80d6..9a87b3be7bb3 100644
--- a/shell/browser/notifications/win/win32_desktop_notifications/toast_uia.h
+++ b/shell/browser/notifications/win/win32_desktop_notifications/toast_uia.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_TOAST_UIA_H_
-#define ATOM_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_TOAST_UIA_H_
+#ifndef SHELL_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_TOAST_UIA_H_
+#define SHELL_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_TOAST_UIA_H_
 
 #include "shell/browser/notifications/win/win32_desktop_notifications/toast.h"
 
@@ -81,4 +81,4 @@ class DesktopNotificationController::Toast::UIAutomationInterface
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_TOAST_UIA_H_
+#endif  // SHELL_BROWSER_NOTIFICATIONS_WIN_WIN32_DESKTOP_NOTIFICATIONS_TOAST_UIA_H_
diff --git a/shell/browser/notifications/win/win32_notification.h b/shell/browser/notifications/win/win32_notification.h
index 43388f458547..b804d7c63757 100644
--- a/shell/browser/notifications/win/win32_notification.h
+++ b/shell/browser/notifications/win/win32_notification.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_NOTIFICATIONS_WIN_WIN32_NOTIFICATION_H_
-#define ATOM_BROWSER_NOTIFICATIONS_WIN_WIN32_NOTIFICATION_H_
+#ifndef SHELL_BROWSER_NOTIFICATIONS_WIN_WIN32_NOTIFICATION_H_
+#define SHELL_BROWSER_NOTIFICATIONS_WIN_WIN32_NOTIFICATION_H_
 
 #include <string>
 
@@ -35,4 +35,4 @@ class Win32Notification : public atom::Notification {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NOTIFICATIONS_WIN_WIN32_NOTIFICATION_H_
+#endif  // SHELL_BROWSER_NOTIFICATIONS_WIN_WIN32_NOTIFICATION_H_
diff --git a/shell/browser/notifications/win/windows_toast_notification.h b/shell/browser/notifications/win/windows_toast_notification.h
index 0e90c8df48d7..9fd7e30adfcd 100644
--- a/shell/browser/notifications/win/windows_toast_notification.h
+++ b/shell/browser/notifications/win/windows_toast_notification.h
@@ -6,8 +6,8 @@
 // this code
 // and released it as MIT to the world.
 
-#ifndef ATOM_BROWSER_NOTIFICATIONS_WIN_WINDOWS_TOAST_NOTIFICATION_H_
-#define ATOM_BROWSER_NOTIFICATIONS_WIN_WINDOWS_TOAST_NOTIFICATION_H_
+#ifndef SHELL_BROWSER_NOTIFICATIONS_WIN_WINDOWS_TOAST_NOTIFICATION_H_
+#define SHELL_BROWSER_NOTIFICATIONS_WIN_WINDOWS_TOAST_NOTIFICATION_H_
 
 #include <windows.h>
 #include <windows.ui.notifications.h>
@@ -128,4 +128,4 @@ class ToastEventHandler : public RuntimeClass<RuntimeClassFlags<ClassicCom>,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_NOTIFICATIONS_WIN_WINDOWS_TOAST_NOTIFICATION_H_
+#endif  // SHELL_BROWSER_NOTIFICATIONS_WIN_WINDOWS_TOAST_NOTIFICATION_H_
diff --git a/shell/browser/osr/osr_host_display_client.h b/shell/browser/osr/osr_host_display_client.h
index fed579c4156b..8085db08b769 100644
--- a/shell/browser/osr/osr_host_display_client.h
+++ b/shell/browser/osr/osr_host_display_client.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_OSR_OSR_HOST_DISPLAY_CLIENT_H_
-#define ATOM_BROWSER_OSR_OSR_HOST_DISPLAY_CLIENT_H_
+#ifndef SHELL_BROWSER_OSR_OSR_HOST_DISPLAY_CLIENT_H_
+#define SHELL_BROWSER_OSR_OSR_HOST_DISPLAY_CLIENT_H_
 
 #include <memory>
 
@@ -74,4 +74,4 @@ class OffScreenHostDisplayClient : public viz::HostDisplayClient {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_OSR_OSR_HOST_DISPLAY_CLIENT_H_
+#endif  // SHELL_BROWSER_OSR_OSR_HOST_DISPLAY_CLIENT_H_
diff --git a/shell/browser/osr/osr_render_widget_host_view.h b/shell/browser/osr/osr_render_widget_host_view.h
index ea865690e46c..415c4d435f43 100644
--- a/shell/browser/osr/osr_render_widget_host_view.h
+++ b/shell/browser/osr/osr_render_widget_host_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_OSR_OSR_RENDER_WIDGET_HOST_VIEW_H_
-#define ATOM_BROWSER_OSR_OSR_RENDER_WIDGET_HOST_VIEW_H_
+#ifndef SHELL_BROWSER_OSR_OSR_RENDER_WIDGET_HOST_VIEW_H_
+#define SHELL_BROWSER_OSR_OSR_RENDER_WIDGET_HOST_VIEW_H_
 
 #include <memory>
 #include <set>
@@ -320,4 +320,4 @@ class OffScreenRenderWidgetHostView : public content::RenderWidgetHostViewBase,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_OSR_OSR_RENDER_WIDGET_HOST_VIEW_H_
+#endif  // SHELL_BROWSER_OSR_OSR_RENDER_WIDGET_HOST_VIEW_H_
diff --git a/shell/browser/osr/osr_video_consumer.h b/shell/browser/osr/osr_video_consumer.h
index 6229fba0f87f..05fc440b46f8 100644
--- a/shell/browser/osr/osr_video_consumer.h
+++ b/shell/browser/osr/osr_video_consumer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_OSR_OSR_VIDEO_CONSUMER_H_
-#define ATOM_BROWSER_OSR_OSR_VIDEO_CONSUMER_H_
+#ifndef SHELL_BROWSER_OSR_OSR_VIDEO_CONSUMER_H_
+#define SHELL_BROWSER_OSR_OSR_VIDEO_CONSUMER_H_
 
 #include <memory>
 
@@ -51,4 +51,4 @@ class OffScreenVideoConsumer : public viz::mojom::FrameSinkVideoConsumer {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_OSR_OSR_VIDEO_CONSUMER_H_
+#endif  // SHELL_BROWSER_OSR_OSR_VIDEO_CONSUMER_H_
diff --git a/shell/browser/osr/osr_view_proxy.h b/shell/browser/osr/osr_view_proxy.h
index 41bb7474c60e..4c011e454610 100644
--- a/shell/browser/osr/osr_view_proxy.h
+++ b/shell/browser/osr/osr_view_proxy.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_OSR_OSR_VIEW_PROXY_H_
-#define ATOM_BROWSER_OSR_OSR_VIEW_PROXY_H_
+#ifndef SHELL_BROWSER_OSR_OSR_VIEW_PROXY_H_
+#define SHELL_BROWSER_OSR_OSR_VIEW_PROXY_H_
 
 #include <memory>
 #include <set>
@@ -52,4 +52,4 @@ class OffscreenViewProxy {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_OSR_OSR_VIEW_PROXY_H_
+#endif  // SHELL_BROWSER_OSR_OSR_VIEW_PROXY_H_
diff --git a/shell/browser/osr/osr_web_contents_view.h b/shell/browser/osr/osr_web_contents_view.h
index 2bf7f1b41116..7d77e8814697 100644
--- a/shell/browser/osr/osr_web_contents_view.h
+++ b/shell/browser/osr/osr_web_contents_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_OSR_OSR_WEB_CONTENTS_VIEW_H_
-#define ATOM_BROWSER_OSR_OSR_WEB_CONTENTS_VIEW_H_
+#ifndef SHELL_BROWSER_OSR_OSR_WEB_CONTENTS_VIEW_H_
+#define SHELL_BROWSER_OSR_OSR_WEB_CONTENTS_VIEW_H_
 
 #include "shell/browser/native_window.h"
 #include "shell/browser/native_window_observer.h"
@@ -109,4 +109,4 @@ class OffScreenWebContentsView : public content::WebContentsView,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_OSR_OSR_WEB_CONTENTS_VIEW_H_
+#endif  // SHELL_BROWSER_OSR_OSR_WEB_CONTENTS_VIEW_H_
diff --git a/shell/browser/pref_store_delegate.h b/shell/browser/pref_store_delegate.h
index 73696beb6fb0..9d183834815d 100644
--- a/shell/browser/pref_store_delegate.h
+++ b/shell/browser/pref_store_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_PREF_STORE_DELEGATE_H_
-#define ATOM_BROWSER_PREF_STORE_DELEGATE_H_
+#ifndef SHELL_BROWSER_PREF_STORE_DELEGATE_H_
+#define SHELL_BROWSER_PREF_STORE_DELEGATE_H_
 
 #include <vector>
 
@@ -49,4 +49,4 @@ class PrefStoreDelegate : public PrefValueStore::Delegate {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_PREF_STORE_DELEGATE_H_
+#endif  // SHELL_BROWSER_PREF_STORE_DELEGATE_H_
diff --git a/shell/browser/printing/print_preview_message_handler.h b/shell/browser/printing/print_preview_message_handler.h
index bad539686d3f..156935827dd2 100644
--- a/shell/browser/printing/print_preview_message_handler.h
+++ b/shell/browser/printing/print_preview_message_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_PRINTING_PRINT_PREVIEW_MESSAGE_HANDLER_H_
-#define ATOM_BROWSER_PRINTING_PRINT_PREVIEW_MESSAGE_HANDLER_H_
+#ifndef SHELL_BROWSER_PRINTING_PRINT_PREVIEW_MESSAGE_HANDLER_H_
+#define SHELL_BROWSER_PRINTING_PRINT_PREVIEW_MESSAGE_HANDLER_H_
 
 #include <map>
 
@@ -73,4 +73,4 @@ class PrintPreviewMessageHandler
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_PRINTING_PRINT_PREVIEW_MESSAGE_HANDLER_H_
+#endif  // SHELL_BROWSER_PRINTING_PRINT_PREVIEW_MESSAGE_HANDLER_H_
diff --git a/shell/browser/relauncher.h b/shell/browser/relauncher.h
index 10f2e5128795..761fbb02dbe8 100644
--- a/shell/browser/relauncher.h
+++ b/shell/browser/relauncher.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_RELAUNCHER_H_
-#define ATOM_BROWSER_RELAUNCHER_H_
+#ifndef SHELL_BROWSER_RELAUNCHER_H_
+#define SHELL_BROWSER_RELAUNCHER_H_
 
 // relauncher implements main browser application relaunches across platforms.
 // When a browser wants to relaunch itself, it can't simply fork off a new
@@ -119,4 +119,4 @@ int LaunchProgram(const StringVector& relauncher_args,
 
 }  // namespace relauncher
 
-#endif  // ATOM_BROWSER_RELAUNCHER_H_
+#endif  // SHELL_BROWSER_RELAUNCHER_H_
diff --git a/shell/browser/session_preferences.h b/shell/browser/session_preferences.h
index 545dbcaf6f56..8e5f108029b5 100644
--- a/shell/browser/session_preferences.h
+++ b/shell/browser/session_preferences.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_SESSION_PREFERENCES_H_
-#define ATOM_BROWSER_SESSION_PREFERENCES_H_
+#ifndef SHELL_BROWSER_SESSION_PREFERENCES_H_
+#define SHELL_BROWSER_SESSION_PREFERENCES_H_
 
 #include <vector>
 
@@ -43,4 +43,4 @@ class SessionPreferences : public base::SupportsUserData::Data {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_SESSION_PREFERENCES_H_
+#endif  // SHELL_BROWSER_SESSION_PREFERENCES_H_
diff --git a/shell/browser/special_storage_policy.h b/shell/browser/special_storage_policy.h
index 69c990ff7875..c0090a9e3672 100644
--- a/shell/browser/special_storage_policy.h
+++ b/shell/browser/special_storage_policy.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_SPECIAL_STORAGE_POLICY_H_
-#define ATOM_BROWSER_SPECIAL_STORAGE_POLICY_H_
+#ifndef SHELL_BROWSER_SPECIAL_STORAGE_POLICY_H_
+#define SHELL_BROWSER_SPECIAL_STORAGE_POLICY_H_
 
 #include "storage/browser/quota/special_storage_policy.h"
 
@@ -29,4 +29,4 @@ class SpecialStoragePolicy : public storage::SpecialStoragePolicy {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_SPECIAL_STORAGE_POLICY_H_
+#endif  // SHELL_BROWSER_SPECIAL_STORAGE_POLICY_H_
diff --git a/shell/browser/ui/accelerator_util.h b/shell/browser/ui/accelerator_util.h
index c8ca60afbbfa..999cbd5c8217 100644
--- a/shell/browser/ui/accelerator_util.h
+++ b/shell/browser/ui/accelerator_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_ACCELERATOR_UTIL_H_
-#define ATOM_BROWSER_UI_ACCELERATOR_UTIL_H_
+#ifndef SHELL_BROWSER_UI_ACCELERATOR_UTIL_H_
+#define SHELL_BROWSER_UI_ACCELERATOR_UTIL_H_
 
 #include <map>
 #include <string>
@@ -33,4 +33,4 @@ bool TriggerAcceleratorTableCommand(AcceleratorTable* table,
 
 }  // namespace accelerator_util
 
-#endif  // ATOM_BROWSER_UI_ACCELERATOR_UTIL_H_
+#endif  // SHELL_BROWSER_UI_ACCELERATOR_UTIL_H_
diff --git a/shell/browser/ui/atom_menu_model.h b/shell/browser/ui/atom_menu_model.h
index 42d2e80d7542..82d7c3ec6cd8 100644
--- a/shell/browser/ui/atom_menu_model.h
+++ b/shell/browser/ui/atom_menu_model.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_ATOM_MENU_MODEL_H_
-#define ATOM_BROWSER_UI_ATOM_MENU_MODEL_H_
+#ifndef SHELL_BROWSER_UI_ATOM_MENU_MODEL_H_
+#define SHELL_BROWSER_UI_ATOM_MENU_MODEL_H_
 
 #include <map>
 
@@ -79,4 +79,4 @@ class AtomMenuModel : public ui::SimpleMenuModel {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_ATOM_MENU_MODEL_H_
+#endif  // SHELL_BROWSER_UI_ATOM_MENU_MODEL_H_
diff --git a/shell/browser/ui/autofill_popup.h b/shell/browser/ui/autofill_popup.h
index a1f94e953558..91268d42ee57 100644
--- a/shell/browser/ui/autofill_popup.h
+++ b/shell/browser/ui/autofill_popup.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_AUTOFILL_POPUP_H_
-#define ATOM_BROWSER_UI_AUTOFILL_POPUP_H_
+#ifndef SHELL_BROWSER_UI_AUTOFILL_POPUP_H_
+#define SHELL_BROWSER_UI_AUTOFILL_POPUP_H_
 
 #include <vector>
 
@@ -88,4 +88,4 @@ class AutofillPopup : public views::ViewObserver {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_AUTOFILL_POPUP_H_
+#endif  // SHELL_BROWSER_UI_AUTOFILL_POPUP_H_
diff --git a/shell/browser/ui/certificate_trust.h b/shell/browser/ui/certificate_trust.h
index a968c34bfe28..c55e836ffc21 100644
--- a/shell/browser/ui/certificate_trust.h
+++ b/shell/browser/ui/certificate_trust.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_CERTIFICATE_TRUST_H_
-#define ATOM_BROWSER_UI_CERTIFICATE_TRUST_H_
+#ifndef SHELL_BROWSER_UI_CERTIFICATE_TRUST_H_
+#define SHELL_BROWSER_UI_CERTIFICATE_TRUST_H_
 
 #include <string>
 
@@ -24,4 +24,4 @@ v8::Local<v8::Promise> ShowCertificateTrust(
 
 }  // namespace certificate_trust
 
-#endif  // ATOM_BROWSER_UI_CERTIFICATE_TRUST_H_
+#endif  // SHELL_BROWSER_UI_CERTIFICATE_TRUST_H_
diff --git a/shell/browser/ui/cocoa/NSColor+Hex.h b/shell/browser/ui/cocoa/NSColor+Hex.h
index 7557728afa3a..cb36d00ef26f 100644
--- a/shell/browser/ui/cocoa/NSColor+Hex.h
+++ b/shell/browser/ui/cocoa/NSColor+Hex.h
@@ -4,8 +4,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_COCOA_NSCOLOR_HEX_H_
-#define ATOM_BROWSER_UI_COCOA_NSCOLOR_HEX_H_
+#ifndef SHELL_BROWSER_UI_COCOA_NSCOLOR_HEX_H_
+#define SHELL_BROWSER_UI_COCOA_NSCOLOR_HEX_H_
 
 #import <Cocoa/Cocoa.h>
 
@@ -15,4 +15,4 @@
 + (NSColor*)colorWithHexColorString:(NSString*)hex;
 @end
 
-#endif  // ATOM_BROWSER_UI_COCOA_NSCOLOR_HEX_H_
+#endif  // SHELL_BROWSER_UI_COCOA_NSCOLOR_HEX_H_
diff --git a/shell/browser/ui/cocoa/NSString+ANSI.h b/shell/browser/ui/cocoa/NSString+ANSI.h
index 9b691f3b07a6..4991b5cb184e 100644
--- a/shell/browser/ui/cocoa/NSString+ANSI.h
+++ b/shell/browser/ui/cocoa/NSString+ANSI.h
@@ -4,8 +4,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_COCOA_NSSTRING_ANSI_H_
-#define ATOM_BROWSER_UI_COCOA_NSSTRING_ANSI_H_
+#ifndef SHELL_BROWSER_UI_COCOA_NSSTRING_ANSI_H_
+#define SHELL_BROWSER_UI_COCOA_NSSTRING_ANSI_H_
 
 #import <Foundation/Foundation.h>
 
@@ -14,4 +14,4 @@
 - (NSMutableAttributedString*)attributedStringParsingANSICodes;
 @end
 
-#endif  // ATOM_BROWSER_UI_COCOA_NSSTRING_ANSI_H_
+#endif  // SHELL_BROWSER_UI_COCOA_NSSTRING_ANSI_H_
diff --git a/shell/browser/ui/cocoa/atom_bundle_mover.h b/shell/browser/ui/cocoa/atom_bundle_mover.h
index 155c6b36570a..a3306862f9f1 100644
--- a/shell/browser/ui/cocoa/atom_bundle_mover.h
+++ b/shell/browser/ui/cocoa/atom_bundle_mover.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_COCOA_ATOM_BUNDLE_MOVER_H_
-#define ATOM_BROWSER_UI_COCOA_ATOM_BUNDLE_MOVER_H_
+#ifndef SHELL_BROWSER_UI_COCOA_ATOM_BUNDLE_MOVER_H_
+#define SHELL_BROWSER_UI_COCOA_ATOM_BUNDLE_MOVER_H_
 
 #include <string>
 
@@ -40,4 +40,4 @@ class AtomBundleMover {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_COCOA_ATOM_BUNDLE_MOVER_H_
+#endif  // SHELL_BROWSER_UI_COCOA_ATOM_BUNDLE_MOVER_H_
diff --git a/shell/browser/ui/cocoa/atom_inspectable_web_contents_view.h b/shell/browser/ui/cocoa/atom_inspectable_web_contents_view.h
index 358f83fe75cf..4c3beb7b16a3 100644
--- a/shell/browser/ui/cocoa/atom_inspectable_web_contents_view.h
+++ b/shell/browser/ui/cocoa/atom_inspectable_web_contents_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef ATOM_BROWSER_UI_COCOA_BRY_INSPECTABLE_WEB_CONTENTS_VIEW_H_
-#define ATOM_BROWSER_UI_COCOA_BRY_INSPECTABLE_WEB_CONTENTS_VIEW_H_
+#ifndef SHELL_BROWSER_UI_COCOA_BRY_INSPECTABLE_WEB_CONTENTS_VIEW_H_
+#define SHELL_BROWSER_UI_COCOA_BRY_INSPECTABLE_WEB_CONTENTS_VIEW_H_
 
 #import <AppKit/AppKit.h>
 
@@ -44,4 +44,4 @@ using atom::InspectableWebContentsViewMac;
 
 @end
 
-#endif  // ATOM_BROWSER_UI_COCOA_BRY_INSPECTABLE_WEB_CONTENTS_VIEW_H_
+#endif  // SHELL_BROWSER_UI_COCOA_BRY_INSPECTABLE_WEB_CONTENTS_VIEW_H_
diff --git a/shell/browser/ui/cocoa/atom_menu_controller.h b/shell/browser/ui/cocoa/atom_menu_controller.h
index 83e9010f0daa..e4906cad5e43 100644
--- a/shell/browser/ui/cocoa/atom_menu_controller.h
+++ b/shell/browser/ui/cocoa/atom_menu_controller.h
@@ -3,8 +3,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_COCOA_ATOM_MENU_CONTROLLER_H_
-#define ATOM_BROWSER_UI_COCOA_ATOM_MENU_CONTROLLER_H_
+#ifndef SHELL_BROWSER_UI_COCOA_ATOM_MENU_CONTROLLER_H_
+#define SHELL_BROWSER_UI_COCOA_ATOM_MENU_CONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
 
@@ -59,4 +59,4 @@ class AtomMenuModel;
 
 @end
 
-#endif  // ATOM_BROWSER_UI_COCOA_ATOM_MENU_CONTROLLER_H_
+#endif  // SHELL_BROWSER_UI_COCOA_ATOM_MENU_CONTROLLER_H_
diff --git a/shell/browser/ui/cocoa/atom_native_widget_mac.h b/shell/browser/ui/cocoa/atom_native_widget_mac.h
index c6cad1d345dc..c2988809fdda 100644
--- a/shell/browser/ui/cocoa/atom_native_widget_mac.h
+++ b/shell/browser/ui/cocoa/atom_native_widget_mac.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_COCOA_ATOM_NATIVE_WIDGET_MAC_H_
-#define ATOM_BROWSER_UI_COCOA_ATOM_NATIVE_WIDGET_MAC_H_
+#ifndef SHELL_BROWSER_UI_COCOA_ATOM_NATIVE_WIDGET_MAC_H_
+#define SHELL_BROWSER_UI_COCOA_ATOM_NATIVE_WIDGET_MAC_H_
 
 #include "ui/views/widget/native_widget_mac.h"
 
@@ -32,4 +32,4 @@ class AtomNativeWidgetMac : public views::NativeWidgetMac {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_COCOA_ATOM_NATIVE_WIDGET_MAC_H_
+#endif  // SHELL_BROWSER_UI_COCOA_ATOM_NATIVE_WIDGET_MAC_H_
diff --git a/shell/browser/ui/cocoa/atom_ns_window.h b/shell/browser/ui/cocoa/atom_ns_window.h
index ce8cb661b829..8d1b9ce05942 100644
--- a/shell/browser/ui/cocoa/atom_ns_window.h
+++ b/shell/browser/ui/cocoa/atom_ns_window.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_COCOA_ATOM_NS_WINDOW_H_
-#define ATOM_BROWSER_UI_COCOA_ATOM_NS_WINDOW_H_
+#ifndef SHELL_BROWSER_UI_COCOA_ATOM_NS_WINDOW_H_
+#define SHELL_BROWSER_UI_COCOA_ATOM_NS_WINDOW_H_
 
 #include "components/remote_cocoa/app_shim/native_widget_mac_nswindow.h"
 #include "shell/browser/ui/cocoa/event_dispatching_window.h"
@@ -44,4 +44,4 @@ class ScopedDisableResize {
 - (void)toggleFullScreenMode:(id)sender;
 @end
 
-#endif  // ATOM_BROWSER_UI_COCOA_ATOM_NS_WINDOW_H_
+#endif  // SHELL_BROWSER_UI_COCOA_ATOM_NS_WINDOW_H_
diff --git a/shell/browser/ui/cocoa/atom_ns_window_delegate.h b/shell/browser/ui/cocoa/atom_ns_window_delegate.h
index 471a23d95b07..4a6f6b850c41 100644
--- a/shell/browser/ui/cocoa/atom_ns_window_delegate.h
+++ b/shell/browser/ui/cocoa/atom_ns_window_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_COCOA_ATOM_NS_WINDOW_DELEGATE_H_
-#define ATOM_BROWSER_UI_COCOA_ATOM_NS_WINDOW_DELEGATE_H_
+#ifndef SHELL_BROWSER_UI_COCOA_ATOM_NS_WINDOW_DELEGATE_H_
+#define SHELL_BROWSER_UI_COCOA_ATOM_NS_WINDOW_DELEGATE_H_
 
 #include <Quartz/Quartz.h>
 
@@ -24,4 +24,4 @@ class NativeWindowMac;
 - (id)initWithShell:(atom::NativeWindowMac*)shell;
 @end
 
-#endif  // ATOM_BROWSER_UI_COCOA_ATOM_NS_WINDOW_DELEGATE_H_
+#endif  // SHELL_BROWSER_UI_COCOA_ATOM_NS_WINDOW_DELEGATE_H_
diff --git a/shell/browser/ui/cocoa/atom_preview_item.h b/shell/browser/ui/cocoa/atom_preview_item.h
index d7e6c63a34ed..c267570ce604 100644
--- a/shell/browser/ui/cocoa/atom_preview_item.h
+++ b/shell/browser/ui/cocoa/atom_preview_item.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_COCOA_ATOM_PREVIEW_ITEM_H_
-#define ATOM_BROWSER_UI_COCOA_ATOM_PREVIEW_ITEM_H_
+#ifndef SHELL_BROWSER_UI_COCOA_ATOM_PREVIEW_ITEM_H_
+#define SHELL_BROWSER_UI_COCOA_ATOM_PREVIEW_ITEM_H_
 
 #import <Cocoa/Cocoa.h>
 #import <Quartz/Quartz.h>
@@ -14,4 +14,4 @@
 - (id)initWithURL:(NSURL*)url title:(NSString*)title;
 @end
 
-#endif  // ATOM_BROWSER_UI_COCOA_ATOM_PREVIEW_ITEM_H_
+#endif  // SHELL_BROWSER_UI_COCOA_ATOM_PREVIEW_ITEM_H_
diff --git a/shell/browser/ui/cocoa/atom_touch_bar.h b/shell/browser/ui/cocoa/atom_touch_bar.h
index a032a5b72a18..68987d97894b 100644
--- a/shell/browser/ui/cocoa/atom_touch_bar.h
+++ b/shell/browser/ui/cocoa/atom_touch_bar.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_COCOA_ATOM_TOUCH_BAR_H_
-#define ATOM_BROWSER_UI_COCOA_ATOM_TOUCH_BAR_H_
+#ifndef SHELL_BROWSER_UI_COCOA_ATOM_TOUCH_BAR_H_
+#define SHELL_BROWSER_UI_COCOA_ATOM_TOUCH_BAR_H_
 
 #import <Cocoa/Cocoa.h>
 
@@ -98,4 +98,4 @@
 
 @end
 
-#endif  // ATOM_BROWSER_UI_COCOA_ATOM_TOUCH_BAR_H_
+#endif  // SHELL_BROWSER_UI_COCOA_ATOM_TOUCH_BAR_H_
diff --git a/shell/browser/ui/cocoa/delayed_native_view_host.h b/shell/browser/ui/cocoa/delayed_native_view_host.h
index 5e2a0a8e8d61..141112740f5a 100644
--- a/shell/browser/ui/cocoa/delayed_native_view_host.h
+++ b/shell/browser/ui/cocoa/delayed_native_view_host.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_COCOA_DELAYED_NATIVE_VIEW_HOST_H_
-#define ATOM_BROWSER_UI_COCOA_DELAYED_NATIVE_VIEW_HOST_H_
+#ifndef SHELL_BROWSER_UI_COCOA_DELAYED_NATIVE_VIEW_HOST_H_
+#define SHELL_BROWSER_UI_COCOA_DELAYED_NATIVE_VIEW_HOST_H_
 
 #include "ui/views/controls/native/native_view_host.h"
 
@@ -28,4 +28,4 @@ class DelayedNativeViewHost : public views::NativeViewHost {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_COCOA_DELAYED_NATIVE_VIEW_HOST_H_
+#endif  // SHELL_BROWSER_UI_COCOA_DELAYED_NATIVE_VIEW_HOST_H_
diff --git a/shell/browser/ui/cocoa/event_dispatching_window.h b/shell/browser/ui/cocoa/event_dispatching_window.h
index 151a125f0072..58b08adfcd85 100644
--- a/shell/browser/ui/cocoa/event_dispatching_window.h
+++ b/shell/browser/ui/cocoa/event_dispatching_window.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_COCOA_EVENT_DISPATCHING_WINDOW_H_
-#define ATOM_BROWSER_UI_COCOA_EVENT_DISPATCHING_WINDOW_H_
+#ifndef SHELL_BROWSER_UI_COCOA_EVENT_DISPATCHING_WINDOW_H_
+#define SHELL_BROWSER_UI_COCOA_EVENT_DISPATCHING_WINDOW_H_
 
 #import "ui/base/cocoa/underlay_opengl_hosting_window.h"
 
@@ -16,4 +16,4 @@
 
 @end
 
-#endif  // ATOM_BROWSER_UI_COCOA_EVENT_DISPATCHING_WINDOW_H_
+#endif  // SHELL_BROWSER_UI_COCOA_EVENT_DISPATCHING_WINDOW_H_
diff --git a/shell/browser/ui/cocoa/root_view_mac.h b/shell/browser/ui/cocoa/root_view_mac.h
index 07dc6e9e4c7f..7d8556d9d5a6 100644
--- a/shell/browser/ui/cocoa/root_view_mac.h
+++ b/shell/browser/ui/cocoa/root_view_mac.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_COCOA_ROOT_VIEW_MAC_H_
-#define ATOM_BROWSER_UI_COCOA_ROOT_VIEW_MAC_H_
+#ifndef SHELL_BROWSER_UI_COCOA_ROOT_VIEW_MAC_H_
+#define SHELL_BROWSER_UI_COCOA_ROOT_VIEW_MAC_H_
 
 #include "ui/views/view.h"
 
@@ -30,4 +30,4 @@ class RootViewMac : public views::View {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_COCOA_ROOT_VIEW_MAC_H_
+#endif  // SHELL_BROWSER_UI_COCOA_ROOT_VIEW_MAC_H_
diff --git a/shell/browser/ui/cocoa/touch_bar_forward_declarations.h b/shell/browser/ui/cocoa/touch_bar_forward_declarations.h
index 281672c30420..1cdbbce740a6 100644
--- a/shell/browser/ui/cocoa/touch_bar_forward_declarations.h
+++ b/shell/browser/ui/cocoa/touch_bar_forward_declarations.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_COCOA_TOUCH_BAR_FORWARD_DECLARATIONS_H_
-#define ATOM_BROWSER_UI_COCOA_TOUCH_BAR_FORWARD_DECLARATIONS_H_
+#ifndef SHELL_BROWSER_UI_COCOA_TOUCH_BAR_FORWARD_DECLARATIONS_H_
+#define SHELL_BROWSER_UI_COCOA_TOUCH_BAR_FORWARD_DECLARATIONS_H_
 
 // Once Chrome no longer supports OSX 10.12.0, this file can be deleted.
 
@@ -264,4 +264,4 @@ static const NSTouchBarItemIdentifier NSTouchBarItemIdentifierOtherItemsProxy =
 
 #endif  // MAC_OS_X_VERSION_10_12_1
 
-#endif  // ATOM_BROWSER_UI_COCOA_TOUCH_BAR_FORWARD_DECLARATIONS_H_
+#endif  // SHELL_BROWSER_UI_COCOA_TOUCH_BAR_FORWARD_DECLARATIONS_H_
diff --git a/shell/browser/ui/cocoa/views_delegate_mac.h b/shell/browser/ui/cocoa/views_delegate_mac.h
index 455fb6171e38..03b9c33ab968 100644
--- a/shell/browser/ui/cocoa/views_delegate_mac.h
+++ b/shell/browser/ui/cocoa/views_delegate_mac.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_COCOA_VIEWS_DELEGATE_MAC_H_
-#define ATOM_BROWSER_UI_COCOA_VIEWS_DELEGATE_MAC_H_
+#ifndef SHELL_BROWSER_UI_COCOA_VIEWS_DELEGATE_MAC_H_
+#define SHELL_BROWSER_UI_COCOA_VIEWS_DELEGATE_MAC_H_
 
 #include "ui/views/views_delegate.h"
 
@@ -27,4 +27,4 @@ class ViewsDelegateMac : public views::ViewsDelegate {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_COCOA_VIEWS_DELEGATE_MAC_H_
+#endif  // SHELL_BROWSER_UI_COCOA_VIEWS_DELEGATE_MAC_H_
diff --git a/shell/browser/ui/devtools_manager_delegate.h b/shell/browser/ui/devtools_manager_delegate.h
index c42e1443c340..070a10479033 100644
--- a/shell/browser/ui/devtools_manager_delegate.h
+++ b/shell/browser/ui/devtools_manager_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef ATOM_BROWSER_UI_DEVTOOLS_MANAGER_DELEGATE_H_
-#define ATOM_BROWSER_UI_DEVTOOLS_MANAGER_DELEGATE_H_
+#ifndef SHELL_BROWSER_UI_DEVTOOLS_MANAGER_DELEGATE_H_
+#define SHELL_BROWSER_UI_DEVTOOLS_MANAGER_DELEGATE_H_
 
 #include <memory>
 #include <string>
@@ -39,4 +39,4 @@ class DevToolsManagerDelegate : public content::DevToolsManagerDelegate {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_DEVTOOLS_MANAGER_DELEGATE_H_
+#endif  // SHELL_BROWSER_UI_DEVTOOLS_MANAGER_DELEGATE_H_
diff --git a/shell/browser/ui/devtools_ui.h b/shell/browser/ui/devtools_ui.h
index b6cc21e29e75..9b1edae3cd3d 100644
--- a/shell/browser/ui/devtools_ui.h
+++ b/shell/browser/ui/devtools_ui.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef ATOM_BROWSER_UI_DEVTOOLS_UI_H_
-#define ATOM_BROWSER_UI_DEVTOOLS_UI_H_
+#ifndef SHELL_BROWSER_UI_DEVTOOLS_UI_H_
+#define SHELL_BROWSER_UI_DEVTOOLS_UI_H_
 
 #include "base/compiler_specific.h"
 #include "content/public/browser/browser_context.h"
@@ -24,4 +24,4 @@ class DevToolsUI : public content::WebUIController {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_DEVTOOLS_UI_H_
+#endif  // SHELL_BROWSER_UI_DEVTOOLS_UI_H_
diff --git a/shell/browser/ui/drag_util.h b/shell/browser/ui/drag_util.h
index df5303c65e45..e58526aa2ac7 100644
--- a/shell/browser/ui/drag_util.h
+++ b/shell/browser/ui/drag_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_DRAG_UTIL_H_
-#define ATOM_BROWSER_UI_DRAG_UTIL_H_
+#ifndef SHELL_BROWSER_UI_DRAG_UTIL_H_
+#define SHELL_BROWSER_UI_DRAG_UTIL_H_
 
 #include <vector>
 
@@ -21,4 +21,4 @@ void DragFileItems(const std::vector<base::FilePath>& files,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_DRAG_UTIL_H_
+#endif  // SHELL_BROWSER_UI_DRAG_UTIL_H_
diff --git a/shell/browser/ui/file_dialog.h b/shell/browser/ui/file_dialog.h
index 9ff87e04af22..2279170a1d45 100644
--- a/shell/browser/ui/file_dialog.h
+++ b/shell/browser/ui/file_dialog.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_FILE_DIALOG_H_
-#define ATOM_BROWSER_UI_FILE_DIALOG_H_
+#ifndef SHELL_BROWSER_UI_FILE_DIALOG_H_
+#define SHELL_BROWSER_UI_FILE_DIALOG_H_
 
 #include <string>
 #include <utility>
@@ -66,4 +66,4 @@ void ShowSaveDialog(const DialogSettings& settings,
 
 }  // namespace file_dialog
 
-#endif  // ATOM_BROWSER_UI_FILE_DIALOG_H_
+#endif  // SHELL_BROWSER_UI_FILE_DIALOG_H_
diff --git a/shell/browser/ui/inspectable_web_contents.h b/shell/browser/ui/inspectable_web_contents.h
index 7d6d6ea72a67..3f1793bf2997 100644
--- a/shell/browser/ui/inspectable_web_contents.h
+++ b/shell/browser/ui/inspectable_web_contents.h
@@ -3,8 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef ATOM_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_H_
-#define ATOM_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_H_
+#ifndef SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_H_
+#define SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_H_
 
 #include <string>
 
@@ -63,4 +63,4 @@ class InspectableWebContents {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_H_
+#endif  // SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_H_
diff --git a/shell/browser/ui/inspectable_web_contents_delegate.h b/shell/browser/ui/inspectable_web_contents_delegate.h
index d72622e251bf..235f9df1c653 100644
--- a/shell/browser/ui/inspectable_web_contents_delegate.h
+++ b/shell/browser/ui/inspectable_web_contents_delegate.h
@@ -3,8 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef ATOM_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_DELEGATE_H_
-#define ATOM_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_DELEGATE_H_
+#ifndef SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_DELEGATE_H_
+#define SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_DELEGATE_H_
 
 #include <string>
 
@@ -39,4 +39,4 @@ class InspectableWebContentsDelegate {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_DELEGATE_H_
+#endif  // SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_DELEGATE_H_
diff --git a/shell/browser/ui/inspectable_web_contents_impl.h b/shell/browser/ui/inspectable_web_contents_impl.h
index 9d1f6d491a7e..d31a25cfe211 100644
--- a/shell/browser/ui/inspectable_web_contents_impl.h
+++ b/shell/browser/ui/inspectable_web_contents_impl.h
@@ -3,8 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef ATOM_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_IMPL_H_
-#define ATOM_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_IMPL_H_
+#ifndef SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_IMPL_H_
+#define SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_IMPL_H_
 
 #include <list>
 #include <map>
@@ -247,4 +247,4 @@ class InspectableWebContentsImpl
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_IMPL_H_
+#endif  // SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_IMPL_H_
diff --git a/shell/browser/ui/inspectable_web_contents_view.h b/shell/browser/ui/inspectable_web_contents_view.h
index 1de44213c09a..02a0214e45ba 100644
--- a/shell/browser/ui/inspectable_web_contents_view.h
+++ b/shell/browser/ui/inspectable_web_contents_view.h
@@ -3,8 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef ATOM_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_H_
-#define ATOM_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_H_
+#ifndef SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_H_
+#define SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_H_
 
 #include "base/strings/string16.h"
 #include "ui/gfx/native_widget_types.h"
@@ -59,4 +59,4 @@ class InspectableWebContentsView {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_H_
+#endif  // SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_H_
diff --git a/shell/browser/ui/inspectable_web_contents_view_delegate.h b/shell/browser/ui/inspectable_web_contents_view_delegate.h
index 0788cc9f50bb..b46d98db5891 100644
--- a/shell/browser/ui/inspectable_web_contents_view_delegate.h
+++ b/shell/browser/ui/inspectable_web_contents_view_delegate.h
@@ -3,8 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef ATOM_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_
-#define ATOM_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_
+#ifndef SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_
+#define SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_
 
 #include <string>
 
@@ -32,4 +32,4 @@ class InspectableWebContentsViewDelegate {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_
+#endif  // SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_
diff --git a/shell/browser/ui/inspectable_web_contents_view_mac.h b/shell/browser/ui/inspectable_web_contents_view_mac.h
index 2f6b70cadd4f..704ca943c628 100644
--- a/shell/browser/ui/inspectable_web_contents_view_mac.h
+++ b/shell/browser/ui/inspectable_web_contents_view_mac.h
@@ -3,8 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef ATOM_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_MAC_H_
-#define ATOM_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_MAC_H_
+#ifndef SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_MAC_H_
+#define SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_MAC_H_
 
 #include "shell/browser/ui/inspectable_web_contents_view.h"
 
@@ -47,4 +47,4 @@ class InspectableWebContentsViewMac : public InspectableWebContentsView {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_MAC_H_
+#endif  // SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_MAC_H_
diff --git a/shell/browser/ui/message_box.h b/shell/browser/ui/message_box.h
index fd699738003f..ea195df87a86 100644
--- a/shell/browser/ui/message_box.h
+++ b/shell/browser/ui/message_box.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_MESSAGE_BOX_H_
-#define ATOM_BROWSER_UI_MESSAGE_BOX_H_
+#ifndef SHELL_BROWSER_UI_MESSAGE_BOX_H_
+#define SHELL_BROWSER_UI_MESSAGE_BOX_H_
 
 #include <string>
 #include <vector>
@@ -62,4 +62,4 @@ void ShowErrorBox(const base::string16& title, const base::string16& content);
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_MESSAGE_BOX_H_
+#endif  // SHELL_BROWSER_UI_MESSAGE_BOX_H_
diff --git a/shell/browser/ui/tray_icon.h b/shell/browser/ui/tray_icon.h
index 6527ed228f88..11cce17b4621 100644
--- a/shell/browser/ui/tray_icon.h
+++ b/shell/browser/ui/tray_icon.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_TRAY_ICON_H_
-#define ATOM_BROWSER_UI_TRAY_ICON_H_
+#ifndef SHELL_BROWSER_UI_TRAY_ICON_H_
+#define SHELL_BROWSER_UI_TRAY_ICON_H_
 
 #include <string>
 #include <vector>
@@ -109,4 +109,4 @@ class TrayIcon {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_TRAY_ICON_H_
+#endif  // SHELL_BROWSER_UI_TRAY_ICON_H_
diff --git a/shell/browser/ui/tray_icon_cocoa.h b/shell/browser/ui/tray_icon_cocoa.h
index 65806972ed2e..e29e616a8dca 100644
--- a/shell/browser/ui/tray_icon_cocoa.h
+++ b/shell/browser/ui/tray_icon_cocoa.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_TRAY_ICON_COCOA_H_
-#define ATOM_BROWSER_UI_TRAY_ICON_COCOA_H_
+#ifndef SHELL_BROWSER_UI_TRAY_ICON_COCOA_H_
+#define SHELL_BROWSER_UI_TRAY_ICON_COCOA_H_
 
 #import <Cocoa/Cocoa.h>
 
@@ -54,4 +54,4 @@ class TrayIconCocoa : public TrayIcon, public AtomMenuModel::Observer {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_TRAY_ICON_COCOA_H_
+#endif  // SHELL_BROWSER_UI_TRAY_ICON_COCOA_H_
diff --git a/shell/browser/ui/tray_icon_gtk.h b/shell/browser/ui/tray_icon_gtk.h
index 05cdbe8cfe63..330cc7fb361a 100644
--- a/shell/browser/ui/tray_icon_gtk.h
+++ b/shell/browser/ui/tray_icon_gtk.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_TRAY_ICON_GTK_H_
-#define ATOM_BROWSER_UI_TRAY_ICON_GTK_H_
+#ifndef SHELL_BROWSER_UI_TRAY_ICON_GTK_H_
+#define SHELL_BROWSER_UI_TRAY_ICON_GTK_H_
 
 #include <memory>
 #include <string>
@@ -39,4 +39,4 @@ class TrayIconGtk : public TrayIcon, public views::StatusIconLinux::Delegate {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_TRAY_ICON_GTK_H_
+#endif  // SHELL_BROWSER_UI_TRAY_ICON_GTK_H_
diff --git a/shell/browser/ui/tray_icon_observer.h b/shell/browser/ui/tray_icon_observer.h
index 6b6abd9ec770..49361dc7eb3b 100644
--- a/shell/browser/ui/tray_icon_observer.h
+++ b/shell/browser/ui/tray_icon_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_TRAY_ICON_OBSERVER_H_
-#define ATOM_BROWSER_UI_TRAY_ICON_OBSERVER_H_
+#ifndef SHELL_BROWSER_UI_TRAY_ICON_OBSERVER_H_
+#define SHELL_BROWSER_UI_TRAY_ICON_OBSERVER_H_
 
 #include <string>
 #include <vector>
@@ -43,4 +43,4 @@ class TrayIconObserver : public base::CheckedObserver {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_TRAY_ICON_OBSERVER_H_
+#endif  // SHELL_BROWSER_UI_TRAY_ICON_OBSERVER_H_
diff --git a/shell/browser/ui/views/atom_views_delegate.h b/shell/browser/ui/views/atom_views_delegate.h
index 7d9113337d57..826bbec8977d 100644
--- a/shell/browser/ui/views/atom_views_delegate.h
+++ b/shell/browser/ui/views/atom_views_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef ATOM_BROWSER_UI_VIEWS_ATOM_VIEWS_DELEGATE_H_
-#define ATOM_BROWSER_UI_VIEWS_ATOM_VIEWS_DELEGATE_H_
+#ifndef SHELL_BROWSER_UI_VIEWS_ATOM_VIEWS_DELEGATE_H_
+#define SHELL_BROWSER_UI_VIEWS_ATOM_VIEWS_DELEGATE_H_
 
 #include <string>
 
@@ -55,4 +55,4 @@ class ViewsDelegate : public views::ViewsDelegate {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_VIEWS_ATOM_VIEWS_DELEGATE_H_
+#endif  // SHELL_BROWSER_UI_VIEWS_ATOM_VIEWS_DELEGATE_H_
diff --git a/shell/browser/ui/views/autofill_popup_view.h b/shell/browser/ui/views/autofill_popup_view.h
index 87b01e5b8943..f22863e936f5 100644
--- a/shell/browser/ui/views/autofill_popup_view.h
+++ b/shell/browser/ui/views/autofill_popup_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_VIEWS_AUTOFILL_POPUP_VIEW_H_
-#define ATOM_BROWSER_UI_VIEWS_AUTOFILL_POPUP_VIEW_H_
+#ifndef SHELL_BROWSER_UI_VIEWS_AUTOFILL_POPUP_VIEW_H_
+#define SHELL_BROWSER_UI_VIEWS_AUTOFILL_POPUP_VIEW_H_
 
 #include <memory>
 
@@ -152,4 +152,4 @@ class AutofillPopupView : public views::WidgetDelegateView,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_VIEWS_AUTOFILL_POPUP_VIEW_H_
+#endif  // SHELL_BROWSER_UI_VIEWS_AUTOFILL_POPUP_VIEW_H_
diff --git a/shell/browser/ui/views/frameless_view.h b/shell/browser/ui/views/frameless_view.h
index fad09d255e50..14bc1ad63dc6 100644
--- a/shell/browser/ui/views/frameless_view.h
+++ b/shell/browser/ui/views/frameless_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_VIEWS_FRAMELESS_VIEW_H_
-#define ATOM_BROWSER_UI_VIEWS_FRAMELESS_VIEW_H_
+#ifndef SHELL_BROWSER_UI_VIEWS_FRAMELESS_VIEW_H_
+#define SHELL_BROWSER_UI_VIEWS_FRAMELESS_VIEW_H_
 
 #include "ui/views/window/non_client_view.h"
 
@@ -54,4 +54,4 @@ class FramelessView : public views::NonClientFrameView {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_VIEWS_FRAMELESS_VIEW_H_
+#endif  // SHELL_BROWSER_UI_VIEWS_FRAMELESS_VIEW_H_
diff --git a/shell/browser/ui/views/global_menu_bar_x11.h b/shell/browser/ui/views/global_menu_bar_x11.h
index da2272c2ed2d..f369a0f6eefa 100644
--- a/shell/browser/ui/views/global_menu_bar_x11.h
+++ b/shell/browser/ui/views/global_menu_bar_x11.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_VIEWS_GLOBAL_MENU_BAR_X11_H_
-#define ATOM_BROWSER_UI_VIEWS_GLOBAL_MENU_BAR_X11_H_
+#ifndef SHELL_BROWSER_UI_VIEWS_GLOBAL_MENU_BAR_X11_H_
+#define SHELL_BROWSER_UI_VIEWS_GLOBAL_MENU_BAR_X11_H_
 
 #include <string>
 
@@ -78,4 +78,4 @@ class GlobalMenuBarX11 {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_VIEWS_GLOBAL_MENU_BAR_X11_H_
+#endif  // SHELL_BROWSER_UI_VIEWS_GLOBAL_MENU_BAR_X11_H_
diff --git a/shell/browser/ui/views/inspectable_web_contents_view_views.h b/shell/browser/ui/views/inspectable_web_contents_view_views.h
index 1a1da6b660b7..860027b3cdf2 100644
--- a/shell/browser/ui/views/inspectable_web_contents_view_views.h
+++ b/shell/browser/ui/views/inspectable_web_contents_view_views.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef ATOM_BROWSER_UI_VIEWS_INSPECTABLE_WEB_CONTENTS_VIEW_VIEWS_H_
-#define ATOM_BROWSER_UI_VIEWS_INSPECTABLE_WEB_CONTENTS_VIEW_VIEWS_H_
+#ifndef SHELL_BROWSER_UI_VIEWS_INSPECTABLE_WEB_CONTENTS_VIEW_VIEWS_H_
+#define SHELL_BROWSER_UI_VIEWS_INSPECTABLE_WEB_CONTENTS_VIEW_VIEWS_H_
 
 #include <memory>
 
@@ -69,4 +69,4 @@ class InspectableWebContentsViewViews : public InspectableWebContentsView,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_VIEWS_INSPECTABLE_WEB_CONTENTS_VIEW_VIEWS_H_
+#endif  // SHELL_BROWSER_UI_VIEWS_INSPECTABLE_WEB_CONTENTS_VIEW_VIEWS_H_
diff --git a/shell/browser/ui/views/menu_bar.h b/shell/browser/ui/views/menu_bar.h
index d9a01cf4fdec..b2f564312e1e 100644
--- a/shell/browser/ui/views/menu_bar.h
+++ b/shell/browser/ui/views/menu_bar.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
-#define ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
+#ifndef SHELL_BROWSER_UI_VIEWS_MENU_BAR_H_
+#define SHELL_BROWSER_UI_VIEWS_MENU_BAR_H_
 
 #include <memory>
 
@@ -111,4 +111,4 @@ class MenuBar : public views::AccessiblePaneView,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
+#endif  // SHELL_BROWSER_UI_VIEWS_MENU_BAR_H_
diff --git a/shell/browser/ui/views/menu_delegate.h b/shell/browser/ui/views/menu_delegate.h
index 8bf71946693b..39968c2afb23 100644
--- a/shell/browser/ui/views/menu_delegate.h
+++ b/shell/browser/ui/views/menu_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_VIEWS_MENU_DELEGATE_H_
-#define ATOM_BROWSER_UI_VIEWS_MENU_DELEGATE_H_
+#ifndef SHELL_BROWSER_UI_VIEWS_MENU_DELEGATE_H_
+#define SHELL_BROWSER_UI_VIEWS_MENU_DELEGATE_H_
 
 #include <memory>
 
@@ -77,4 +77,4 @@ class MenuDelegate : public views::MenuDelegate {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_VIEWS_MENU_DELEGATE_H_
+#endif  // SHELL_BROWSER_UI_VIEWS_MENU_DELEGATE_H_
diff --git a/shell/browser/ui/views/menu_model_adapter.h b/shell/browser/ui/views/menu_model_adapter.h
index 4eaae0dad1cc..a7a156dc84d3 100644
--- a/shell/browser/ui/views/menu_model_adapter.h
+++ b/shell/browser/ui/views/menu_model_adapter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_VIEWS_MENU_MODEL_ADAPTER_H_
-#define ATOM_BROWSER_UI_VIEWS_MENU_MODEL_ADAPTER_H_
+#ifndef SHELL_BROWSER_UI_VIEWS_MENU_MODEL_ADAPTER_H_
+#define SHELL_BROWSER_UI_VIEWS_MENU_MODEL_ADAPTER_H_
 
 #include "shell/browser/ui/atom_menu_model.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
@@ -26,4 +26,4 @@ class MenuModelAdapter : public views::MenuModelAdapter {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_VIEWS_MENU_MODEL_ADAPTER_H_
+#endif  // SHELL_BROWSER_UI_VIEWS_MENU_MODEL_ADAPTER_H_
diff --git a/shell/browser/ui/views/native_frame_view.h b/shell/browser/ui/views/native_frame_view.h
index 22aa0ff94e82..960486e7da86 100644
--- a/shell/browser/ui/views/native_frame_view.h
+++ b/shell/browser/ui/views/native_frame_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_VIEWS_NATIVE_FRAME_VIEW_H_
-#define ATOM_BROWSER_UI_VIEWS_NATIVE_FRAME_VIEW_H_
+#ifndef SHELL_BROWSER_UI_VIEWS_NATIVE_FRAME_VIEW_H_
+#define SHELL_BROWSER_UI_VIEWS_NATIVE_FRAME_VIEW_H_
 
 #include "ui/views/window/native_frame_view.h"
 
@@ -32,4 +32,4 @@ class NativeFrameView : public views::NativeFrameView {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_VIEWS_NATIVE_FRAME_VIEW_H_
+#endif  // SHELL_BROWSER_UI_VIEWS_NATIVE_FRAME_VIEW_H_
diff --git a/shell/browser/ui/views/root_view.h b/shell/browser/ui/views/root_view.h
index 962c5e5de36d..6c2360c19877 100644
--- a/shell/browser/ui/views/root_view.h
+++ b/shell/browser/ui/views/root_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_VIEWS_ROOT_VIEW_H_
-#define ATOM_BROWSER_UI_VIEWS_ROOT_VIEW_H_
+#ifndef SHELL_BROWSER_UI_VIEWS_ROOT_VIEW_H_
+#define SHELL_BROWSER_UI_VIEWS_ROOT_VIEW_H_
 
 #include <memory>
 
@@ -71,4 +71,4 @@ class RootView : public views::View {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_VIEWS_ROOT_VIEW_H_
+#endif  // SHELL_BROWSER_UI_VIEWS_ROOT_VIEW_H_
diff --git a/shell/browser/ui/views/submenu_button.h b/shell/browser/ui/views/submenu_button.h
index 12cab85e4658..c3733dd9f2e7 100644
--- a/shell/browser/ui/views/submenu_button.h
+++ b/shell/browser/ui/views/submenu_button.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_VIEWS_SUBMENU_BUTTON_H_
-#define ATOM_BROWSER_UI_VIEWS_SUBMENU_BUTTON_H_
+#ifndef SHELL_BROWSER_UI_VIEWS_SUBMENU_BUTTON_H_
+#define SHELL_BROWSER_UI_VIEWS_SUBMENU_BUTTON_H_
 
 #include <memory>
 
@@ -60,4 +60,4 @@ class SubmenuButton : public views::MenuButton {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_VIEWS_SUBMENU_BUTTON_H_
+#endif  // SHELL_BROWSER_UI_VIEWS_SUBMENU_BUTTON_H_
diff --git a/shell/browser/ui/views/win_frame_view.h b/shell/browser/ui/views/win_frame_view.h
index cbd7bf0e8167..b5366630a431 100644
--- a/shell/browser/ui/views/win_frame_view.h
+++ b/shell/browser/ui/views/win_frame_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_VIEWS_WIN_FRAME_VIEW_H_
-#define ATOM_BROWSER_UI_VIEWS_WIN_FRAME_VIEW_H_
+#ifndef SHELL_BROWSER_UI_VIEWS_WIN_FRAME_VIEW_H_
+#define SHELL_BROWSER_UI_VIEWS_WIN_FRAME_VIEW_H_
 
 #include "shell/browser/ui/views/frameless_view.h"
 
@@ -29,4 +29,4 @@ class WinFrameView : public FramelessView {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_VIEWS_WIN_FRAME_VIEW_H_
+#endif  // SHELL_BROWSER_UI_VIEWS_WIN_FRAME_VIEW_H_
diff --git a/shell/browser/ui/webui/pdf_viewer_handler.h b/shell/browser/ui/webui/pdf_viewer_handler.h
index 6ebff3e636e4..207df2498f7d 100644
--- a/shell/browser/ui/webui/pdf_viewer_handler.h
+++ b/shell/browser/ui/webui/pdf_viewer_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_WEBUI_PDF_VIEWER_HANDLER_H_
-#define ATOM_BROWSER_UI_WEBUI_PDF_VIEWER_HANDLER_H_
+#ifndef SHELL_BROWSER_UI_WEBUI_PDF_VIEWER_HANDLER_H_
+#define SHELL_BROWSER_UI_WEBUI_PDF_VIEWER_HANDLER_H_
 
 #include <memory>
 #include <string>
@@ -58,4 +58,4 @@ class PdfViewerHandler : public content::WebUIMessageHandler,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_WEBUI_PDF_VIEWER_HANDLER_H_
+#endif  // SHELL_BROWSER_UI_WEBUI_PDF_VIEWER_HANDLER_H_
diff --git a/shell/browser/ui/webui/pdf_viewer_ui.h b/shell/browser/ui/webui/pdf_viewer_ui.h
index f50a5800bde9..b19df6163acd 100644
--- a/shell/browser/ui/webui/pdf_viewer_ui.h
+++ b/shell/browser/ui/webui/pdf_viewer_ui.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_WEBUI_PDF_VIEWER_UI_H_
-#define ATOM_BROWSER_UI_WEBUI_PDF_VIEWER_UI_H_
+#ifndef SHELL_BROWSER_UI_WEBUI_PDF_VIEWER_UI_H_
+#define SHELL_BROWSER_UI_WEBUI_PDF_VIEWER_UI_H_
 
 #include <memory>
 #include <string>
@@ -58,4 +58,4 @@ class PdfViewerUI : public content::WebUIController,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_WEBUI_PDF_VIEWER_UI_H_
+#endif  // SHELL_BROWSER_UI_WEBUI_PDF_VIEWER_UI_H_
diff --git a/shell/browser/ui/win/atom_desktop_native_widget_aura.h b/shell/browser/ui/win/atom_desktop_native_widget_aura.h
index 0c93ab9fc716..ab4a53491a88 100644
--- a/shell/browser/ui/win/atom_desktop_native_widget_aura.h
+++ b/shell/browser/ui/win/atom_desktop_native_widget_aura.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_WIN_ATOM_DESKTOP_NATIVE_WIDGET_AURA_H_
-#define ATOM_BROWSER_UI_WIN_ATOM_DESKTOP_NATIVE_WIDGET_AURA_H_
+#ifndef SHELL_BROWSER_UI_WIN_ATOM_DESKTOP_NATIVE_WIDGET_AURA_H_
+#define SHELL_BROWSER_UI_WIN_ATOM_DESKTOP_NATIVE_WIDGET_AURA_H_
 
 #include "shell/browser/native_window_views.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
@@ -39,4 +39,4 @@ class AtomDesktopNativeWidgetAura : public views::DesktopNativeWidgetAura {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_WIN_ATOM_DESKTOP_NATIVE_WIDGET_AURA_H_
+#endif  // SHELL_BROWSER_UI_WIN_ATOM_DESKTOP_NATIVE_WIDGET_AURA_H_
diff --git a/shell/browser/ui/win/atom_desktop_window_tree_host_win.h b/shell/browser/ui/win/atom_desktop_window_tree_host_win.h
index 875f4b36e056..ee39a5ad6429 100644
--- a/shell/browser/ui/win/atom_desktop_window_tree_host_win.h
+++ b/shell/browser/ui/win/atom_desktop_window_tree_host_win.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_WIN_ATOM_DESKTOP_WINDOW_TREE_HOST_WIN_H_
-#define ATOM_BROWSER_UI_WIN_ATOM_DESKTOP_WINDOW_TREE_HOST_WIN_H_
+#ifndef SHELL_BROWSER_UI_WIN_ATOM_DESKTOP_WINDOW_TREE_HOST_WIN_H_
+#define SHELL_BROWSER_UI_WIN_ATOM_DESKTOP_WINDOW_TREE_HOST_WIN_H_
 
 #include <windows.h>
 
@@ -34,4 +34,4 @@ class AtomDesktopWindowTreeHostWin : public views::DesktopWindowTreeHostWin {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_WIN_ATOM_DESKTOP_WINDOW_TREE_HOST_WIN_H_
+#endif  // SHELL_BROWSER_UI_WIN_ATOM_DESKTOP_WINDOW_TREE_HOST_WIN_H_
diff --git a/shell/browser/ui/win/jump_list.h b/shell/browser/ui/win/jump_list.h
index 92b1b75b7ba7..c9a72d0e6875 100644
--- a/shell/browser/ui/win/jump_list.h
+++ b/shell/browser/ui/win/jump_list.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_WIN_JUMP_LIST_H_
-#define ATOM_BROWSER_UI_WIN_JUMP_LIST_H_
+#ifndef SHELL_BROWSER_UI_WIN_JUMP_LIST_H_
+#define SHELL_BROWSER_UI_WIN_JUMP_LIST_H_
 
 #include <atlbase.h>
 #include <shobjidl.h>
@@ -119,4 +119,4 @@ class JumpList {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_WIN_JUMP_LIST_H_
+#endif  // SHELL_BROWSER_UI_WIN_JUMP_LIST_H_
diff --git a/shell/browser/ui/win/notify_icon.h b/shell/browser/ui/win/notify_icon.h
index 6447021a58ad..e25475b2308d 100644
--- a/shell/browser/ui/win/notify_icon.h
+++ b/shell/browser/ui/win/notify_icon.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_WIN_NOTIFY_ICON_H_
-#define ATOM_BROWSER_UI_WIN_NOTIFY_ICON_H_
+#ifndef SHELL_BROWSER_UI_WIN_NOTIFY_ICON_H_
+#define SHELL_BROWSER_UI_WIN_NOTIFY_ICON_H_
 
 #include <windows.h>  // windows.h must be included first
 
@@ -99,4 +99,4 @@ class NotifyIcon : public TrayIcon {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_WIN_NOTIFY_ICON_H_
+#endif  // SHELL_BROWSER_UI_WIN_NOTIFY_ICON_H_
diff --git a/shell/browser/ui/win/notify_icon_host.h b/shell/browser/ui/win/notify_icon_host.h
index 6e4dd4e55223..c74e393a022e 100644
--- a/shell/browser/ui/win/notify_icon_host.h
+++ b/shell/browser/ui/win/notify_icon_host.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_WIN_NOTIFY_ICON_HOST_H_
-#define ATOM_BROWSER_UI_WIN_NOTIFY_ICON_HOST_H_
+#ifndef SHELL_BROWSER_UI_WIN_NOTIFY_ICON_HOST_H_
+#define SHELL_BROWSER_UI_WIN_NOTIFY_ICON_HOST_H_
 
 #include <windows.h>
 
@@ -63,4 +63,4 @@ class NotifyIconHost {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_WIN_NOTIFY_ICON_HOST_H_
+#endif  // SHELL_BROWSER_UI_WIN_NOTIFY_ICON_HOST_H_
diff --git a/shell/browser/ui/win/taskbar_host.h b/shell/browser/ui/win/taskbar_host.h
index e3548af1ef57..f5ff11a9ceaa 100644
--- a/shell/browser/ui/win/taskbar_host.h
+++ b/shell/browser/ui/win/taskbar_host.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_WIN_TASKBAR_HOST_H_
-#define ATOM_BROWSER_UI_WIN_TASKBAR_HOST_H_
+#ifndef SHELL_BROWSER_UI_WIN_TASKBAR_HOST_H_
+#define SHELL_BROWSER_UI_WIN_TASKBAR_HOST_H_
 
 #include <shobjidl.h>
 #include <wrl/client.h>
@@ -80,4 +80,4 @@ class TaskbarHost {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_WIN_TASKBAR_HOST_H_
+#endif  // SHELL_BROWSER_UI_WIN_TASKBAR_HOST_H_
diff --git a/shell/browser/ui/x/event_disabler.h b/shell/browser/ui/x/event_disabler.h
index 01a7cab37508..275636b75876 100644
--- a/shell/browser/ui/x/event_disabler.h
+++ b/shell/browser/ui/x/event_disabler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_X_EVENT_DISABLER_H_
-#define ATOM_BROWSER_UI_X_EVENT_DISABLER_H_
+#ifndef SHELL_BROWSER_UI_X_EVENT_DISABLER_H_
+#define SHELL_BROWSER_UI_X_EVENT_DISABLER_H_
 
 #include <memory>
 
@@ -31,4 +31,4 @@ class EventDisabler : public ui::EventRewriter {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_X_EVENT_DISABLER_H_
+#endif  // SHELL_BROWSER_UI_X_EVENT_DISABLER_H_
diff --git a/shell/browser/ui/x/window_state_watcher.h b/shell/browser/ui/x/window_state_watcher.h
index 2c0042d77ce3..d9b1e1cb30a4 100644
--- a/shell/browser/ui/x/window_state_watcher.h
+++ b/shell/browser/ui/x/window_state_watcher.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_X_WINDOW_STATE_WATCHER_H_
-#define ATOM_BROWSER_UI_X_WINDOW_STATE_WATCHER_H_
+#ifndef SHELL_BROWSER_UI_X_WINDOW_STATE_WATCHER_H_
+#define SHELL_BROWSER_UI_X_WINDOW_STATE_WATCHER_H_
 
 #include "ui/events/platform/platform_event_observer.h"
 
@@ -35,4 +35,4 @@ class WindowStateWatcher : public ui::PlatformEventObserver {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_X_WINDOW_STATE_WATCHER_H_
+#endif  // SHELL_BROWSER_UI_X_WINDOW_STATE_WATCHER_H_
diff --git a/shell/browser/ui/x/x_window_utils.h b/shell/browser/ui/x/x_window_utils.h
index a2e3315d0fc0..ee78f189f3e1 100644
--- a/shell/browser/ui/x/x_window_utils.h
+++ b/shell/browser/ui/x/x_window_utils.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_X_X_WINDOW_UTILS_H_
-#define ATOM_BROWSER_UI_X_X_WINDOW_UTILS_H_
+#ifndef SHELL_BROWSER_UI_X_X_WINDOW_UTILS_H_
+#define SHELL_BROWSER_UI_X_X_WINDOW_UTILS_H_
 
 #include <string>
 
@@ -28,4 +28,4 @@ void MoveWindowToForeground(::Window xwindow);
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UI_X_X_WINDOW_UTILS_H_
+#endif  // SHELL_BROWSER_UI_X_X_WINDOW_UTILS_H_
diff --git a/shell/browser/unresponsive_suppressor.h b/shell/browser/unresponsive_suppressor.h
index 9fb3819237d5..b0b3689c709b 100644
--- a/shell/browser/unresponsive_suppressor.h
+++ b/shell/browser/unresponsive_suppressor.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UNRESPONSIVE_SUPPRESSOR_H_
-#define ATOM_BROWSER_UNRESPONSIVE_SUPPRESSOR_H_
+#ifndef SHELL_BROWSER_UNRESPONSIVE_SUPPRESSOR_H_
+#define SHELL_BROWSER_UNRESPONSIVE_SUPPRESSOR_H_
 
 #include "base/macros.h"
 
@@ -22,4 +22,4 @@ class UnresponsiveSuppressor {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_UNRESPONSIVE_SUPPRESSOR_H_
+#endif  // SHELL_BROWSER_UNRESPONSIVE_SUPPRESSOR_H_
diff --git a/shell/browser/web_contents_permission_helper.h b/shell/browser/web_contents_permission_helper.h
index 6b6e2a8176e4..28afb686d4ae 100644
--- a/shell/browser/web_contents_permission_helper.h
+++ b/shell/browser/web_contents_permission_helper.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_WEB_CONTENTS_PERMISSION_HELPER_H_
-#define ATOM_BROWSER_WEB_CONTENTS_PERMISSION_HELPER_H_
+#ifndef SHELL_BROWSER_WEB_CONTENTS_PERMISSION_HELPER_H_
+#define SHELL_BROWSER_WEB_CONTENTS_PERMISSION_HELPER_H_
 
 #include "content/public/browser/media_stream_request.h"
 #include "content/public/browser/permission_type.h"
@@ -60,4 +60,4 @@ class WebContentsPermissionHelper
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_WEB_CONTENTS_PERMISSION_HELPER_H_
+#endif  // SHELL_BROWSER_WEB_CONTENTS_PERMISSION_HELPER_H_
diff --git a/shell/browser/web_contents_preferences.h b/shell/browser/web_contents_preferences.h
index 465acf4a1569..4ee84661bb46 100644
--- a/shell/browser/web_contents_preferences.h
+++ b/shell/browser/web_contents_preferences.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_WEB_CONTENTS_PREFERENCES_H_
-#define ATOM_BROWSER_WEB_CONTENTS_PREFERENCES_H_
+#ifndef SHELL_BROWSER_WEB_CONTENTS_PREFERENCES_H_
+#define SHELL_BROWSER_WEB_CONTENTS_PREFERENCES_H_
 
 #include <string>
 #include <vector>
@@ -95,4 +95,4 @@ class WebContentsPreferences
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_WEB_CONTENTS_PREFERENCES_H_
+#endif  // SHELL_BROWSER_WEB_CONTENTS_PREFERENCES_H_
diff --git a/shell/browser/web_contents_zoom_controller.h b/shell/browser/web_contents_zoom_controller.h
index c901342c9c7c..48e0a9adfd4f 100644
--- a/shell/browser/web_contents_zoom_controller.h
+++ b/shell/browser/web_contents_zoom_controller.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_WEB_CONTENTS_ZOOM_CONTROLLER_H_
-#define ATOM_BROWSER_WEB_CONTENTS_ZOOM_CONTROLLER_H_
+#ifndef SHELL_BROWSER_WEB_CONTENTS_ZOOM_CONTROLLER_H_
+#define SHELL_BROWSER_WEB_CONTENTS_ZOOM_CONTROLLER_H_
 
 #include <map>
 #include <string>
@@ -119,4 +119,4 @@ class WebContentsZoomController
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_WEB_CONTENTS_ZOOM_CONTROLLER_H_
+#endif  // SHELL_BROWSER_WEB_CONTENTS_ZOOM_CONTROLLER_H_
diff --git a/shell/browser/web_dialog_helper.h b/shell/browser/web_dialog_helper.h
index ccb7ab8ffa0d..e69aa9e36ec8 100644
--- a/shell/browser/web_dialog_helper.h
+++ b/shell/browser/web_dialog_helper.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_WEB_DIALOG_HELPER_H_
-#define ATOM_BROWSER_WEB_DIALOG_HELPER_H_
+#ifndef SHELL_BROWSER_WEB_DIALOG_HELPER_H_
+#define SHELL_BROWSER_WEB_DIALOG_HELPER_H_
 
 #include <memory>
 #include <vector>
@@ -75,4 +75,4 @@ class WebDialogHelper {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_WEB_DIALOG_HELPER_H_
+#endif  // SHELL_BROWSER_WEB_DIALOG_HELPER_H_
diff --git a/shell/browser/web_view_guest_delegate.h b/shell/browser/web_view_guest_delegate.h
index 7162ff6598a2..df77024c609e 100644
--- a/shell/browser/web_view_guest_delegate.h
+++ b/shell/browser/web_view_guest_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_WEB_VIEW_GUEST_DELEGATE_H_
-#define ATOM_BROWSER_WEB_VIEW_GUEST_DELEGATE_H_
+#ifndef SHELL_BROWSER_WEB_VIEW_GUEST_DELEGATE_H_
+#define SHELL_BROWSER_WEB_VIEW_GUEST_DELEGATE_H_
 
 #include "content/public/browser/browser_plugin_guest_delegate.h"
 #include "shell/browser/web_contents_zoom_controller.h"
@@ -57,4 +57,4 @@ class WebViewGuestDelegate : public content::BrowserPluginGuestDelegate,
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_WEB_VIEW_GUEST_DELEGATE_H_
+#endif  // SHELL_BROWSER_WEB_VIEW_GUEST_DELEGATE_H_
diff --git a/shell/browser/web_view_manager.h b/shell/browser/web_view_manager.h
index 1adc27678da9..904bae1b585f 100644
--- a/shell/browser/web_view_manager.h
+++ b/shell/browser/web_view_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_WEB_VIEW_MANAGER_H_
-#define ATOM_BROWSER_WEB_VIEW_MANAGER_H_
+#ifndef SHELL_BROWSER_WEB_VIEW_MANAGER_H_
+#define SHELL_BROWSER_WEB_VIEW_MANAGER_H_
 
 #include <map>
 
@@ -67,4 +67,4 @@ class WebViewManager : public content::BrowserPluginGuestManager {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_WEB_VIEW_MANAGER_H_
+#endif  // SHELL_BROWSER_WEB_VIEW_MANAGER_H_
diff --git a/shell/browser/win/scoped_hstring.h b/shell/browser/win/scoped_hstring.h
index 2b4b8658ce43..169c7e50b91f 100644
--- a/shell/browser/win/scoped_hstring.h
+++ b/shell/browser/win/scoped_hstring.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef ATOM_BROWSER_WIN_SCOPED_HSTRING_H_
-#define ATOM_BROWSER_WIN_SCOPED_HSTRING_H_
+#ifndef SHELL_BROWSER_WIN_SCOPED_HSTRING_H_
+#define SHELL_BROWSER_WIN_SCOPED_HSTRING_H_
 
 #include <hstring.h>
 #include <windows.h>
@@ -42,4 +42,4 @@ class ScopedHString {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_WIN_SCOPED_HSTRING_H_
+#endif  // SHELL_BROWSER_WIN_SCOPED_HSTRING_H_
diff --git a/shell/browser/window_list.h b/shell/browser/window_list.h
index e336c8073dc8..f7f8ca91e1db 100644
--- a/shell/browser/window_list.h
+++ b/shell/browser/window_list.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_WINDOW_LIST_H_
-#define ATOM_BROWSER_WINDOW_LIST_H_
+#ifndef SHELL_BROWSER_WINDOW_LIST_H_
+#define SHELL_BROWSER_WINDOW_LIST_H_
 
 #include <vector>
 
@@ -61,4 +61,4 @@ class WindowList {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_WINDOW_LIST_H_
+#endif  // SHELL_BROWSER_WINDOW_LIST_H_
diff --git a/shell/browser/window_list_observer.h b/shell/browser/window_list_observer.h
index b6e0a1e7209e..8c4c8ec8d3dc 100644
--- a/shell/browser/window_list_observer.h
+++ b/shell/browser/window_list_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_WINDOW_LIST_OBSERVER_H_
-#define ATOM_BROWSER_WINDOW_LIST_OBSERVER_H_
+#ifndef SHELL_BROWSER_WINDOW_LIST_OBSERVER_H_
+#define SHELL_BROWSER_WINDOW_LIST_OBSERVER_H_
 
 #include "base/observer_list_types.h"
 
@@ -31,4 +31,4 @@ class WindowListObserver : public base::CheckedObserver {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_WINDOW_LIST_OBSERVER_H_
+#endif  // SHELL_BROWSER_WINDOW_LIST_OBSERVER_H_
diff --git a/shell/browser/zoom_level_delegate.h b/shell/browser/zoom_level_delegate.h
index 6b5ec94fc0e7..c3bb7147c9a8 100644
--- a/shell/browser/zoom_level_delegate.h
+++ b/shell/browser/zoom_level_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_ZOOM_LEVEL_DELEGATE_H_
-#define ATOM_BROWSER_ZOOM_LEVEL_DELEGATE_H_
+#ifndef SHELL_BROWSER_ZOOM_LEVEL_DELEGATE_H_
+#define SHELL_BROWSER_ZOOM_LEVEL_DELEGATE_H_
 
 #include <memory>
 #include <string>
@@ -61,4 +61,4 @@ class ZoomLevelDelegate : public content::ZoomLevelDelegate {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_ZOOM_LEVEL_DELEGATE_H_
+#endif  // SHELL_BROWSER_ZOOM_LEVEL_DELEGATE_H_
diff --git a/shell/common/api/atom_api_clipboard.h b/shell/common/api/atom_api_clipboard.h
index cdc81049ac66..56c5316dbaa4 100644
--- a/shell/common/api/atom_api_clipboard.h
+++ b/shell/common/api/atom_api_clipboard.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_API_ATOM_API_CLIPBOARD_H_
-#define ATOM_COMMON_API_ATOM_API_CLIPBOARD_H_
+#ifndef SHELL_COMMON_API_ATOM_API_CLIPBOARD_H_
+#define SHELL_COMMON_API_ATOM_API_CLIPBOARD_H_
 
 #include <string>
 #include <vector>
@@ -61,4 +61,4 @@ class Clipboard {
 
 }  // namespace atom
 
-#endif  // ATOM_COMMON_API_ATOM_API_CLIPBOARD_H_
+#endif  // SHELL_COMMON_API_ATOM_API_CLIPBOARD_H_
diff --git a/shell/common/api/atom_api_key_weak_map.h b/shell/common/api/atom_api_key_weak_map.h
index e585cbceba90..88815c4d10b7 100644
--- a/shell/common/api/atom_api_key_weak_map.h
+++ b/shell/common/api/atom_api_key_weak_map.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_API_ATOM_API_KEY_WEAK_MAP_H_
-#define ATOM_COMMON_API_ATOM_API_KEY_WEAK_MAP_H_
+#ifndef SHELL_COMMON_API_ATOM_API_KEY_WEAK_MAP_H_
+#define SHELL_COMMON_API_ATOM_API_KEY_WEAK_MAP_H_
 
 #include "native_mate/handle.h"
 #include "native_mate/object_template_builder.h"
@@ -60,4 +60,4 @@ class KeyWeakMap : public mate::Wrappable<KeyWeakMap<K>> {
 
 }  // namespace atom
 
-#endif  // ATOM_COMMON_API_ATOM_API_KEY_WEAK_MAP_H_
+#endif  // SHELL_COMMON_API_ATOM_API_KEY_WEAK_MAP_H_
diff --git a/shell/common/api/atom_api_native_image.h b/shell/common/api/atom_api_native_image.h
index 586f3a75cefd..42b2a472f344 100644
--- a/shell/common/api/atom_api_native_image.h
+++ b/shell/common/api/atom_api_native_image.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_API_ATOM_API_NATIVE_IMAGE_H_
-#define ATOM_COMMON_API_ATOM_API_NATIVE_IMAGE_H_
+#ifndef SHELL_COMMON_API_ATOM_API_NATIVE_IMAGE_H_
+#define SHELL_COMMON_API_ATOM_API_NATIVE_IMAGE_H_
 
 #include <map>
 #include <string>
@@ -130,4 +130,4 @@ struct Converter<mate::Handle<atom::api::NativeImage>> {
 
 }  // namespace mate
 
-#endif  // ATOM_COMMON_API_ATOM_API_NATIVE_IMAGE_H_
+#endif  // SHELL_COMMON_API_ATOM_API_NATIVE_IMAGE_H_
diff --git a/shell/common/api/constructor.h b/shell/common/api/constructor.h
index 7da8b9d37af5..c08869cefb1e 100644
--- a/shell/common/api/constructor.h
+++ b/shell/common/api/constructor.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_API_CONSTRUCTOR_H_
-#define ATOM_COMMON_API_CONSTRUCTOR_H_
+#ifndef SHELL_COMMON_API_CONSTRUCTOR_H_
+#define SHELL_COMMON_API_CONSTRUCTOR_H_
 
 #include "native_mate/constructor.h"
 
@@ -31,4 +31,4 @@ v8::Local<v8::Function> CreateConstructor(
 
 }  // namespace mate
 
-#endif  // ATOM_COMMON_API_CONSTRUCTOR_H_
+#endif  // SHELL_COMMON_API_CONSTRUCTOR_H_
diff --git a/shell/common/api/electron_bindings.h b/shell/common/api/electron_bindings.h
index 5ac970eae74d..37b9683b6ddd 100644
--- a/shell/common/api/electron_bindings.h
+++ b/shell/common/api/electron_bindings.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_API_ELECTRON_BINDINGS_H_
-#define ATOM_COMMON_API_ELECTRON_BINDINGS_H_
+#ifndef SHELL_COMMON_API_ELECTRON_BINDINGS_H_
+#define SHELL_COMMON_API_ELECTRON_BINDINGS_H_
 
 #include <list>
 #include <memory>
@@ -84,4 +84,4 @@ class ElectronBindings {
 
 }  // namespace atom
 
-#endif  // ATOM_COMMON_API_ELECTRON_BINDINGS_H_
+#endif  // SHELL_COMMON_API_ELECTRON_BINDINGS_H_
diff --git a/shell/common/api/event_emitter_caller.h b/shell/common/api/event_emitter_caller.h
index fe23c042d8e5..fa51333ed341 100644
--- a/shell/common/api/event_emitter_caller.h
+++ b/shell/common/api/event_emitter_caller.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_API_EVENT_EMITTER_CALLER_H_
-#define ATOM_COMMON_API_EVENT_EMITTER_CALLER_H_
+#ifndef SHELL_COMMON_API_EVENT_EMITTER_CALLER_H_
+#define SHELL_COMMON_API_EVENT_EMITTER_CALLER_H_
 
 #include <utility>
 #include <vector>
@@ -66,4 +66,4 @@ v8::Local<v8::Value> CustomEmit(v8::Isolate* isolate,
 
 }  // namespace mate
 
-#endif  // ATOM_COMMON_API_EVENT_EMITTER_CALLER_H_
+#endif  // SHELL_COMMON_API_EVENT_EMITTER_CALLER_H_
diff --git a/shell/common/api/locker.h b/shell/common/api/locker.h
index e64ef1853ec5..6cafa9fe81ec 100644
--- a/shell/common/api/locker.h
+++ b/shell/common/api/locker.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE.chromium file.
 
-#ifndef ATOM_COMMON_API_LOCKER_H_
-#define ATOM_COMMON_API_LOCKER_H_
+#ifndef SHELL_COMMON_API_LOCKER_H_
+#define SHELL_COMMON_API_LOCKER_H_
 
 #include <memory>
 
@@ -33,4 +33,4 @@ class Locker {
 
 }  // namespace mate
 
-#endif  // ATOM_COMMON_API_LOCKER_H_
+#endif  // SHELL_COMMON_API_LOCKER_H_
diff --git a/shell/common/api/object_life_monitor.h b/shell/common/api/object_life_monitor.h
index e047960e8130..5e0225c8aa62 100644
--- a/shell/common/api/object_life_monitor.h
+++ b/shell/common/api/object_life_monitor.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_API_OBJECT_LIFE_MONITOR_H_
-#define ATOM_COMMON_API_OBJECT_LIFE_MONITOR_H_
+#ifndef SHELL_COMMON_API_OBJECT_LIFE_MONITOR_H_
+#define SHELL_COMMON_API_OBJECT_LIFE_MONITOR_H_
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
@@ -31,4 +31,4 @@ class ObjectLifeMonitor {
 
 }  // namespace atom
 
-#endif  // ATOM_COMMON_API_OBJECT_LIFE_MONITOR_H_
+#endif  // SHELL_COMMON_API_OBJECT_LIFE_MONITOR_H_
diff --git a/shell/common/api/remote_callback_freer.h b/shell/common/api/remote_callback_freer.h
index 988b6a04280a..4a05e41a453a 100644
--- a/shell/common/api/remote_callback_freer.h
+++ b/shell/common/api/remote_callback_freer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_API_REMOTE_CALLBACK_FREER_H_
-#define ATOM_COMMON_API_REMOTE_CALLBACK_FREER_H_
+#ifndef SHELL_COMMON_API_REMOTE_CALLBACK_FREER_H_
+#define SHELL_COMMON_API_REMOTE_CALLBACK_FREER_H_
 
 #include <string>
 
@@ -43,4 +43,4 @@ class RemoteCallbackFreer : public ObjectLifeMonitor,
 
 }  // namespace atom
 
-#endif  // ATOM_COMMON_API_REMOTE_CALLBACK_FREER_H_
+#endif  // SHELL_COMMON_API_REMOTE_CALLBACK_FREER_H_
diff --git a/shell/common/api/remote_object_freer.h b/shell/common/api/remote_object_freer.h
index 0405d3cb5c56..6f2e409315a6 100644
--- a/shell/common/api/remote_object_freer.h
+++ b/shell/common/api/remote_object_freer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_API_REMOTE_OBJECT_FREER_H_
-#define ATOM_COMMON_API_REMOTE_OBJECT_FREER_H_
+#ifndef SHELL_COMMON_API_REMOTE_OBJECT_FREER_H_
+#define SHELL_COMMON_API_REMOTE_OBJECT_FREER_H_
 
 #include <map>
 #include <string>
@@ -42,4 +42,4 @@ class RemoteObjectFreer : public ObjectLifeMonitor {
 
 }  // namespace atom
 
-#endif  // ATOM_COMMON_API_REMOTE_OBJECT_FREER_H_
+#endif  // SHELL_COMMON_API_REMOTE_OBJECT_FREER_H_
diff --git a/shell/common/application_info.h b/shell/common/application_info.h
index 8e55d2d55632..3959913895d3 100644
--- a/shell/common/application_info.h
+++ b/shell/common/application_info.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_APPLICATION_INFO_H_
-#define ATOM_COMMON_APPLICATION_INFO_H_
+#ifndef SHELL_COMMON_APPLICATION_INFO_H_
+#define SHELL_COMMON_APPLICATION_INFO_H_
 
 #if defined(OS_WIN)
 #include "base/strings/string16.h"
@@ -34,4 +34,4 @@ bool IsRunningInDesktopBridge();
 
 }  // namespace atom
 
-#endif  // ATOM_COMMON_APPLICATION_INFO_H_
+#endif  // SHELL_COMMON_APPLICATION_INFO_H_
diff --git a/shell/common/asar/archive.h b/shell/common/asar/archive.h
index 5715578ca16a..d97cb03cc781 100644
--- a/shell/common/asar/archive.h
+++ b/shell/common/asar/archive.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_ASAR_ARCHIVE_H_
-#define ATOM_COMMON_ASAR_ARCHIVE_H_
+#ifndef SHELL_COMMON_ASAR_ARCHIVE_H_
+#define SHELL_COMMON_ASAR_ARCHIVE_H_
 
 #include <memory>
 #include <unordered_map>
@@ -84,4 +84,4 @@ class Archive {
 
 }  // namespace asar
 
-#endif  // ATOM_COMMON_ASAR_ARCHIVE_H_
+#endif  // SHELL_COMMON_ASAR_ARCHIVE_H_
diff --git a/shell/common/asar/asar_util.h b/shell/common/asar/asar_util.h
index 90ffb9b46a30..c37f95399ada 100644
--- a/shell/common/asar/asar_util.h
+++ b/shell/common/asar/asar_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_ASAR_ASAR_UTIL_H_
-#define ATOM_COMMON_ASAR_ASAR_UTIL_H_
+#ifndef SHELL_COMMON_ASAR_ASAR_UTIL_H_
+#define SHELL_COMMON_ASAR_ASAR_UTIL_H_
 
 #include <memory>
 #include <string>
@@ -32,4 +32,4 @@ bool ReadFileToString(const base::FilePath& path, std::string* contents);
 
 }  // namespace asar
 
-#endif  // ATOM_COMMON_ASAR_ASAR_UTIL_H_
+#endif  // SHELL_COMMON_ASAR_ASAR_UTIL_H_
diff --git a/shell/common/asar/scoped_temporary_file.h b/shell/common/asar/scoped_temporary_file.h
index 4a55958b8084..9aadb1ade77f 100644
--- a/shell/common/asar/scoped_temporary_file.h
+++ b/shell/common/asar/scoped_temporary_file.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_ASAR_SCOPED_TEMPORARY_FILE_H_
-#define ATOM_COMMON_ASAR_SCOPED_TEMPORARY_FILE_H_
+#ifndef SHELL_COMMON_ASAR_SCOPED_TEMPORARY_FILE_H_
+#define SHELL_COMMON_ASAR_SCOPED_TEMPORARY_FILE_H_
 
 #include "base/files/file_path.h"
 
@@ -41,4 +41,4 @@ class ScopedTemporaryFile {
 
 }  // namespace asar
 
-#endif  // ATOM_COMMON_ASAR_SCOPED_TEMPORARY_FILE_H_
+#endif  // SHELL_COMMON_ASAR_SCOPED_TEMPORARY_FILE_H_
diff --git a/shell/common/atom_command_line.h b/shell/common/atom_command_line.h
index 57dab57e78c4..d0a0c5abd1ab 100644
--- a/shell/common/atom_command_line.h
+++ b/shell/common/atom_command_line.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_ATOM_COMMAND_LINE_H_
-#define ATOM_COMMON_ATOM_COMMAND_LINE_H_
+#ifndef SHELL_COMMON_ATOM_COMMAND_LINE_H_
+#define SHELL_COMMON_ATOM_COMMAND_LINE_H_
 
 #include <string>
 #include <vector>
@@ -35,4 +35,4 @@ class AtomCommandLine {
 
 }  // namespace atom
 
-#endif  // ATOM_COMMON_ATOM_COMMAND_LINE_H_
+#endif  // SHELL_COMMON_ATOM_COMMAND_LINE_H_
diff --git a/shell/common/atom_constants.h b/shell/common/atom_constants.h
index 463d654d86ef..a9cd85e6504e 100644
--- a/shell/common/atom_constants.h
+++ b/shell/common/atom_constants.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_ATOM_CONSTANTS_H_
-#define ATOM_COMMON_ATOM_CONSTANTS_H_
+#ifndef SHELL_COMMON_ATOM_CONSTANTS_H_
+#define SHELL_COMMON_ATOM_CONSTANTS_H_
 
 #include "build/build_config.h"
 #include "electron/buildflags/buildflags.h"
@@ -49,4 +49,4 @@ extern const char kPdfViewerUIHost[];
 
 }  // namespace atom
 
-#endif  // ATOM_COMMON_ATOM_CONSTANTS_H_
+#endif  // SHELL_COMMON_ATOM_CONSTANTS_H_
diff --git a/shell/common/color_util.h b/shell/common/color_util.h
index 1186803c7648..e198b1cace1a 100644
--- a/shell/common/color_util.h
+++ b/shell/common/color_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_COLOR_UTIL_H_
-#define ATOM_COMMON_COLOR_UTIL_H_
+#ifndef SHELL_COMMON_COLOR_UTIL_H_
+#define SHELL_COMMON_COLOR_UTIL_H_
 
 #include <string>
 
@@ -19,4 +19,4 @@ std::string ToRGBHex(SkColor color);
 
 }  // namespace atom
 
-#endif  // ATOM_COMMON_COLOR_UTIL_H_
+#endif  // SHELL_COMMON_COLOR_UTIL_H_
diff --git a/shell/common/crash_reporter/crash_reporter.h b/shell/common/crash_reporter/crash_reporter.h
index 357d91e8f991..e186e6698e93 100644
--- a/shell/common/crash_reporter/crash_reporter.h
+++ b/shell/common/crash_reporter/crash_reporter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_H_
-#define ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_H_
+#ifndef SHELL_COMMON_CRASH_REPORTER_CRASH_REPORTER_H_
+#define SHELL_COMMON_CRASH_REPORTER_CRASH_REPORTER_H_
 
 #include <map>
 #include <string>
@@ -70,4 +70,4 @@ class CrashReporter {
 
 }  // namespace crash_reporter
 
-#endif  // ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_H_
+#endif  // SHELL_COMMON_CRASH_REPORTER_CRASH_REPORTER_H_
diff --git a/shell/common/crash_reporter/crash_reporter_crashpad.h b/shell/common/crash_reporter/crash_reporter_crashpad.h
index 1baf7e441d89..bc51fe2cf65c 100644
--- a/shell/common/crash_reporter/crash_reporter_crashpad.h
+++ b/shell/common/crash_reporter/crash_reporter_crashpad.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_CRASHPAD_H_
-#define ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_CRASHPAD_H_
+#ifndef SHELL_COMMON_CRASH_REPORTER_CRASH_REPORTER_CRASHPAD_H_
+#define SHELL_COMMON_CRASH_REPORTER_CRASH_REPORTER_CRASHPAD_H_
 
 #include <map>
 #include <memory>
@@ -47,4 +47,4 @@ class CrashReporterCrashpad : public CrashReporter {
 
 }  // namespace crash_reporter
 
-#endif  // ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_CRASHPAD_H_
+#endif  // SHELL_COMMON_CRASH_REPORTER_CRASH_REPORTER_CRASHPAD_H_
diff --git a/shell/common/crash_reporter/crash_reporter_linux.h b/shell/common/crash_reporter/crash_reporter_linux.h
index 05e0105ddfd1..49e1fb8110e1 100644
--- a/shell/common/crash_reporter/crash_reporter_linux.h
+++ b/shell/common/crash_reporter/crash_reporter_linux.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_LINUX_H_
-#define ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_LINUX_H_
+#ifndef SHELL_COMMON_CRASH_REPORTER_CRASH_REPORTER_LINUX_H_
+#define SHELL_COMMON_CRASH_REPORTER_CRASH_REPORTER_LINUX_H_
 
 #include <memory>
 #include <string>
@@ -62,4 +62,4 @@ class CrashReporterLinux : public CrashReporter {
 };
 }  // namespace crash_reporter
 
-#endif  // ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_LINUX_H_
+#endif  // SHELL_COMMON_CRASH_REPORTER_CRASH_REPORTER_LINUX_H_
diff --git a/shell/common/crash_reporter/crash_reporter_mac.h b/shell/common/crash_reporter/crash_reporter_mac.h
index dc5b49f4bb94..9747645bb455 100644
--- a/shell/common/crash_reporter/crash_reporter_mac.h
+++ b/shell/common/crash_reporter/crash_reporter_mac.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_MAC_H_
-#define ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_MAC_H_
+#ifndef SHELL_COMMON_CRASH_REPORTER_CRASH_REPORTER_MAC_H_
+#define SHELL_COMMON_CRASH_REPORTER_CRASH_REPORTER_MAC_H_
 
 #include <memory>
 #include <string>
@@ -40,4 +40,4 @@ class CrashReporterMac : public CrashReporterCrashpad {
 
 }  // namespace crash_reporter
 
-#endif  // ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_MAC_H_
+#endif  // SHELL_COMMON_CRASH_REPORTER_CRASH_REPORTER_MAC_H_
diff --git a/shell/common/crash_reporter/crash_reporter_win.h b/shell/common/crash_reporter/crash_reporter_win.h
index aca1dead6731..2312d85fe7db 100644
--- a/shell/common/crash_reporter/crash_reporter_win.h
+++ b/shell/common/crash_reporter/crash_reporter_win.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_WIN_H_
-#define ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_WIN_H_
+#ifndef SHELL_COMMON_CRASH_REPORTER_CRASH_REPORTER_WIN_H_
+#define SHELL_COMMON_CRASH_REPORTER_CRASH_REPORTER_WIN_H_
 
 #include <memory>
 #include <string>
@@ -49,4 +49,4 @@ class CrashReporterWin : public CrashReporterCrashpad {
 
 }  // namespace crash_reporter
 
-#endif  // ATOM_COMMON_CRASH_REPORTER_CRASH_REPORTER_WIN_H_
+#endif  // SHELL_COMMON_CRASH_REPORTER_CRASH_REPORTER_WIN_H_
diff --git a/shell/common/crash_reporter/linux/crash_dump_handler.h b/shell/common/crash_reporter/linux/crash_dump_handler.h
index 99843c39fdfd..da53c517decc 100644
--- a/shell/common/crash_reporter/linux/crash_dump_handler.h
+++ b/shell/common/crash_reporter/linux/crash_dump_handler.h
@@ -3,8 +3,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_CRASH_REPORTER_LINUX_CRASH_DUMP_HANDLER_H_
-#define ATOM_COMMON_CRASH_REPORTER_LINUX_CRASH_DUMP_HANDLER_H_
+#ifndef SHELL_COMMON_CRASH_REPORTER_LINUX_CRASH_DUMP_HANDLER_H_
+#define SHELL_COMMON_CRASH_REPORTER_LINUX_CRASH_DUMP_HANDLER_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -43,4 +43,4 @@ extern char g_crash_log_path[256];
 
 }  // namespace crash_reporter
 
-#endif  // ATOM_COMMON_CRASH_REPORTER_LINUX_CRASH_DUMP_HANDLER_H_
+#endif  // SHELL_COMMON_CRASH_REPORTER_LINUX_CRASH_DUMP_HANDLER_H_
diff --git a/shell/common/crash_reporter/win/crash_service.h b/shell/common/crash_reporter/win/crash_service.h
index 93bbb7c36de3..7a9f2b7dc48e 100644
--- a/shell/common/crash_reporter/win/crash_service.h
+++ b/shell/common/crash_reporter/win/crash_service.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_H_
-#define ATOM_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_H_
+#ifndef SHELL_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_H_
+#define SHELL_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_H_
 
 #include <string>
 
@@ -127,4 +127,4 @@ class CrashService {
 
 }  // namespace breakpad
 
-#endif  // ATOM_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_H_
+#endif  // SHELL_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_H_
diff --git a/shell/common/crash_reporter/win/crash_service_main.h b/shell/common/crash_reporter/win/crash_service_main.h
index 4481fb50ae66..70e88af3ee87 100644
--- a/shell/common/crash_reporter/win/crash_service_main.h
+++ b/shell/common/crash_reporter/win/crash_service_main.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_MAIN_H_
-#define ATOM_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_MAIN_H_
+#ifndef SHELL_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_MAIN_H_
+#define SHELL_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_MAIN_H_
 
 #include <vector>
 
@@ -14,4 +14,4 @@ int Main(std::vector<char*>* args);
 
 }  // namespace crash_service
 
-#endif  // ATOM_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_MAIN_H_
+#endif  // SHELL_COMMON_CRASH_REPORTER_WIN_CRASH_SERVICE_MAIN_H_
diff --git a/shell/common/deprecate_util.h b/shell/common/deprecate_util.h
index 2aaaa96cc827..184d2849e192 100644
--- a/shell/common/deprecate_util.h
+++ b/shell/common/deprecate_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_DEPRECATE_UTIL_H_
-#define ATOM_COMMON_DEPRECATE_UTIL_H_
+#ifndef SHELL_COMMON_DEPRECATE_UTIL_H_
+#define SHELL_COMMON_DEPRECATE_UTIL_H_
 
 #include <string>
 
@@ -17,4 +17,4 @@ void EmitDeprecationWarning(node::Environment* env,
 
 }  // namespace atom
 
-#endif  // ATOM_COMMON_DEPRECATE_UTIL_H_
+#endif  // SHELL_COMMON_DEPRECATE_UTIL_H_
diff --git a/shell/common/gin_util.h b/shell/common/gin_util.h
index d2d928f7954b..875fc5b59259 100644
--- a/shell/common/gin_util.h
+++ b/shell/common/gin_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_GIN_UTIL_H_
-#define ATOM_COMMON_GIN_UTIL_H_
+#ifndef SHELL_COMMON_GIN_UTIL_H_
+#define SHELL_COMMON_GIN_UTIL_H_
 
 #include "gin/converter.h"
 #include "gin/function_template.h"
@@ -26,4 +26,4 @@ bool SetMethod(v8::Local<v8::Object> recv,
 
 }  // namespace gin_util
 
-#endif  // ATOM_COMMON_GIN_UTIL_H_
+#endif  // SHELL_COMMON_GIN_UTIL_H_
diff --git a/shell/common/heap_snapshot.h b/shell/common/heap_snapshot.h
index 8db7aeeb7c3f..a54466d61d46 100644
--- a/shell/common/heap_snapshot.h
+++ b/shell/common/heap_snapshot.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_HEAP_SNAPSHOT_H_
-#define ATOM_COMMON_HEAP_SNAPSHOT_H_
+#ifndef SHELL_COMMON_HEAP_SNAPSHOT_H_
+#define SHELL_COMMON_HEAP_SNAPSHOT_H_
 
 #include "base/files/file.h"
 #include "v8/include/v8.h"
@@ -14,4 +14,4 @@ bool TakeHeapSnapshot(v8::Isolate* isolate, base::File* file);
 
 }  // namespace atom
 
-#endif  // ATOM_COMMON_HEAP_SNAPSHOT_H_
+#endif  // SHELL_COMMON_HEAP_SNAPSHOT_H_
diff --git a/shell/common/key_weak_map.h b/shell/common/key_weak_map.h
index 9588519335a6..c384a000dd63 100644
--- a/shell/common/key_weak_map.h
+++ b/shell/common/key_weak_map.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_KEY_WEAK_MAP_H_
-#define ATOM_COMMON_KEY_WEAK_MAP_H_
+#ifndef SHELL_COMMON_KEY_WEAK_MAP_H_
+#define SHELL_COMMON_KEY_WEAK_MAP_H_
 
 #include <unordered_map>
 #include <utility>
@@ -84,4 +84,4 @@ class KeyWeakMap {
 
 }  // namespace atom
 
-#endif  // ATOM_COMMON_KEY_WEAK_MAP_H_
+#endif  // SHELL_COMMON_KEY_WEAK_MAP_H_
diff --git a/shell/common/keyboard_util.h b/shell/common/keyboard_util.h
index ad6dd9c0de6c..42948faf5d42 100644
--- a/shell/common/keyboard_util.h
+++ b/shell/common/keyboard_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_KEYBOARD_UTIL_H_
-#define ATOM_COMMON_KEYBOARD_UTIL_H_
+#ifndef SHELL_COMMON_KEYBOARD_UTIL_H_
+#define SHELL_COMMON_KEYBOARD_UTIL_H_
 
 #include <string>
 
@@ -25,4 +25,4 @@ int WebEventModifiersToEventFlags(int modifiers);
 
 }  // namespace atom
 
-#endif  // ATOM_COMMON_KEYBOARD_UTIL_H_
+#endif  // SHELL_COMMON_KEYBOARD_UTIL_H_
diff --git a/shell/common/mac/main_application_bundle.h b/shell/common/mac/main_application_bundle.h
index ab1ea6d614da..40afb7c1cb27 100644
--- a/shell/common/mac/main_application_bundle.h
+++ b/shell/common/mac/main_application_bundle.h
@@ -3,8 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef ATOM_COMMON_MAC_MAIN_APPLICATION_BUNDLE_H_
-#define ATOM_COMMON_MAC_MAIN_APPLICATION_BUNDLE_H_
+#ifndef SHELL_COMMON_MAC_MAIN_APPLICATION_BUNDLE_H_
+#define SHELL_COMMON_MAC_MAIN_APPLICATION_BUNDLE_H_
 
 @class NSBundle;
 
@@ -23,4 +23,4 @@ base::FilePath MainApplicationBundlePath();
 
 }  // namespace atom
 
-#endif  // ATOM_COMMON_MAC_MAIN_APPLICATION_BUNDLE_H_
+#endif  // SHELL_COMMON_MAC_MAIN_APPLICATION_BUNDLE_H_
diff --git a/shell/common/mouse_util.h b/shell/common/mouse_util.h
index efc70eeb7bdf..fe9acd379a85 100644
--- a/shell/common/mouse_util.h
+++ b/shell/common/mouse_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_MOUSE_UTIL_H_
-#define ATOM_COMMON_MOUSE_UTIL_H_
+#ifndef SHELL_COMMON_MOUSE_UTIL_H_
+#define SHELL_COMMON_MOUSE_UTIL_H_
 
 #include <string>
 #include "content/common/cursors/webcursor.h"
@@ -31,4 +31,4 @@ std::string CursorTypeToString(const content::CursorInfo& info);
 
 }  // namespace atom
 
-#endif  // ATOM_COMMON_MOUSE_UTIL_H_
+#endif  // SHELL_COMMON_MOUSE_UTIL_H_
diff --git a/shell/common/native_mate_converters/accelerator_converter.h b/shell/common/native_mate_converters/accelerator_converter.h
index f2f6b56e9851..89251c29b536 100644
--- a/shell/common/native_mate_converters/accelerator_converter.h
+++ b/shell/common/native_mate_converters/accelerator_converter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_ACCELERATOR_CONVERTER_H_
-#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_ACCELERATOR_CONVERTER_H_
+#ifndef SHELL_COMMON_NATIVE_MATE_CONVERTERS_ACCELERATOR_CONVERTER_H_
+#define SHELL_COMMON_NATIVE_MATE_CONVERTERS_ACCELERATOR_CONVERTER_H_
 
 #include "native_mate/converter.h"
 
@@ -22,4 +22,4 @@ struct Converter<ui::Accelerator> {
 
 }  // namespace mate
 
-#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_ACCELERATOR_CONVERTER_H_
+#endif  // SHELL_COMMON_NATIVE_MATE_CONVERTERS_ACCELERATOR_CONVERTER_H_
diff --git a/shell/common/native_mate_converters/blink_converter.h b/shell/common/native_mate_converters/blink_converter.h
index ad31a7a7cb43..00b4c513f3af 100644
--- a/shell/common/native_mate_converters/blink_converter.h
+++ b/shell/common/native_mate_converters/blink_converter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_BLINK_CONVERTER_H_
-#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_BLINK_CONVERTER_H_
+#ifndef SHELL_COMMON_NATIVE_MATE_CONVERTERS_BLINK_CONVERTER_H_
+#define SHELL_COMMON_NATIVE_MATE_CONVERTERS_BLINK_CONVERTER_H_
 
 #include "native_mate/converter.h"
 #include "third_party/blink/public/platform/web_cache.h"
@@ -136,4 +136,4 @@ v8::Local<v8::Value> MediaFlagsToV8(v8::Isolate* isolate, int mediaFlags);
 
 }  // namespace mate
 
-#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_BLINK_CONVERTER_H_
+#endif  // SHELL_COMMON_NATIVE_MATE_CONVERTERS_BLINK_CONVERTER_H_
diff --git a/shell/common/native_mate_converters/callback.h b/shell/common/native_mate_converters/callback.h
index 6c7a05a89545..df8f19ae7ec0 100644
--- a/shell/common/native_mate_converters/callback.h
+++ b/shell/common/native_mate_converters/callback.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_CALLBACK_H_
-#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_CALLBACK_H_
+#ifndef SHELL_COMMON_NATIVE_MATE_CONVERTERS_CALLBACK_H_
+#define SHELL_COMMON_NATIVE_MATE_CONVERTERS_CALLBACK_H_
 
 #include <utility>
 #include <vector>
@@ -178,4 +178,4 @@ v8::Local<v8::Value> CallbackToV8(v8::Isolate* isolate,
 
 }  // namespace mate
 
-#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_CALLBACK_H_
+#endif  // SHELL_COMMON_NATIVE_MATE_CONVERTERS_CALLBACK_H_
diff --git a/shell/common/native_mate_converters/content_converter.h b/shell/common/native_mate_converters/content_converter.h
index f25dfd4327f8..86adb092cd21 100644
--- a/shell/common/native_mate_converters/content_converter.h
+++ b/shell/common/native_mate_converters/content_converter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_CONTENT_CONVERTER_H_
-#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_CONTENT_CONVERTER_H_
+#ifndef SHELL_COMMON_NATIVE_MATE_CONVERTERS_CONTENT_CONVERTER_H_
+#define SHELL_COMMON_NATIVE_MATE_CONVERTERS_CONTENT_CONVERTER_H_
 
 #include <utility>
 
@@ -76,4 +76,4 @@ struct Converter<content::Referrer> {
 
 }  // namespace mate
 
-#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_CONTENT_CONVERTER_H_
+#endif  // SHELL_COMMON_NATIVE_MATE_CONVERTERS_CONTENT_CONVERTER_H_
diff --git a/shell/common/native_mate_converters/file_dialog_converter.h b/shell/common/native_mate_converters/file_dialog_converter.h
index dca672059187..d238e1ebb656 100644
--- a/shell/common/native_mate_converters/file_dialog_converter.h
+++ b/shell/common/native_mate_converters/file_dialog_converter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_FILE_DIALOG_CONVERTER_H_
-#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_FILE_DIALOG_CONVERTER_H_
+#ifndef SHELL_COMMON_NATIVE_MATE_CONVERTERS_FILE_DIALOG_CONVERTER_H_
+#define SHELL_COMMON_NATIVE_MATE_CONVERTERS_FILE_DIALOG_CONVERTER_H_
 
 #include "native_mate/converter.h"
 #include "shell/browser/ui/file_dialog.h"
@@ -30,4 +30,4 @@ struct Converter<file_dialog::DialogSettings> {
 
 }  // namespace mate
 
-#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_FILE_DIALOG_CONVERTER_H_
+#endif  // SHELL_COMMON_NATIVE_MATE_CONVERTERS_FILE_DIALOG_CONVERTER_H_
diff --git a/shell/common/native_mate_converters/file_path_converter.h b/shell/common/native_mate_converters/file_path_converter.h
index 4e0f7d6e350c..9600e08ca622 100644
--- a/shell/common/native_mate_converters/file_path_converter.h
+++ b/shell/common/native_mate_converters/file_path_converter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_FILE_PATH_CONVERTER_H_
-#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_FILE_PATH_CONVERTER_H_
+#ifndef SHELL_COMMON_NATIVE_MATE_CONVERTERS_FILE_PATH_CONVERTER_H_
+#define SHELL_COMMON_NATIVE_MATE_CONVERTERS_FILE_PATH_CONVERTER_H_
 
 #include <string>
 
@@ -54,4 +54,4 @@ struct Converter<base::FilePath> {
 
 }  // namespace mate
 
-#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_FILE_PATH_CONVERTER_H_
+#endif  // SHELL_COMMON_NATIVE_MATE_CONVERTERS_FILE_PATH_CONVERTER_H_
diff --git a/shell/common/native_mate_converters/gfx_converter.h b/shell/common/native_mate_converters/gfx_converter.h
index 745e6528093f..0c4ca45fbba7 100644
--- a/shell/common/native_mate_converters/gfx_converter.h
+++ b/shell/common/native_mate_converters/gfx_converter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_GFX_CONVERTER_H_
-#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_GFX_CONVERTER_H_
+#ifndef SHELL_COMMON_NATIVE_MATE_CONVERTERS_GFX_CONVERTER_H_
+#define SHELL_COMMON_NATIVE_MATE_CONVERTERS_GFX_CONVERTER_H_
 
 #include "native_mate/converter.h"
 #include "ui/gfx/geometry/point_f.h"
@@ -64,4 +64,4 @@ struct Converter<display::Display> {
 
 }  // namespace mate
 
-#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_GFX_CONVERTER_H_
+#endif  // SHELL_COMMON_NATIVE_MATE_CONVERTERS_GFX_CONVERTER_H_
diff --git a/shell/common/native_mate_converters/gurl_converter.h b/shell/common/native_mate_converters/gurl_converter.h
index 110b97d5ef29..10899a5ec51b 100644
--- a/shell/common/native_mate_converters/gurl_converter.h
+++ b/shell/common/native_mate_converters/gurl_converter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_GURL_CONVERTER_H_
-#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_GURL_CONVERTER_H_
+#ifndef SHELL_COMMON_NATIVE_MATE_CONVERTERS_GURL_CONVERTER_H_
+#define SHELL_COMMON_NATIVE_MATE_CONVERTERS_GURL_CONVERTER_H_
 
 #include <string>
 
@@ -32,4 +32,4 @@ struct Converter<GURL> {
 
 }  // namespace mate
 
-#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_GURL_CONVERTER_H_
+#endif  // SHELL_COMMON_NATIVE_MATE_CONVERTERS_GURL_CONVERTER_H_
diff --git a/shell/common/native_mate_converters/image_converter.h b/shell/common/native_mate_converters/image_converter.h
index d8673145a763..93c2d2ca53fb 100644
--- a/shell/common/native_mate_converters/image_converter.h
+++ b/shell/common/native_mate_converters/image_converter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_IMAGE_CONVERTER_H_
-#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_IMAGE_CONVERTER_H_
+#ifndef SHELL_COMMON_NATIVE_MATE_CONVERTERS_IMAGE_CONVERTER_H_
+#define SHELL_COMMON_NATIVE_MATE_CONVERTERS_IMAGE_CONVERTER_H_
 
 #include "native_mate/converter.h"
 
@@ -31,4 +31,4 @@ struct Converter<gfx::Image> {
 
 }  // namespace mate
 
-#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_IMAGE_CONVERTER_H_
+#endif  // SHELL_COMMON_NATIVE_MATE_CONVERTERS_IMAGE_CONVERTER_H_
diff --git a/shell/common/native_mate_converters/map_converter.h b/shell/common/native_mate_converters/map_converter.h
index a06e3ec80d6f..5a4ac891fac2 100644
--- a/shell/common/native_mate_converters/map_converter.h
+++ b/shell/common/native_mate_converters/map_converter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_MAP_CONVERTER_H_
-#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_MAP_CONVERTER_H_
+#ifndef SHELL_COMMON_NATIVE_MATE_CONVERTERS_MAP_CONVERTER_H_
+#define SHELL_COMMON_NATIVE_MATE_CONVERTERS_MAP_CONVERTER_H_
 
 #include <map>
 #include <string>
@@ -67,4 +67,4 @@ struct Converter<std::map<std::string, T>> {
 
 }  // namespace mate
 
-#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_MAP_CONVERTER_H_
+#endif  // SHELL_COMMON_NATIVE_MATE_CONVERTERS_MAP_CONVERTER_H_
diff --git a/shell/common/native_mate_converters/message_box_converter.h b/shell/common/native_mate_converters/message_box_converter.h
index b2d3b78048de..8caac1c2eb04 100644
--- a/shell/common/native_mate_converters/message_box_converter.h
+++ b/shell/common/native_mate_converters/message_box_converter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_MESSAGE_BOX_CONVERTER_H_
-#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_MESSAGE_BOX_CONVERTER_H_
+#ifndef SHELL_COMMON_NATIVE_MATE_CONVERTERS_MESSAGE_BOX_CONVERTER_H_
+#define SHELL_COMMON_NATIVE_MATE_CONVERTERS_MESSAGE_BOX_CONVERTER_H_
 
 #include "native_mate/converter.h"
 #include "shell/browser/ui/message_box.h"
@@ -19,4 +19,4 @@ struct Converter<atom::MessageBoxSettings> {
 
 }  // namespace mate
 
-#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_MESSAGE_BOX_CONVERTER_H_
+#endif  // SHELL_COMMON_NATIVE_MATE_CONVERTERS_MESSAGE_BOX_CONVERTER_H_
diff --git a/shell/common/native_mate_converters/net_converter.h b/shell/common/native_mate_converters/net_converter.h
index b86c89bee0ed..b6f11667403e 100644
--- a/shell/common/native_mate_converters/net_converter.h
+++ b/shell/common/native_mate_converters/net_converter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_NET_CONVERTER_H_
-#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_NET_CONVERTER_H_
+#ifndef SHELL_COMMON_NATIVE_MATE_CONVERTERS_NET_CONVERTER_H_
+#define SHELL_COMMON_NATIVE_MATE_CONVERTERS_NET_CONVERTER_H_
 
 #include "base/memory/ref_counted.h"
 #include "native_mate/converter.h"
@@ -77,4 +77,4 @@ void GetUploadData(base::ListValue* upload_data_list,
 
 }  // namespace atom
 
-#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_NET_CONVERTER_H_
+#endif  // SHELL_COMMON_NATIVE_MATE_CONVERTERS_NET_CONVERTER_H_
diff --git a/shell/common/native_mate_converters/network_converter.h b/shell/common/native_mate_converters/network_converter.h
index 439ba19ec165..13a82db6d6be 100644
--- a/shell/common/native_mate_converters/network_converter.h
+++ b/shell/common/native_mate_converters/network_converter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_NETWORK_CONVERTER_H_
-#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_NETWORK_CONVERTER_H_
+#ifndef SHELL_COMMON_NATIVE_MATE_CONVERTERS_NETWORK_CONVERTER_H_
+#define SHELL_COMMON_NATIVE_MATE_CONVERTERS_NETWORK_CONVERTER_H_
 
 #include "base/memory/scoped_refptr.h"
 #include "native_mate/converter.h"
@@ -26,4 +26,4 @@ struct Converter<scoped_refptr<network::ResourceRequestBody>> {
 
 }  // namespace mate
 
-#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_NETWORK_CONVERTER_H_
+#endif  // SHELL_COMMON_NATIVE_MATE_CONVERTERS_NETWORK_CONVERTER_H_
diff --git a/shell/common/native_mate_converters/once_callback.h b/shell/common/native_mate_converters/once_callback.h
index 540627bdba20..89895a9986b5 100644
--- a/shell/common/native_mate_converters/once_callback.h
+++ b/shell/common/native_mate_converters/once_callback.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_ONCE_CALLBACK_H_
-#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_ONCE_CALLBACK_H_
+#ifndef SHELL_COMMON_NATIVE_MATE_CONVERTERS_ONCE_CALLBACK_H_
+#define SHELL_COMMON_NATIVE_MATE_CONVERTERS_ONCE_CALLBACK_H_
 
 #include <utility>
 
@@ -84,4 +84,4 @@ struct Converter<base::OnceCallback<Sig>> {
 
 }  // namespace mate
 
-#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_ONCE_CALLBACK_H_
+#endif  // SHELL_COMMON_NATIVE_MATE_CONVERTERS_ONCE_CALLBACK_H_
diff --git a/shell/common/native_mate_converters/string16_converter.h b/shell/common/native_mate_converters/string16_converter.h
index 14ef5c11009e..6827d5e711c9 100644
--- a/shell/common/native_mate_converters/string16_converter.h
+++ b/shell/common/native_mate_converters/string16_converter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_STRING16_CONVERTER_H_
-#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_STRING16_CONVERTER_H_
+#ifndef SHELL_COMMON_NATIVE_MATE_CONVERTERS_STRING16_CONVERTER_H_
+#define SHELL_COMMON_NATIVE_MATE_CONVERTERS_STRING16_CONVERTER_H_
 
 #include "base/strings/string16.h"
 #include "gin/converter.h"
@@ -61,4 +61,4 @@ inline v8::Local<v8::String> StringToV8(v8::Isolate* isolate,
 
 }  // namespace mate
 
-#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_STRING16_CONVERTER_H_
+#endif  // SHELL_COMMON_NATIVE_MATE_CONVERTERS_STRING16_CONVERTER_H_
diff --git a/shell/common/native_mate_converters/ui_base_types_converter.h b/shell/common/native_mate_converters/ui_base_types_converter.h
index b5058f503252..a762ea74958c 100644
--- a/shell/common/native_mate_converters/ui_base_types_converter.h
+++ b/shell/common/native_mate_converters/ui_base_types_converter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_UI_BASE_TYPES_CONVERTER_H_
-#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_UI_BASE_TYPES_CONVERTER_H_
+#ifndef SHELL_COMMON_NATIVE_MATE_CONVERTERS_UI_BASE_TYPES_CONVERTER_H_
+#define SHELL_COMMON_NATIVE_MATE_CONVERTERS_UI_BASE_TYPES_CONVERTER_H_
 
 #include "native_mate/converter.h"
 #include "ui/base/ui_base_types.h"
@@ -31,4 +31,4 @@ struct Converter<ui::MenuSourceType> {
 
 }  // namespace mate
 
-#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_UI_BASE_TYPES_CONVERTER_H_
+#endif  // SHELL_COMMON_NATIVE_MATE_CONVERTERS_UI_BASE_TYPES_CONVERTER_H_
diff --git a/shell/common/native_mate_converters/v8_value_converter.h b/shell/common/native_mate_converters/v8_value_converter.h
index ea0909c98398..f084d250dde4 100644
--- a/shell/common/native_mate_converters/v8_value_converter.h
+++ b/shell/common/native_mate_converters/v8_value_converter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_V8_VALUE_CONVERTER_H_
-#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_V8_VALUE_CONVERTER_H_
+#ifndef SHELL_COMMON_NATIVE_MATE_CONVERTERS_V8_VALUE_CONVERTER_H_
+#define SHELL_COMMON_NATIVE_MATE_CONVERTERS_V8_VALUE_CONVERTER_H_
 
 #include <memory>
 
@@ -74,4 +74,4 @@ class V8ValueConverter {
 
 }  // namespace atom
 
-#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_V8_VALUE_CONVERTER_H_
+#endif  // SHELL_COMMON_NATIVE_MATE_CONVERTERS_V8_VALUE_CONVERTER_H_
diff --git a/shell/common/native_mate_converters/value_converter.h b/shell/common/native_mate_converters/value_converter.h
index b2ea5def0aa9..6be0c5cde36d 100644
--- a/shell/common/native_mate_converters/value_converter.h
+++ b/shell/common/native_mate_converters/value_converter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_NATIVE_MATE_CONVERTERS_VALUE_CONVERTER_H_
-#define ATOM_COMMON_NATIVE_MATE_CONVERTERS_VALUE_CONVERTER_H_
+#ifndef SHELL_COMMON_NATIVE_MATE_CONVERTERS_VALUE_CONVERTER_H_
+#define SHELL_COMMON_NATIVE_MATE_CONVERTERS_VALUE_CONVERTER_H_
 
 #include "native_mate/converter.h"
 
@@ -44,4 +44,4 @@ struct Converter<base::ListValue> {
 
 }  // namespace mate
 
-#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_VALUE_CONVERTER_H_
+#endif  // SHELL_COMMON_NATIVE_MATE_CONVERTERS_VALUE_CONVERTER_H_
diff --git a/shell/common/node_bindings.h b/shell/common/node_bindings.h
index c87f4b2fa043..4ae6a07af88e 100644
--- a/shell/common/node_bindings.h
+++ b/shell/common/node_bindings.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_NODE_BINDINGS_H_
-#define ATOM_COMMON_NODE_BINDINGS_H_
+#ifndef SHELL_COMMON_NODE_BINDINGS_H_
+#define SHELL_COMMON_NODE_BINDINGS_H_
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
@@ -114,4 +114,4 @@ class NodeBindings {
 
 }  // namespace atom
 
-#endif  // ATOM_COMMON_NODE_BINDINGS_H_
+#endif  // SHELL_COMMON_NODE_BINDINGS_H_
diff --git a/shell/common/node_bindings_linux.h b/shell/common/node_bindings_linux.h
index 907379dea066..a25185856770 100644
--- a/shell/common/node_bindings_linux.h
+++ b/shell/common/node_bindings_linux.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_NODE_BINDINGS_LINUX_H_
-#define ATOM_COMMON_NODE_BINDINGS_LINUX_H_
+#ifndef SHELL_COMMON_NODE_BINDINGS_LINUX_H_
+#define SHELL_COMMON_NODE_BINDINGS_LINUX_H_
 
 #include "base/compiler_specific.h"
 #include "shell/common/node_bindings.h"
@@ -31,4 +31,4 @@ class NodeBindingsLinux : public NodeBindings {
 
 }  // namespace atom
 
-#endif  // ATOM_COMMON_NODE_BINDINGS_LINUX_H_
+#endif  // SHELL_COMMON_NODE_BINDINGS_LINUX_H_
diff --git a/shell/common/node_bindings_mac.h b/shell/common/node_bindings_mac.h
index e486e2333b88..f3752be4cfa3 100644
--- a/shell/common/node_bindings_mac.h
+++ b/shell/common/node_bindings_mac.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_NODE_BINDINGS_MAC_H_
-#define ATOM_COMMON_NODE_BINDINGS_MAC_H_
+#ifndef SHELL_COMMON_NODE_BINDINGS_MAC_H_
+#define SHELL_COMMON_NODE_BINDINGS_MAC_H_
 
 #include "base/compiler_specific.h"
 #include "shell/common/node_bindings.h"
@@ -28,4 +28,4 @@ class NodeBindingsMac : public NodeBindings {
 
 }  // namespace atom
 
-#endif  // ATOM_COMMON_NODE_BINDINGS_MAC_H_
+#endif  // SHELL_COMMON_NODE_BINDINGS_MAC_H_
diff --git a/shell/common/node_bindings_win.h b/shell/common/node_bindings_win.h
index b5f68938b081..2063d294d6f1 100644
--- a/shell/common/node_bindings_win.h
+++ b/shell/common/node_bindings_win.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_NODE_BINDINGS_WIN_H_
-#define ATOM_COMMON_NODE_BINDINGS_WIN_H_
+#ifndef SHELL_COMMON_NODE_BINDINGS_WIN_H_
+#define SHELL_COMMON_NODE_BINDINGS_WIN_H_
 
 #include "base/compiler_specific.h"
 #include "shell/common/node_bindings.h"
@@ -23,4 +23,4 @@ class NodeBindingsWin : public NodeBindings {
 
 }  // namespace atom
 
-#endif  // ATOM_COMMON_NODE_BINDINGS_WIN_H_
+#endif  // SHELL_COMMON_NODE_BINDINGS_WIN_H_
diff --git a/shell/common/node_includes.h b/shell/common/node_includes.h
index da60a41da278..a8d68dfacdcb 100644
--- a/shell/common/node_includes.h
+++ b/shell/common/node_includes.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_NODE_INCLUDES_H_
-#define ATOM_COMMON_NODE_INCLUDES_H_
+#ifndef SHELL_COMMON_NODE_INCLUDES_H_
+#define SHELL_COMMON_NODE_INCLUDES_H_
 
 #include "base/logging.h"
 
@@ -106,4 +106,4 @@ class TraceEventHelper {
 }  // namespace tracing
 }  // namespace node
 
-#endif  // ATOM_COMMON_NODE_INCLUDES_H_
+#endif  // SHELL_COMMON_NODE_INCLUDES_H_
diff --git a/shell/common/options_switches.h b/shell/common/options_switches.h
index d1548ce816a6..f4ba767a4169 100644
--- a/shell/common/options_switches.h
+++ b/shell/common/options_switches.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_OPTIONS_SWITCHES_H_
-#define ATOM_COMMON_OPTIONS_SWITCHES_H_
+#ifndef SHELL_COMMON_OPTIONS_SWITCHES_H_
+#define SHELL_COMMON_OPTIONS_SWITCHES_H_
 
 namespace atom {
 
@@ -133,4 +133,4 @@ extern const char kEnableAuthNegotiatePort[];
 
 }  // namespace atom
 
-#endif  // ATOM_COMMON_OPTIONS_SWITCHES_H_
+#endif  // SHELL_COMMON_OPTIONS_SWITCHES_H_
diff --git a/shell/common/platform_util.h b/shell/common/platform_util.h
index 2f3f8b7f1da7..2d196e327149 100644
--- a/shell/common/platform_util.h
+++ b/shell/common/platform_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_PLATFORM_UTIL_H_
-#define ATOM_COMMON_PLATFORM_UTIL_H_
+#ifndef SHELL_COMMON_PLATFORM_UTIL_H_
+#define SHELL_COMMON_PLATFORM_UTIL_H_
 
 #include <string>
 
@@ -58,4 +58,4 @@ bool GetDesktopName(std::string* setme);
 
 }  // namespace platform_util
 
-#endif  // ATOM_COMMON_PLATFORM_UTIL_H_
+#endif  // SHELL_COMMON_PLATFORM_UTIL_H_
diff --git a/shell/common/promise_util.h b/shell/common/promise_util.h
index 2a4b9ed611fd..d92ca9855014 100644
--- a/shell/common/promise_util.h
+++ b/shell/common/promise_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_COMMON_PROMISE_UTIL_H_
-#define ATOM_COMMON_PROMISE_UTIL_H_
+#ifndef SHELL_COMMON_PROMISE_UTIL_H_
+#define SHELL_COMMON_PROMISE_UTIL_H_
 
 #include <string>
 #include <utility>
@@ -263,4 +263,4 @@ struct Converter<atom::util::Promise> {
 
 }  // namespace mate
 
-#endif  // ATOM_COMMON_PROMISE_UTIL_H_
+#endif  // SHELL_COMMON_PROMISE_UTIL_H_
diff --git a/shell/renderer/api/atom_api_spell_check_client.h b/shell/renderer/api/atom_api_spell_check_client.h
index 66a2b77ffdb2..70468c0b11d5 100644
--- a/shell/renderer/api/atom_api_spell_check_client.h
+++ b/shell/renderer/api/atom_api_spell_check_client.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_RENDERER_API_ATOM_API_SPELL_CHECK_CLIENT_H_
-#define ATOM_RENDERER_API_ATOM_API_SPELL_CHECK_CLIENT_H_
+#ifndef SHELL_RENDERER_API_ATOM_API_SPELL_CHECK_CLIENT_H_
+#define SHELL_RENDERER_API_ATOM_API_SPELL_CHECK_CLIENT_H_
 
 #include <memory>
 #include <set>
@@ -111,4 +111,4 @@ class SpellCheckClient : public blink::WebSpellCheckPanelHostClient,
 
 }  // namespace atom
 
-#endif  // ATOM_RENDERER_API_ATOM_API_SPELL_CHECK_CLIENT_H_
+#endif  // SHELL_RENDERER_API_ATOM_API_SPELL_CHECK_CLIENT_H_
diff --git a/shell/renderer/atom_autofill_agent.h b/shell/renderer/atom_autofill_agent.h
index 68d3793f8746..905459de1ab1 100644
--- a/shell/renderer/atom_autofill_agent.h
+++ b/shell/renderer/atom_autofill_agent.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_RENDERER_ATOM_AUTOFILL_AGENT_H_
-#define ATOM_RENDERER_ATOM_AUTOFILL_AGENT_H_
+#ifndef SHELL_RENDERER_ATOM_AUTOFILL_AGENT_H_
+#define SHELL_RENDERER_ATOM_AUTOFILL_AGENT_H_
 
 #include <vector>
 
@@ -87,4 +87,4 @@ class AutofillAgent : public content::RenderFrameObserver,
 
 }  // namespace atom
 
-#endif  // ATOM_RENDERER_ATOM_AUTOFILL_AGENT_H_
+#endif  // SHELL_RENDERER_ATOM_AUTOFILL_AGENT_H_
diff --git a/shell/renderer/atom_render_frame_observer.h b/shell/renderer/atom_render_frame_observer.h
index b7f9279d0913..89b0ca154ea0 100644
--- a/shell/renderer/atom_render_frame_observer.h
+++ b/shell/renderer/atom_render_frame_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_RENDERER_ATOM_RENDER_FRAME_OBSERVER_H_
-#define ATOM_RENDERER_ATOM_RENDER_FRAME_OBSERVER_H_
+#ifndef SHELL_RENDERER_ATOM_RENDER_FRAME_OBSERVER_H_
+#define SHELL_RENDERER_ATOM_RENDER_FRAME_OBSERVER_H_
 
 #include <string>
 
@@ -68,4 +68,4 @@ class AtomRenderFrameObserver : public content::RenderFrameObserver {
 
 }  // namespace atom
 
-#endif  // ATOM_RENDERER_ATOM_RENDER_FRAME_OBSERVER_H_
+#endif  // SHELL_RENDERER_ATOM_RENDER_FRAME_OBSERVER_H_
diff --git a/shell/renderer/atom_renderer_client.h b/shell/renderer/atom_renderer_client.h
index 2e20253e473b..ca2fe517be1f 100644
--- a/shell/renderer/atom_renderer_client.h
+++ b/shell/renderer/atom_renderer_client.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_RENDERER_ATOM_RENDERER_CLIENT_H_
-#define ATOM_RENDERER_ATOM_RENDERER_CLIENT_H_
+#ifndef SHELL_RENDERER_ATOM_RENDERER_CLIENT_H_
+#define SHELL_RENDERER_ATOM_RENDERER_CLIENT_H_
 
 #include <memory>
 #include <set>
@@ -75,4 +75,4 @@ class AtomRendererClient : public RendererClientBase {
 
 }  // namespace atom
 
-#endif  // ATOM_RENDERER_ATOM_RENDERER_CLIENT_H_
+#endif  // SHELL_RENDERER_ATOM_RENDERER_CLIENT_H_
diff --git a/shell/renderer/atom_sandboxed_renderer_client.h b/shell/renderer/atom_sandboxed_renderer_client.h
index bc8fcf57b5bc..e098ac25d1bb 100644
--- a/shell/renderer/atom_sandboxed_renderer_client.h
+++ b/shell/renderer/atom_sandboxed_renderer_client.h
@@ -1,8 +1,8 @@
 // Copyright (c) 2016 GitHub, Inc.
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
-#ifndef ATOM_RENDERER_ATOM_SANDBOXED_RENDERER_CLIENT_H_
-#define ATOM_RENDERER_ATOM_SANDBOXED_RENDERER_CLIENT_H_
+#ifndef SHELL_RENDERER_ATOM_SANDBOXED_RENDERER_CLIENT_H_
+#define SHELL_RENDERER_ATOM_SANDBOXED_RENDERER_CLIENT_H_
 
 #include <memory>
 #include <set>
@@ -51,4 +51,4 @@ class AtomSandboxedRendererClient : public RendererClientBase {
 
 }  // namespace atom
 
-#endif  // ATOM_RENDERER_ATOM_SANDBOXED_RENDERER_CLIENT_H_
+#endif  // SHELL_RENDERER_ATOM_SANDBOXED_RENDERER_CLIENT_H_
diff --git a/shell/renderer/content_settings_observer.h b/shell/renderer/content_settings_observer.h
index 7689f52d1b7f..8efcf10ab969 100644
--- a/shell/renderer/content_settings_observer.h
+++ b/shell/renderer/content_settings_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_RENDERER_CONTENT_SETTINGS_OBSERVER_H_
-#define ATOM_RENDERER_CONTENT_SETTINGS_OBSERVER_H_
+#ifndef SHELL_RENDERER_CONTENT_SETTINGS_OBSERVER_H_
+#define SHELL_RENDERER_CONTENT_SETTINGS_OBSERVER_H_
 
 #include "base/compiler_specific.h"
 #include "content/public/renderer/render_frame_observer.h"
@@ -31,4 +31,4 @@ class ContentSettingsObserver : public content::RenderFrameObserver,
 
 }  // namespace atom
 
-#endif  // ATOM_RENDERER_CONTENT_SETTINGS_OBSERVER_H_
+#endif  // SHELL_RENDERER_CONTENT_SETTINGS_OBSERVER_H_
diff --git a/shell/renderer/electron_api_service_impl.h b/shell/renderer/electron_api_service_impl.h
index 9371610a7d63..85fda68cb327 100644
--- a/shell/renderer/electron_api_service_impl.h
+++ b/shell/renderer/electron_api_service_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_RENDERER_ELECTRON_API_SERVICE_IMPL_H_
-#define ATOM_RENDERER_ELECTRON_API_SERVICE_IMPL_H_
+#ifndef SHELL_RENDERER_ELECTRON_API_SERVICE_IMPL_H_
+#define SHELL_RENDERER_ELECTRON_API_SERVICE_IMPL_H_
 
 #include <string>
 
@@ -52,4 +52,4 @@ class ElectronApiServiceImpl : public mojom::ElectronRenderer,
 
 }  // namespace atom
 
-#endif  // ATOM_RENDERER_ELECTRON_API_SERVICE_IMPL_H_
+#endif  // SHELL_RENDERER_ELECTRON_API_SERVICE_IMPL_H_
diff --git a/shell/renderer/guest_view_container.h b/shell/renderer/guest_view_container.h
index 81e6313358a9..22fed88295a2 100644
--- a/shell/renderer/guest_view_container.h
+++ b/shell/renderer/guest_view_container.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_RENDERER_GUEST_VIEW_CONTAINER_H_
-#define ATOM_RENDERER_GUEST_VIEW_CONTAINER_H_
+#ifndef SHELL_RENDERER_GUEST_VIEW_CONTAINER_H_
+#define SHELL_RENDERER_GUEST_VIEW_CONTAINER_H_
 
 #include "base/callback.h"
 #include "content/public/renderer/browser_plugin_delegate.h"
@@ -43,4 +43,4 @@ class GuestViewContainer : public content::BrowserPluginDelegate {
 
 }  // namespace atom
 
-#endif  // ATOM_RENDERER_GUEST_VIEW_CONTAINER_H_
+#endif  // SHELL_RENDERER_GUEST_VIEW_CONTAINER_H_
diff --git a/shell/renderer/printing/print_render_frame_helper_delegate.h b/shell/renderer/printing/print_render_frame_helper_delegate.h
index 1888ab1564dd..2a7b60ad16bb 100644
--- a/shell/renderer/printing/print_render_frame_helper_delegate.h
+++ b/shell/renderer/printing/print_render_frame_helper_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_RENDERER_PRINTING_PRINT_RENDER_FRAME_HELPER_DELEGATE_H_
-#define ATOM_RENDERER_PRINTING_PRINT_RENDER_FRAME_HELPER_DELEGATE_H_
+#ifndef SHELL_RENDERER_PRINTING_PRINT_RENDER_FRAME_HELPER_DELEGATE_H_
+#define SHELL_RENDERER_PRINTING_PRINT_RENDER_FRAME_HELPER_DELEGATE_H_
 
 #include "base/macros.h"
 #include "components/printing/renderer/print_render_frame_helper.h"
@@ -28,4 +28,4 @@ class PrintRenderFrameHelperDelegate
 
 }  // namespace atom
 
-#endif  // ATOM_RENDERER_PRINTING_PRINT_RENDER_FRAME_HELPER_DELEGATE_H_
+#endif  // SHELL_RENDERER_PRINTING_PRINT_RENDER_FRAME_HELPER_DELEGATE_H_
diff --git a/shell/renderer/renderer_client_base.h b/shell/renderer/renderer_client_base.h
index e129f76b9a25..25d6b4bb4cbe 100644
--- a/shell/renderer/renderer_client_base.h
+++ b/shell/renderer/renderer_client_base.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_RENDERER_RENDERER_CLIENT_BASE_H_
-#define ATOM_RENDERER_RENDERER_CLIENT_BASE_H_
+#ifndef SHELL_RENDERER_RENDERER_CLIENT_BASE_H_
+#define SHELL_RENDERER_RENDERER_CLIENT_BASE_H_
 
 #include <memory>
 #include <string>
@@ -75,4 +75,4 @@ class RendererClientBase : public content::ContentRendererClient {
 
 }  // namespace atom
 
-#endif  // ATOM_RENDERER_RENDERER_CLIENT_BASE_H_
+#endif  // SHELL_RENDERER_RENDERER_CLIENT_BASE_H_
diff --git a/shell/renderer/web_worker_observer.h b/shell/renderer/web_worker_observer.h
index c33a2fdbafe1..67dc3c1396be 100644
--- a/shell/renderer/web_worker_observer.h
+++ b/shell/renderer/web_worker_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_RENDERER_WEB_WORKER_OBSERVER_H_
-#define ATOM_RENDERER_WEB_WORKER_OBSERVER_H_
+#ifndef SHELL_RENDERER_WEB_WORKER_OBSERVER_H_
+#define SHELL_RENDERER_WEB_WORKER_OBSERVER_H_
 
 #include <memory>
 
@@ -36,4 +36,4 @@ class WebWorkerObserver {
 
 }  // namespace atom
 
-#endif  // ATOM_RENDERER_WEB_WORKER_OBSERVER_H_
+#endif  // SHELL_RENDERER_WEB_WORKER_OBSERVER_H_
diff --git a/shell/utility/atom_content_utility_client.h b/shell/utility/atom_content_utility_client.h
index e41f53eebf27..aaf8d2daf757 100644
--- a/shell/utility/atom_content_utility_client.h
+++ b/shell/utility/atom_content_utility_client.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_UTILITY_ATOM_CONTENT_UTILITY_CLIENT_H_
-#define ATOM_UTILITY_ATOM_CONTENT_UTILITY_CLIENT_H_
+#ifndef SHELL_UTILITY_ATOM_CONTENT_UTILITY_CLIENT_H_
+#define SHELL_UTILITY_ATOM_CONTENT_UTILITY_CLIENT_H_
 
 #include <memory>
 #include <string>
@@ -45,4 +45,4 @@ class AtomContentUtilityClient : public content::ContentUtilityClient {
 
 }  // namespace atom
 
-#endif  // ATOM_UTILITY_ATOM_CONTENT_UTILITY_CLIENT_H_
+#endif  // SHELL_UTILITY_ATOM_CONTENT_UTILITY_CLIENT_H_