diff --git a/src/server/MainFastCGI.hs b/src/server/MainFastCGI.hs
index 1f2413211..d3c223c92 100644
--- a/src/server/MainFastCGI.hs
+++ b/src/server/MainFastCGI.hs
@@ -102,9 +102,9 @@ doLinearize pgf tree mto = showJSON $ map toJSObject
 
 doLanguages :: PGF -> JSValue
 doLanguages pgf = showJSON $ map toJSObject
-     [[("lang", showJSON l), 
-      ("languageCode", showJSON $ fromMaybe "" (PGF.languageCode pgf l)),
-      ("canParse",     showJSON $ PGF.canParse pgf l)]
+     [[("name", showJSON l), 
+       ("languageCode", showJSON $ fromMaybe "" (PGF.languageCode pgf l)),
+       ("canParse",     showJSON $ PGF.canParse pgf l)]
           | l <- PGF.languages pgf]
 
 doCategories :: PGF -> JSValue
diff --git a/src/server/gf-client.html b/src/server/gf-client.html
index 86b2f828c..24be634b4 100644
--- a/src/server/gf-client.html
+++ b/src/server/gf-client.html
@@ -27,9 +27,9 @@
         var t = document.getElementById('toLang');
         for (var i in langs) {
           if (langs[i].canParse) {
-            addOption(f, langs[i].lang, langs[i].lang);
+            addOption(f, langs[i].name, langs[i].name);
           }
-          addOption(t, langs[i].lang, langs[i].lang);
+          addOption(t, langs[i].name, langs[i].name);
         }
       }