diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 02784542..e5672004 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -844,16 +844,6 @@ Csound Score:
   tm_scope: source.csound-score
   ace_mode: text
   language_id: 75
-Cucumber:
-  type: programming
-  extensions:
-  - ".feature"
-  tm_scope: text.gherkin.feature
-  aliases:
-  - gherkin
-  ace_mode: text
-  color: "#5B2063"
-  language_id: 76
 Cuda:
   type: programming
   extensions:
@@ -1196,23 +1186,6 @@ FLUX:
   tm_scope: none
   ace_mode: text
   language_id: 106
-FORTRAN:
-  type: programming
-  color: "#4d41b1"
-  extensions:
-  - ".f90"
-  - ".f"
-  - ".f03"
-  - ".f08"
-  - ".f77"
-  - ".f95"
-  - ".for"
-  - ".fpp"
-  tm_scope: source.fortran.modern
-  ace_mode: text
-  codemirror_mode: fortran
-  codemirror_mime_type: text/x-fortran
-  language_id: 107
 Factor:
   type: programming
   color: "#636746"
@@ -1282,6 +1255,23 @@ Forth:
   codemirror_mode: forth
   codemirror_mime_type: text/x-forth
   language_id: 114
+Fortran:
+  type: programming
+  color: "#4d41b1"
+  extensions:
+  - ".f90"
+  - ".f"
+  - ".f03"
+  - ".f08"
+  - ".f77"
+  - ".f95"
+  - ".for"
+  - ".fpp"
+  tm_scope: source.fortran.modern
+  ace_mode: text
+  codemirror_mode: fortran
+  codemirror_mime_type: text/x-fortran
+  language_id: 107
 FreeMarker:
   type: programming
   color: "#0050b2"
@@ -1327,15 +1317,6 @@ GAP:
   tm_scope: source.gap
   ace_mode: text
   language_id: 119
-GAS:
-  type: programming
-  group: Assembly
-  extensions:
-  - ".s"
-  - ".ms"
-  tm_scope: source.assembly
-  ace_mode: assembly_x86
-  language_id: 120
 GCC Machine Description:
   type: programming
   extensions:
@@ -1446,6 +1427,16 @@ Gettext Catalog:
   tm_scope: source.po
   ace_mode: text
   language_id: 129
+Gherkin:
+  type: programming
+  extensions:
+  - ".feature"
+  tm_scope: text.gherkin.feature
+  aliases:
+  - cucumber
+  ace_mode: text
+  color: "#5B2063"
+  language_id: 76
 Glyph:
   type: programming
   color: "#e4cc98"
@@ -1549,45 +1540,6 @@ Graphviz (DOT):
   - ".gv"
   ace_mode: text
   language_id: 140
-Groff:
-  type: markup
-  color: "#ecdebe"
-  extensions:
-  - ".man"
-  - ".1"
-  - ".1in"
-  - ".1m"
-  - ".1x"
-  - ".2"
-  - ".3"
-  - ".3in"
-  - ".3m"
-  - ".3qt"
-  - ".3x"
-  - ".4"
-  - ".5"
-  - ".6"
-  - ".7"
-  - ".8"
-  - ".9"
-  - ".l"
-  - ".me"
-  - ".ms"
-  - ".n"
-  - ".rno"
-  - ".roff"
-  - ".tmac"
-  filenames:
-  - mmn
-  - mmt
-  tm_scope: text.roff
-  aliases:
-  - nroff
-  - troff
-  ace_mode: text
-  codemirror_mode: troff
-  codemirror_mime_type: text/troff
-  language_id: 141
 Groovy:
   type: programming
   ace_mode: groovy
@@ -1997,17 +1949,6 @@ JSX:
   codemirror_mode: jsx
   codemirror_mime_type: text/jsx
   language_id: 178
-Jade:
-  group: HTML
-  type: markup
-  extensions:
-  - ".jade"
-  - ".pug"
-  tm_scope: text.jade
-  ace_mode: jade
-  codemirror_mode: pug
-  codemirror_mime_type: text/x-pug
-  language_id: 179
 Jasmin:
   type: programming
   ace_mode: java
@@ -2759,7 +2700,7 @@ Nginx:
   codemirror_mime_type: text/x-nginx-conf
   color: "#9469E9"
   language_id: 248
-Nimrod:
+Nim:
   type: programming
   color: "#37775b"
   extensions:
@@ -3336,6 +3277,17 @@ Public Key:
   codemirror_mode: asciiarmor
   codemirror_mime_type: application/pgp
   language_id: 298
