diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 902baceb..75cb305c 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -312,7 +312,7 @@ Dylan:
 Ecere Projects:
   type: data
   group: JavaScript
-  lexer: JavaScript
+  lexer: JSON
   extensions:
   - .epj
 
@@ -349,7 +349,7 @@ Erlang:
 
 F#:
   type: programming
-  lexer: OCaml
+  lexer: FSharp
   search_term: ocaml
   extensions:
   - .fs
@@ -392,7 +392,6 @@ Fancy:
 
 Fantom:
   type: programming
-  lexer: Java
   extensions:
   - .fan
 
@@ -458,7 +457,6 @@ Groff:
 
 Groovy:
   type: programming
-  lexer: Java
   ace_mode: groovy
   primary_extension: .groovy
   extensions:
@@ -559,7 +557,6 @@ Ioke:
 JSON:
   type: data
   group: JavaScript
-  lexer: JavaScript
   ace_mode: json
   searchable: false
   extensions:
@@ -609,7 +606,7 @@ Kotlin:
   - .kt
   - .ktm
   - .kts
-  
+
 LLVM:
   extensions:
   - .ll
@@ -768,7 +765,6 @@ Objective-J:
 
 Opa:
   type: programming
-  lexer: Text only
   extensions:
   - .opa
 
@@ -845,7 +841,6 @@ Perl:
 
 PowerShell:
   type: programming
-  lexer: Text only
   ace_mode: powershell
   aliases:
   - posh
diff --git a/test/test_language.rb b/test/test_language.rb
index b636776a..5186af52 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -41,24 +41,24 @@ class TestLanguage < Test::Unit::TestCase
     assert_equal Lexer['C++'], Language['C++'].lexer
     assert_equal Lexer['Coldfusion HTML'], Language['ColdFusion'].lexer
     assert_equal Lexer['Coq'], Language['Coq'].lexer
+    assert_equal Lexer['FSharp'], Language['F#'].lexer
+    assert_equal Lexer['FSharp'], Language['F#'].lexer
     assert_equal Lexer['Fortran'], Language['FORTRAN'].lexer
     assert_equal Lexer['Gherkin'], Language['Cucumber'].lexer
+    assert_equal Lexer['Groovy'], Language['Groovy'].lexer
     assert_equal Lexer['HTML'], Language['HTML'].lexer
     assert_equal Lexer['HTML+Django/Jinja'], Language['HTML+Django'].lexer
     assert_equal Lexer['HTML+PHP'], Language['HTML+PHP'].lexer
+    assert_equal Lexer['JSON'], Language['JSON'].lexer
     assert_equal Lexer['Java'], Language['ChucK'].lexer
-    assert_equal Lexer['Java'], Language['Groovy'].lexer
     assert_equal Lexer['Java'], Language['Java'].lexer
-    assert_equal Lexer['JavaScript'], Language['JSON'].lexer
     assert_equal Lexer['JavaScript'], Language['JavaScript'].lexer
     assert_equal Lexer['MOOCode'], Language['Moocode'].lexer
     assert_equal Lexer['MuPAD'], Language['mupad'].lexer
     assert_equal Lexer['NASM'], Language['Assembly'].lexer
-    assert_equal Lexer['OCaml'], Language['F#'].lexer
     assert_equal Lexer['OCaml'], Language['OCaml'].lexer
-    assert_equal Lexer['OpenEdge ABL'], Language['OpenEdge ABL'].lexer
-    assert_equal Lexer['Standard ML'], Language['Standard ML'].lexer
     assert_equal Lexer['Ooc'], Language['ooc'].lexer
+    assert_equal Lexer['OpenEdge ABL'], Language['OpenEdge ABL'].lexer
     assert_equal Lexer['REBOL'], Language['Rebol'].lexer
     assert_equal Lexer['RHTML'], Language['HTML+ERB'].lexer
     assert_equal Lexer['RHTML'], Language['RHTML'].lexer
@@ -69,6 +69,7 @@ class TestLanguage < Test::Unit::TestCase
     assert_equal Lexer['Scheme'], Language['Nu'].lexer
     assert_equal Lexer['Scheme'], Language['Racket'].lexer
     assert_equal Lexer['Scheme'], Language['Scheme'].lexer
+    assert_equal Lexer['Standard ML'], Language['Standard ML'].lexer
     assert_equal Lexer['TeX'], Language['TeX'].lexer
     assert_equal Lexer['Text only'], Language['Text'].lexer
     assert_equal Lexer['Verilog'], Language['Verilog'].lexer