diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 26a01d16..62b13c49 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -45,7 +45,7 @@ APL:
   extensions:
   - .apl
   - .dyalog
-  tm_scope: NONE
+  tm_scope: none
 
 ASP:
   type: programming
@@ -147,7 +147,7 @@ Arc:
   color: "#ca2afe"
   extensions:
   - .arc
-  tm_scope: NONE
+  tm_scope: none
 
 Arduino:
   type: programming
@@ -164,14 +164,14 @@ AsciiDoc:
   - .asciidoc
   - .adoc
   - .asc
-  tm_scope: NONE
+  tm_scope: none
 
 AspectJ:
   type: programming
   color: "#1957b0"
   extensions:
   - .aj
-  tm_scope: NONE
+  tm_scope: none
 
 Assembly:
   type: programming
@@ -189,7 +189,7 @@ Augeas:
   type: programming
   extensions:
   - .aug
-  tm_scope: NONE
+  tm_scope: none
 
 AutoHotkey:
   type: programming
@@ -199,7 +199,7 @@ AutoHotkey:
   extensions:
   - .ahk
   - .ahkl
-  tm_scope: NONE
+  tm_scope: none
 
 AutoIt:
   type: programming
@@ -292,7 +292,7 @@ Brightscript:
   type: programming
   extensions:
   - .brs
-  tm_scope: NONE
+  tm_scope: none
 
 Bro:
   type: programming
@@ -366,7 +366,7 @@ CLIPS:
   type: programming
   extensions:
   - .clp
-  tm_scope: NONE
+  tm_scope: none
 
 CMake:
   extensions:
@@ -429,7 +429,7 @@ Clean:
   extensions:
   - .icl
   - .dcl
-  tm_scope: NONE
+  tm_scope: none
 
 Clojure:
   type: programming
@@ -546,7 +546,7 @@ Creole:
   wrap: true
   extensions:
   - .creole
-  tm_scope: NONE
+  tm_scope: none
 
 Crystal:
   type: programming
@@ -614,7 +614,7 @@ Darcs Patch:
   extensions:
   - .darcspatch
   - .dpatch
-  tm_scope: NONE
+  tm_scope: none
 
 Dart:
   type: programming
@@ -642,7 +642,7 @@ Dogescript:
   color: "#cca760"
   extensions:
   - .djs
-  tm_scope: NONE
+  tm_scope: none
 
 Dylan:
   type: programming
@@ -658,7 +658,7 @@ E:
   color: "#ccce35"
   extensions:
   - .E
-  tm_scope: NONE
+  tm_scope: none
 
 ECL:
   type: programming
@@ -666,7 +666,7 @@ ECL:
   extensions:
   - .ecl
   - .eclxml
-  tm_scope: NONE
+  tm_scope: none
 
 Eagle:
   type: markup
@@ -750,7 +750,7 @@ FLUX:
   extensions:
   - .fx
   - .flux
-  tm_scope: NONE
+  tm_scope: none
 
 FORTRAN:
   type: programming
@@ -824,13 +824,13 @@ G-code:
   - .g
   - .gco
   - .gcode
-  tm_scope: NONE
+  tm_scope: none
 
 GAMS:
   type: programming
   extensions:
   - .gms
-  tm_scope: NONE
+  tm_scope: none
 
 GAP:
   type: programming
@@ -839,7 +839,7 @@ GAP:
   - .gap
   - .gd
   - .gi
-  tm_scope: NONE
+  tm_scope: none
 
 GAS:
   type: programming
@@ -853,7 +853,7 @@ GDScript:
   type: programming
   extensions:
   - .gd
-  tm_scope: NONE
+  tm_scope: none
 
 GLSL:
   group: C
@@ -938,7 +938,7 @@ Golo:
   color: "#f6a51f"
   extensions:
   - .golo
-  tm_scope: NONE
+  tm_scope: none
 
 Gosu:
   type: programming
@@ -954,7 +954,7 @@ Grace:
   type: programming
   extensions:
   - .grace
