diff --git a/lib/linguist/language.rb b/lib/linguist/language.rb
index c84ad08f..310fd798 100644
--- a/lib/linguist/language.rb
+++ b/lib/linguist/language.rb
@@ -399,7 +399,7 @@ module Linguist
     # Returns a String name or nil
     attr_reader :ace_mode
 
-    # Public: Get Codemirror mode (as expressed by a mimetype)
+    # Public: Get CodeMirror mode (as expressed by a mimetype)
     #
     # Examples
     #
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 5762f715..735ba2f0 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -6,7 +6,7 @@
 # ace_mode          - A String name of the Ace Mode used for highlighting whenever
 #                     a file is edited. This must match one of the filenames in http://git.io/3XO_Cg.
 #                     Use "text" if a mode does not exist.
-# codemirror_mode   - A String name of the Codemirror Mode used for highlighting whenever a file is edited.
+# codemirror_mode   - A String name of the CodeMirror Mode used for highlighting whenever a file is edited.
 #                     This must match a mode from https://git.io/vi9Fx
 # wrap              - Boolean wrap to enable line wrapping (default: false)
 # extensions        - An Array of associated extensions (the first one is
diff --git a/lib/linguist/vendor.yml b/lib/linguist/vendor.yml
index 6b8c7364..e500f85d 100644
--- a/lib/linguist/vendor.yml
+++ b/lib/linguist/vendor.yml
@@ -165,7 +165,7 @@
 # Chart.js
 - (^|/)Chart\.js$
 
-# Codemirror
+# CodeMirror
 - (^|/)[Cc]ode[Mm]irror/(\d+\.\d+/)?(lib|mode|theme|addon|keymap|demo)
 
 # SyntaxHighlighter - http://alexgorbatchev.com/
diff --git a/test/test_file_blob.rb b/test/test_file_blob.rb
index 383b170e..84cee723 100644
--- a/test/test_file_blob.rb
+++ b/test/test_file_blob.rb
@@ -317,7 +317,7 @@ class TestFileBlob < Minitest::Test
     assert sample_blob("some/vendored/path/Chart.js").vendored?
     assert !sample_blob("some/vendored/path/chart.js").vendored?
 
-    # Codemirror deps
+    # CodeMirror deps
     assert sample_blob("codemirror/mode/blah.js").vendored?
     assert sample_blob("codemirror/5.0/mode/blah.js").vendored?