diff --git a/README.ninja b/README.ninja
index 1a8e92d..6ccdb7a 100644
--- a/README.ninja
+++ b/README.ninja
@@ -1,4 +1,4 @@
-Ninja for Windows and Linux are custom built binaries that contain Steel
+Ninja for Windows and Linux are custom built binaries that contain H5VCC/Cobalt
 specific modifications.
 
 ninja.exe built with MSVC 2012
diff --git a/breakpad.py b/breakpad.py
index 46a5ecd..b3a2ffa 100644
--- a/breakpad.py
+++ b/breakpad.py
@@ -40,9 +40,9 @@
     _HOST_NAME.endswith(('.google.com', '.chromium.org')))
 
 
-# TODO(uzhilinsky): Disable breakpad to avoid spamming the Chromium team.
-# Eventually this should be re-enabled and the exceptions should be forwarded
-# to our own server.
+# TODO: COBALT: Disable breakpad to avoid spamming the Chromium team.
+# Eventually this should be re-enabled and the exceptions should be forwarded to
+# our own server.
 IS_ENABLED = False
 
 
diff --git a/cpplint.py b/cpplint.py
index b01176d..2f51fbb 100755
--- a/cpplint.py
+++ b/cpplint.py
@@ -5532,7 +5532,7 @@
 
     # gcc extensions.
     # Note: std::hash is their hash, ::hash is our hash
-    # NOTE(rjogrady): In Cobalt's version of Chromium, we use base/hash_tables.h
+    # NOTE: COBALT: In Cobalt's version of Chromium, we use base/hash_tables.h
     #('<hash_map>', ('hash_map', 'hash_multimap',)),
     #('<hash_set>', ('hash_set', 'hash_multiset',)),
     ('base/hash_tables.h', ('hash_map', 'hash_multimap',)),
diff --git a/gclient_scm.py b/gclient_scm.py
index 6600658..c206cab 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -747,8 +747,8 @@
 
       upstream = scm.GIT.GetUpstreamBranch(self.checkout_path)
       merge_base = self._Capture(['merge-base', 'HEAD', upstream])
-      # Note(rjogrady): Always print to stdout, otherwise this only shows
-      # up when verbose output is enabled.
+      # NOTE: COBALT: Always print to stdout, otherwise this only shows up when
+      # verbose output is enabled.
       self._Run(['diff', '--name-status', merge_base], options,
                 stdout=sys.stdout, print_stdout=True)
       if file_list is not None:
diff --git a/git_cl.py b/git_cl.py
index b4ff662..9b6be1e 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -3476,7 +3476,7 @@
   # on C/C++ files
   yapf_tool = gclient_utils.FindExecutable('pyformat')
   if yapf_tool:
-    # NOTE(rjogrady): Hardcode 'full' for pyformat.
+    # NOTE: COBALT: Hardcode 'full' for pyformat.
     diff_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args, ['.py'])
     diff_output = RunGit(diff_cmd)