-  tm_scope: NONE
+  tm_scope: none
 
 Grammatical Framework:
   type: programming
@@ -971,7 +971,7 @@ Graph Modeling Language:
   type: data
   extensions:
   - .gml
-  tm_scope: NONE
+  tm_scope: none
 
 Graphviz (DOT):
   type: data
@@ -1061,7 +1061,7 @@ HTTP:
   type: data
   extensions:
   - .http
-  tm_scope: NONE
+  tm_scope: none
 
 Hack:
   type: programming
@@ -1069,7 +1069,7 @@ Hack:
   extensions:
   - .hh
   - .php
-  tm_scope: NONE
+  tm_scope: none
 
 Haml:
   group: HTML
@@ -1092,7 +1092,7 @@ Harbour:
   color: "#0e60e3"
   extensions:
   - .hb
-  tm_scope: NONE
+  tm_scope: none
 
 Haskell:
   type: programming
@@ -1118,7 +1118,7 @@ Hy:
   - .hy
   aliases:
   - hylang
-  tm_scope: NONE
+  tm_scope: none
 
 IDL:
   type: programming
@@ -1134,7 +1134,7 @@ IGOR Pro:
   aliases:
   - igor
   - igorpro
-  tm_scope: NONE
+  tm_scope: none
 
 INI:
   type: data
@@ -1155,7 +1155,7 @@ IRC log:
   extensions:
   - .irclog
   - .weechatlog
-  tm_scope: NONE
+  tm_scope: none
 
 Idris:
   type: programming
@@ -1177,7 +1177,7 @@ Inform 7:
 Inno Setup:
   extensions:
   - .iss
-  tm_scope: NONE
+  tm_scope: none
 
 Io:
   type: programming
@@ -1196,13 +1196,13 @@ Isabelle:
   color: "#fdcd00"
   extensions:
   - .thy
-  tm_scope: NONE
+  tm_scope: none
 
 J:
   type: programming
   extensions:
   - .ijs
-  tm_scope: NONE
+  tm_scope: none
 
 JSON:
   type: data
@@ -1310,7 +1310,7 @@ KRL:
   color: "#f5c800"
   extensions:
   - .krl
-  tm_scope: NONE
+  tm_scope: none
 
 Kit:
   type: markup
@@ -1344,7 +1344,7 @@ LOLCODE:
   extensions:
   - .lol
   color: "#cc9900"
-  tm_scope: NONE
+  tm_scope: none
 
 LSL:
   type: programming
@@ -1359,7 +1359,7 @@ LabVIEW:
   type: programming
   extensions:
   - .lvproj
-  tm_scope: NONE
+  tm_scope: none
 
 Lasso:
   type: programming
@@ -1398,14 +1398,14 @@ Liquid:
   type: markup
   extensions:
   - .liquid
-  tm_scope: NONE
+  tm_scope: none
 
 Literate Agda:
   type: programming
   group: Agda
   extensions:
   - .lagda
-  tm_scope: NONE
+  tm_scope: none
 
 Literate CoffeeScript:
   type: programming
@@ -1582,7 +1582,7 @@ MediaWiki:
   wrap: true
   extensions:
   - .mediawiki
-  tm_scope: NONE
+  tm_scope: none
 
 Mercury:
   type: programming
@@ -1597,7 +1597,7 @@ MiniD: # Legacy
   searchable: false
   extensions:
   - .minid # Dummy extension
-  tm_scope: NONE
+  tm_scope: none
 
 Mirah:
   type: programming
@@ -1619,7 +1619,7 @@ Moocode:
   type: programming
   extensions:
   - .moo
-  tm_scope: NONE
+  tm_scope: none
 
 MoonScript:
   type: programming
@@ -1631,7 +1631,7 @@ MoonScript:
 Myghty:
   extensions:
   - .myt
-  tm_scope: NONE
+  tm_scope: none
 
 NSIS:
   extensions:
@@ -1677,7 +1677,7 @@ Nit:
   color: "#0d8921"
   extensions:
   - .nit