+Pug:
+  group: HTML
+  type: markup
+  extensions:
+  - ".jade"
+  - ".pug"
+  tm_scope: text.jade
+  ace_mode: jade
+  codemirror_mode: pug
+  codemirror_mime_type: text/x-pug
+  language_id: 179
 Puppet:
   type: programming
   color: "#302B6D"
@@ -3568,7 +3520,7 @@ Racket:
   tm_scope: source.racket
   ace_mode: lisp
   language_id: 316
-Ragel in Ruby Host:
+Ragel:
   type: programming
   color: "#9d5200"
   extensions:
@@ -3651,6 +3603,44 @@ RobotFramework:
   tm_scope: text.robot
   ace_mode: text
   language_id: 324
+Roff:
+  type: markup
+  color: "#ecdebe"
+  extensions:
+  - ".man"
+  - ".1"
+  - ".1in"
+  - ".1m"
+  - ".1x"
+  - ".2"
+  - ".3"
+  - ".3in"
+  - ".3m"
+  - ".3qt"
+  - ".3x"
+  - ".4"
+  - ".5"
+  - ".6"
+  - ".7"
+  - ".8"
+  - ".9"
+  - ".l"
+  - ".me"
+  - ".ms"
+  - ".n"
+  - ".rno"
+  - ".roff"
+  - ".tmac"
+  filenames:
+  - mmn
+  - mmt
+  tm_scope: text.roff
+  aliases:
+  - nroff
+  ace_mode: text
+  codemirror_mode: troff
+  codemirror_mime_type: text/troff
+  language_id: 141
 Rouge:
   type: programming
   ace_mode: clojure
@@ -4380,6 +4370,15 @@ Unity3D Asset:
   - ".unity"
   tm_scope: source.yaml
   language_id: 380
+Unix Assembly:
+  type: programming
+  group: Assembly
+  extensions:
+  - ".s"
+  - ".ms"
+  tm_scope: source.assembly
+  ace_mode: assembly_x86
+  language_id: 120
 Uno:
   type: programming
   extensions:
@@ -4452,12 +4451,13 @@ Verilog:
   codemirror_mode: verilog
   codemirror_mime_type: text/x-verilog
   language_id: 387
-VimL:
+Vim script:
   type: programming
   color: "#199f4b"
   tm_scope: source.viml
   aliases:
   - vim
+  - viml
   - nvim
   extensions:
   - ".vim"
diff --git a/lib/linguist/popular.yml b/lib/linguist/popular.yml
index afb68021..80e6504a 100644
--- a/lib/linguist/popular.yml
+++ b/lib/linguist/popular.yml
@@ -26,4 +26,4 @@
 - Shell
 - Swift
 - TeX