-  tm_scope: NONE
+  tm_scope: none
 
 Nix:
   type: programming
@@ -1685,7 +1685,7 @@ Nix:
   - .nix
   aliases:
   - nixos
-  tm_scope: NONE
+  tm_scope: none
 
 Nu:
   type: programming
@@ -1704,7 +1704,7 @@ NumPy:
   - .numpy
   - .numpyw
   - .numsc
-  tm_scope: NONE
+  tm_scope: none
 
 OCaml:
   type: programming
@@ -1765,7 +1765,7 @@ Omgrofl:
   extensions:
   - .omgrofl
   color: "#cabbff"
-  tm_scope: NONE
+  tm_scope: none
 
 Opa:
   type: programming
@@ -1777,7 +1777,7 @@ Opal:
   color: "#f7ede0"
   extensions:
   - .opal
-  tm_scope: NONE
+  tm_scope: none
 
 OpenCL:
   type: programming
@@ -1802,14 +1802,14 @@ OpenSCAD:
   type: programming
   extensions:
   - .scad
-  tm_scope: NONE
+  tm_scope: none
 
 Org:
   type: prose
   wrap: true
   extensions:
   - .org
-  tm_scope: NONE
+  tm_scope: none
 
 Ox:
   type: programming
@@ -1817,14 +1817,14 @@ Ox:
   - .ox
   - .oxh
   - .oxo
-  tm_scope: NONE
+  tm_scope: none
 
 Oxygene:
   type: programming
   color: "#5a63a3"
   extensions:
   - .oxygene
-  tm_scope: NONE
+  tm_scope: none
 
 PAWN:
   type: programming
@@ -1860,21 +1860,21 @@ Pan:
   color: '#cc0000'
   extensions:
   - .pan
-  tm_scope: NONE
+  tm_scope: none
 
 Papyrus:
   type: programming
   color: "#6600cc"
   extensions:
   - .psc
-  tm_scope: NONE
+  tm_scope: none
 
 Parrot:
   type: programming
   color: "#f3ca0a"
   extensions:
   - .parrot # Dummy extension
-  tm_scope: NONE
+  tm_scope: none
 
 Parrot Assembly:
   group: Parrot
@@ -1883,7 +1883,7 @@ Parrot Assembly:
   - pasm
   extensions:
   - .pasm
-  tm_scope: NONE
+  tm_scope: none
 
 Parrot Internal Representation:
   group: Parrot
@@ -1935,14 +1935,14 @@ Perl6:
   - .p6m
   - .pl6
   - .pm6
-  tm_scope: NONE
+  tm_scope: none
 
 PigLatin:
   type: programming
   color: "#fcd7de"
   extensions:
   - .pig
-  tm_scope: NONE
+  tm_scope: none
 
 Pike:
   type: programming
@@ -1957,14 +1957,14 @@ Pod:
   wrap: true
   extensions:
   - .pod
-  tm_scope: NONE
+  tm_scope: none
 
 PogoScript:
   type: programming
   color: "#d80074"
   extensions:
   - .pogo
-  tm_scope: NONE
+  tm_scope: none
 
 PostScript:
   type: markup
@@ -2005,7 +2005,7 @@ Propeller Spin:
   color: "#2b446d"
   extensions:
   - .spin
-  tm_scope: NONE
+  tm_scope: none
 
 Protocol Buffer:
   type: markup
@@ -2029,7 +2029,7 @@ Pure Data:
   color: "#91de79"
   extensions:
   - .pd
-  tm_scope: NONE
+  tm_scope: none
 
 PureScript:
   type: programming
@@ -2136,7 +2136,7 @@ RMarkdown:
   extensions:
   - .rmd
   - .Rmd
-  tm_scope: NONE
+  tm_scope: none
 
 Racket:
   type: programming
@@ -2156,7 +2156,7 @@ Ragel in Ruby Host:
   aliases:
   - ragel-rb
   - ragel-ruby
-  tm_scope: NONE
+  tm_scope: none
 
 Raw token data:
   search_term: raw
@@ -2164,7 +2164,7 @@ Raw token data:
   - raw
   extensions:
   - .raw
-  tm_scope: NONE
+  tm_scope: none
 
 Rebol:
   type: programming
@@ -2184,12 +2184,12 @@ Red:
   - .reds
   aliases:
   - red/system
-  tm_scope: NONE
+  tm_scope: none
 
 Redcode:
   extensions:
   - .cw
-  tm_scope: NONE
+  tm_scope: none
 
 RobotFramework:
   type: programming
@@ -2263,7 +2263,7 @@ SAS:
   color: "#1E90FF"
   extensions:
   - .sas
-  tm_scope: NONE
+  tm_scope: none
 
 SCSS:
   type: markup
@@ -2357,7 +2357,7 @@ Self:
   color: "#0579aa"
   extensions:
   - .self
-  tm_scope: NONE
+  tm_scope: none
 
 Shell:
   type: programming
@@ -2396,7 +2396,7 @@ Shen:
   color: "#120F14"
   extensions:
   - .shen
-  tm_scope: NONE
+  tm_scope: none
 
 Slash:
   type: programming
@@ -2467,7 +2467,7 @@ Stylus:
   group: CSS
   extensions:
   - .styl
-  tm_scope: NONE
+  tm_scope: none
 
 SuperCollider:
   type: programming
@@ -2475,7 +2475,7 @@ SuperCollider:
   extensions:
   - .scd
   - .sc
-  tm_scope: NONE
+  tm_scope: none
 
 Swift:
   type: programming
@@ -2501,7 +2501,7 @@ TXL:
   type: programming
   extensions:
   - .txl
-  tm_scope: NONE
+  tm_scope: none
 
 Tcl:
   type: programming
@@ -2558,7 +2558,7 @@ Textile:
   wrap: true
   extensions:
   - .textile
-  tm_scope: NONE
+  tm_scope: none
 
 Thrift:
   type: programming
@@ -2572,7 +2572,7 @@ Turing:
   extensions:
   - .t
   - .tu
-  tm_scope: NONE
+  tm_scope: none
 
 Twig:
   type: markup
@@ -2833,7 +2833,7 @@ Zimpl:
   - .zimpl
   - .zmpl
   - .zpl
-  tm_scope: NONE
+  tm_scope: none
 
 eC:
   type: programming
@@ -2841,7 +2841,7 @@ eC:
   extensions:
   - .ec
   - .eh
-  tm_scope: NONE
+  tm_scope: none
 
 edn:
   type: data
@@ -2856,7 +2856,7 @@ fish:
   group: Shell
   extensions:
   - .fish
-  tm_scope: NONE
+  tm_scope: none
 
 mupad:
   extensions:
@@ -2897,4 +2897,4 @@ xBase:
   color: "#3a4040"
   extensions:
   - .prg
-  tm_scope: NONE
+  tm_scope: none
diff --git a/test/test_language.rb b/test/test_language.rb
index 8dd4f97b..1ad47e33 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -363,9 +363,9 @@ class TestLanguage < Test::Unit::TestCase
 
   def test_all_languages_have_grammars
     scopes = YAML.load(File.read(File.expand_path("../../grammars.yml", __FILE__))).values.flatten
-    missing = Language.all.reject { |language| language.tm_scope == "NONE" || scopes.include?(language.tm_scope) }
+    missing = Language.all.reject { |language| language.tm_scope == "none" || scopes.include?(language.tm_scope) }
     message = "The following languages' scopes are not listed in grammars.yml. Please add grammars for all new languages.\n"
-    message << "If no grammar exists for a language, mark the language with `tm_scope: NONE` in lib/linguist/languages.yml.\n"
+    message << "If no grammar exists for a language, mark the language with `tm_scope: none` in lib/linguist/languages.yml.\n"
 
     width = missing.map { |language| language.name.length }.max
     message << missing.map { |language| sprintf("%-#{width}s %s", language.name, language.tm_scope) }.sort.join("\n")