-- VimL
+- Vim script
diff --git a/samples/FORTRAN/bug-185631.f b/samples/Fortran/bug-185631.f
similarity index 100%
rename from samples/FORTRAN/bug-185631.f
rename to samples/Fortran/bug-185631.f
diff --git a/samples/FORTRAN/sample1.f b/samples/Fortran/sample1.f
similarity index 100%
rename from samples/FORTRAN/sample1.f
rename to samples/Fortran/sample1.f
diff --git a/samples/FORTRAN/sample1.for b/samples/Fortran/sample1.for
similarity index 100%
rename from samples/FORTRAN/sample1.for
rename to samples/Fortran/sample1.for
diff --git a/samples/FORTRAN/sample2.f b/samples/Fortran/sample2.f
similarity index 100%
rename from samples/FORTRAN/sample2.f
rename to samples/Fortran/sample2.f
diff --git a/samples/FORTRAN/sample3.F b/samples/Fortran/sample3.F
similarity index 100%
rename from samples/FORTRAN/sample3.F
rename to samples/Fortran/sample3.F
diff --git a/samples/Nimrod/foo.nim b/samples/Nim/foo.nim
similarity index 100%
rename from samples/Nimrod/foo.nim
rename to samples/Nim/foo.nim
diff --git a/samples/Jade/hello.jade b/samples/Pug/hello.jade
similarity index 100%
rename from samples/Jade/hello.jade
rename to samples/Pug/hello.jade
diff --git a/samples/Jade/hello.pug b/samples/Pug/hello.pug
similarity index 100%
rename from samples/Jade/hello.pug
rename to samples/Pug/hello.pug
diff --git a/samples/Ragel in Ruby Host/ephemeris_parser.rl b/samples/Ragel/ephemeris_parser.rl
similarity index 100%
rename from samples/Ragel in Ruby Host/ephemeris_parser.rl
rename to samples/Ragel/ephemeris_parser.rl
diff --git a/samples/Ragel in Ruby Host/simple_scanner.rl b/samples/Ragel/simple_scanner.rl
similarity index 100%
rename from samples/Ragel in Ruby Host/simple_scanner.rl
rename to samples/Ragel/simple_scanner.rl
diff --git a/samples/Ragel in Ruby Host/simple_tokenizer.rl b/samples/Ragel/simple_tokenizer.rl
similarity index 100%
rename from samples/Ragel in Ruby Host/simple_tokenizer.rl
rename to samples/Ragel/simple_tokenizer.rl
diff --git a/samples/Groff/Tcl.n b/samples/Roff/Tcl.n
similarity index 100%
rename from samples/Groff/Tcl.n
rename to samples/Roff/Tcl.n
diff --git a/samples/Groff/an-ext.tmac b/samples/Roff/an-ext.tmac
similarity index 100%
rename from samples/Groff/an-ext.tmac
rename to samples/Roff/an-ext.tmac
diff --git a/samples/Groff/create_view.l b/samples/Roff/create_view.l
similarity index 100%
rename from samples/Groff/create_view.l
rename to samples/Roff/create_view.l
diff --git a/samples/Groff/fsinterface.ms b/samples/Roff/fsinterface.ms
similarity index 100%
rename from samples/Groff/fsinterface.ms
rename to samples/Roff/fsinterface.ms
diff --git a/samples/Groff/refs.rno b/samples/Roff/refs.rno
similarity index 100%
rename from samples/Groff/refs.rno
rename to samples/Roff/refs.rno
diff --git a/samples/Groff/sample.4 b/samples/Roff/sample.4
similarity index 100%
rename from samples/Groff/sample.4
rename to samples/Roff/sample.4
diff --git a/samples/GAS/hello.ms b/samples/Unix Assembly/hello.ms
similarity index 100%
rename from samples/GAS/hello.ms
rename to samples/Unix Assembly/hello.ms
diff --git a/samples/GAS/hello.s b/samples/Unix Assembly/hello.s
similarity index 100%
rename from samples/GAS/hello.s
rename to samples/Unix Assembly/hello.s
diff --git a/samples/VimL/filenames/.gvimrc b/samples/Vim script/filenames/.gvimrc
similarity index 100%
rename from samples/VimL/filenames/.gvimrc
rename to samples/Vim script/filenames/.gvimrc
diff --git a/samples/VimL/filenames/.nvimrc b/samples/Vim script/filenames/.nvimrc
similarity index 100%
rename from samples/VimL/filenames/.nvimrc
rename to samples/Vim script/filenames/.nvimrc
diff --git a/samples/VimL/filenames/.vimrc b/samples/Vim script/filenames/.vimrc
similarity index 100%
rename from samples/VimL/filenames/.vimrc
rename to samples/Vim script/filenames/.vimrc
diff --git a/samples/VimL/filenames/_vimrc b/samples/Vim script/filenames/_vimrc
similarity index 100%
rename from samples/VimL/filenames/_vimrc
rename to samples/Vim script/filenames/_vimrc
diff --git a/samples/VimL/solarized.vim b/samples/Vim script/solarized.vim
similarity index 100%
rename from samples/VimL/solarized.vim
rename to samples/Vim script/solarized.vim
diff --git a/test/test_language.rb b/test/test_language.rb
index 8e7253ea..ea6230f9 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -60,8 +60,8 @@ class TestLanguage < Minitest::Test
     assert_equal Language['SuperCollider'], Language.find_by_alias('supercollider')
     assert_equal Language['TeX'], Language.find_by_alias('tex')
     assert_equal Language['TypeScript'], Language.find_by_alias('ts')
-    assert_equal Language['VimL'], Language.find_by_alias('vim')
-    assert_equal Language['VimL'], Language.find_by_alias('viml')
+    assert_equal Language['Vim script'], Language.find_by_alias('vim')
+    assert_equal Language['Vim script'], Language.find_by_alias('viml')
     assert_equal Language['reStructuredText'], Language.find_by_alias('rst')
     assert_equal Language['YAML'], Language.find_by_alias('yml')
     assert_nil Language.find_by_alias(nil)
@@ -90,7 +90,7 @@ class TestLanguage < Minitest::Test
     assert_equal Language['Ruby'], Language['Ruby'].group
 
     # Test a few special groups
-    assert_equal Language['Assembly'], Language['GAS'].group
+    assert_equal Language['Assembly'], Language['Unix Assembly'].group
     assert_equal Language['C'], Language['OpenCL'].group
     assert_equal Language['Haskell'], Language['Literate Haskell'].group
     assert_equal Language['Java'], Language['Java Server Pages'].group