diff --git a/Setup.hs b/Setup.hs
index 1e6ee0b92..c9364b04b 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -215,7 +215,7 @@ langsCoding = [
   (("german",   "Ger"),""),
   (("interlingua","Ina"),""),
   (("italian",  "Ita"),""),
-  (("japanese", "Jap"),""),
+  (("japanese", "Jpn"),""),
   (("latin",    "Lat"),""),
   (("latvian",    "Lav"),""),
   (("norwegian","Nor"),""),
@@ -244,7 +244,7 @@ langsLang = langs `except` ["Amh","Ara","Lat","Tur"]
 langsAPI  = langsLang `except` ["Ina"]
 
 -- languages for which to compile Symbolic
-langsSymbolic  = langsAPI `except` ["Jap"]
+langsSymbolic  = langsAPI `except` ["Jpn"]
 
 -- languages for which to run demo test
 langsDemo = langsLang `except` ["Ara","Hin","Ina","Lav","Tha"]
diff --git a/lib/doc/Makefile b/lib/doc/Makefile
index 41c7decd6..2be9cfdb7 100644
--- a/lib/doc/Makefile
+++ b/lib/doc/Makefile
@@ -28,7 +28,7 @@ exx: exx-script
 	gf -retain -s ../alltenses/TryGer.gfo <api-examples.gfs >api-examples-Ger.txt
 	gf -retain -s ../alltenses/TryHin.gfo <api-examples.gfs >api-examples-Hin.txt
 	gf -retain -s ../alltenses/TryIta.gfo <api-examples.gfs >api-examples-Ita.txt
-	gf -retain -s ../alltenses/TryJap.gfo <api-examples.gfs >api-examples-Jap.txt
+	gf -retain -s ../alltenses/TryJpn.gfo <api-examples.gfs >api-examples-Jpn.txt
 	gf -retain -s ../alltenses/TryLav.gfo <api-examples.gfs >api-examples-Lav.txt
 	gf -retain -s ../alltenses/TryNep.gfo <api-examples.gfs >api-examples-Nep.txt
 	gf -retain -s ../alltenses/TryNor.gfo <api-examples.gfs >api-examples-Nor.txt
diff --git a/lib/doc/MkExxTable.hs b/lib/doc/MkExxTable.hs
index 5580fa86b..3377f6a4a 100644
--- a/lib/doc/MkExxTable.hs
+++ b/lib/doc/MkExxTable.hs
@@ -71,7 +71,7 @@ prApiEx apexx = case M.toList apexx of
                 [l ++ ": //" ++ mkEx l e ++ "//" | (l,e) <- lexx]
 
 mkEx l = unws . bind . mkE . words where 
-  unws = if elem l ["Jap","Tha"] then concat else unwords  -- remove spaces
+  unws = if elem l ["Jpn","Tha"] then concat else unwords  -- remove spaces
   mkE e = case e of
     "atomic":"term":_ -> ["*"]
     "[]":_ -> ["''"]
diff --git a/lib/doc/MkSynopsis.hs b/lib/doc/MkSynopsis.hs
index 07eac1ffd..c979a144f 100644
--- a/lib/doc/MkSynopsis.hs
+++ b/lib/doc/MkSynopsis.hs
@@ -17,7 +17,7 @@ revealedLang = "Eng"
 
 -- all languages shown
 apiExxFiles = ["api-examples-" ++ lang ++ ".txt" | lang <- words 
-  "Afr Bul Cat Dan Dut Eng Fin Fre Ger Hin Ita Jap Lav Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd"]
+  "Afr Bul Cat Dan Dut Eng Fin Fre Ger Hin Ita Jpn Lav Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd"]
 
 main = do
   xx <- getArgs
@@ -248,7 +248,7 @@ paradigmFiles = [
   ("Hindi", srcPath "/hindi/ParadigmsHin.gf"),
 --  ("Interlingua", srcPath "/interlingua/ParadigmsIna.gf"),
   ("Italian",  srcPath "/italian/ParadigmsIta.gf"),
-  ("Japanese",  srcPath "/japanese/ParadigmsJap.gf"),
+  ("Japanese",  srcPath "/japanese/ParadigmsJpn.gf"),
   ("Latvian",  srcPath "/latvian/ParadigmsLav.gf"),
   ("Nepali", srcPath "/nepali/ParadigmsNep.gf"),
   ("Norwegian", srcPath "/norwegian/ParadigmsNor.gf"),
diff --git a/lib/src/Make.hs b/lib/src/Make.hs
index 1603b4e73..f46b608bb 100644
--- a/lib/src/Make.hs
+++ b/lib/src/Make.hs
@@ -42,7 +42,7 @@ langsCoding = [
   (("german",   "Ger"),""),
   (("interlingua","Ina"),""),
   (("italian",  "Ita"),"Romance"),
-  (("japanese", "Jap"),""),
+  (("japanese", "Jpn"),""),
   (("latin",    "Lat"),""),
   (("latvian",  "Lav"),""),
   (("nepali",   "Nep"),""),
@@ -72,7 +72,7 @@ langsLangAll = langs
 langsLang = langs `except` langsIncomplete
 
 -- languagues that have notpresent marked
-langsPresent = langsLang `except` ["Jap","Nep","Pes","Snd","Tha"]
+langsPresent = langsLang `except` ["Jpn","Nep","Pes","Snd","Tha"]
 
 -- languages for which Lang can be compiled but which are incomplete
 langsIncomplete = ["Amh","Ara","Lat","Tur"]
@@ -81,7 +81,7 @@ langsIncomplete = ["Amh","Ara","Lat","Tur"]
 langsAPI = langsLang `except` langsIncomplete
 
 -- languages for which to compile Symbolic
-langsSymbolic = langsLang `except` (langsIncomplete ++ ["Afr","Ina","Jap","Nep","Pnb","Rus", "Snd"])
+langsSymbolic = langsLang `except` (langsIncomplete ++ ["Afr","Ina","Jpn","Nep","Pnb","Rus", "Snd"])
 
 -- languages for which to compile minimal Syntax
 langsMinimal = langs `only` ["Ara","Eng","Bul","Rus"]
diff --git a/lib/src/api/CombinatorsJap.gf b/lib/src/api/CombinatorsJap.gf
deleted file mode 100644
index ca5cb695d..000000000
--- a/lib/src/api/CombinatorsJap.gf
+++ /dev/null
@@ -1,6 +0,0 @@
---# -path=.:alltenses:prelude
-
-resource CombinatorsJap = Combinators with 
-  (Cat = CatJap),
-  (Structural = StructuralJap),
-  (Constructors = ConstructorsJap) ;
diff --git a/lib/src/api/CombinatorsJpn.gf b/lib/src/api/CombinatorsJpn.gf
new file mode 100644
index 000000000..49bfbcce0
--- /dev/null
+++ b/lib/src/api/CombinatorsJpn.gf
@@ -0,0 +1,6 @@
+--# -path=.:alltenses:prelude
+
+resource CombinatorsJpn = Combinators with 
+  (Cat = CatJpn),
+  (Structural = StructuralJpn),
+  (Constructors = ConstructorsJpn) ;
diff --git a/lib/src/api/ConstructorsJap.gf b/lib/src/api/ConstructorsJap.gf
deleted file mode 100644
index 29ff4173f..000000000
--- a/lib/src/api/ConstructorsJap.gf
+++ /dev/null
@@ -1,3 +0,0 @@
---# -path=.:alltenses:prelude
-
-resource ConstructorsJap = Constructors with (Grammar = GrammarJap) ;
diff --git a/lib/src/api/ConstructorsJpn.gf b/lib/src/api/ConstructorsJpn.gf
new file mode 100644
index 000000000..08e3a7dd2
--- /dev/null
+++ b/lib/src/api/ConstructorsJpn.gf
@@ -0,0 +1,3 @@
+--# -path=.:alltenses:prelude
+
+resource ConstructorsJpn = Constructors with (Grammar = GrammarJpn) ;
diff --git a/lib/src/api/SyntaxJap.gf b/lib/src/api/SyntaxJap.gf
deleted file mode 100644
index 4f815d6e0..000000000
--- a/lib/src/api/SyntaxJap.gf
+++ /dev/null
@@ -1,5 +0,0 @@
---# -path=.:./alltenses
-
-instance SyntaxJap of Syntax = 
-  ConstructorsJap, CatJap, StructuralJap, CombinatorsJap ;
-
diff --git a/lib/src/api/SyntaxJpn.gf b/lib/src/api/SyntaxJpn.gf
new file mode 100644
index 000000000..1e51a16ef
--- /dev/null
+++ b/lib/src/api/SyntaxJpn.gf
@@ -0,0 +1,5 @@
+--# -path=.:./alltenses
+
+instance SyntaxJpn of Syntax = 
+  ConstructorsJpn, CatJpn, StructuralJpn, CombinatorsJpn ;
+
diff --git a/lib/src/api/TryJap.gf b/lib/src/api/TryJap.gf
deleted file mode 100644
index d0e13e135..000000000
--- a/lib/src/api/TryJap.gf
+++ /dev/null
@@ -1,26 +0,0 @@
---# -path=.:alltenses:prelude
-resource TryJap = 
-  SyntaxJap - [mkAdN] , 
-  LexiconJap, 
-  ParadigmsJap - [mkAdv,mkDet,mkIP,mkAdN,mkQuant] ** 
-  open (P = ParadigmsJap) in {
-
-}
-{-
-oper
-
-  mkAdv = overload SyntaxJap {
-    mkAdv : Str -> Adv = P.mkAdv ;
-  } ;
-
-  mkAdN = overload {
-    mkAdN : CAdv -> AdN = SyntaxJap.mkAdN ;
----   mkAdN : Str -> AdN = P.mkAdN ;
-  } ;
-
---  mkOrd = overload SyntaxJap {
---    mkOrd : A -> Ord = SyntaxJap.OrdSuperl ;
---  } ;
-
-
--}
diff --git a/lib/src/api/TryJpn.gf b/lib/src/api/TryJpn.gf
new file mode 100644
index 000000000..d541cf977
--- /dev/null
+++ b/lib/src/api/TryJpn.gf
@@ -0,0 +1,26 @@
+--# -path=.:alltenses:prelude
+resource TryJpn = 
+  SyntaxJpn - [mkAdN] , 
+  LexiconJpn, 
+  ParadigmsJpn - [mkAdv,mkDet,mkIP,mkAdN,mkQuant] ** 
+  open (P = ParadigmsJpn) in {
+
+}
+{-
+oper
+
+  mkAdv = overload SyntaxJpn {
+    mkAdv : Str -> Adv = P.mkAdv ;
+  } ;
+
+  mkAdN = overload {
+    mkAdN : CAdv -> AdN = SyntaxJpn.mkAdN ;
+---   mkAdN : Str -> AdN = P.mkAdN ;
+  } ;
+
+--  mkOrd = overload SyntaxJpn {
+--    mkOrd : A -> Ord = SyntaxJpn.OrdSuperl ;
+--  } ;
+
+
+-}
diff --git a/lib/src/demo/Makefile b/lib/src/demo/Makefile
index 9e96a103d..43aa17677 100644
--- a/lib/src/demo/Makefile
+++ b/lib/src/demo/Makefile
@@ -6,7 +6,7 @@ src:
 	runghc MkMini.hs
 
 compdemo:
-	$(compile) Afr Bul Cat Dan Dut Eng Fin Fre Ger Hin Ita Jap Lav Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd
+	$(compile) Afr Bul Cat Dan Dut Eng Fin Fre Ger Hin Ita Jpn Lav Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd
 
 linkdemo:
-	$(compile) -link Afr Bul Cat Dan Dut Eng Fin Fre Ger Hin Ita Jap Lav Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd
+	$(compile) -link Afr Bul Cat Dan Dut Eng Fin Fre Ger Hin Ita Jpn Lav Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd
diff --git a/lib/src/demo/MkMini.hs b/lib/src/demo/MkMini.hs
index 877f9da11..6286e8698 100644
--- a/lib/src/demo/MkMini.hs
+++ b/lib/src/demo/MkMini.hs
@@ -2,7 +2,7 @@ src = "Eng"
 langs = [
   "Afr","Bul","Cat","Dan","Dut",
   "Fin","Fre","Ger","Hin","Ita",
-  "Jap","Lav","Nep","Nor","Pes",
+  "Jpn","Lav","Nep","Nor","Pes",
   "Pol","Pnb","Ron","Rus","Snd",
   "Spa","Swe","Tha","Urd"
   ]
diff --git a/lib/src/japanese/AllJpn.gf b/lib/src/japanese/AllJpn.gf
index bda23d0ce..428be289d 100644
--- a/lib/src/japanese/AllJpn.gf
+++ b/lib/src/japanese/AllJpn.gf
@@ -1,3 +1,5 @@
+--# -path=.:../abstract:../common
+
 concrete AllJpn of AllJpnAbs = 
   LangJpn,
   ExtraJpn
diff --git a/lib/src/japanese/LangJpn.gf b/lib/src/japanese/LangJpn.gf
index 17053fdec..9101b80be 100644
--- a/lib/src/japanese/LangJpn.gf
+++ b/lib/src/japanese/LangJpn.gf
@@ -1,3 +1,5 @@
+--# -path=.:../abstract:../common
+
   concrete LangJpn of Lang = 
     GrammarJpn, 
     LexiconJpn
diff --git a/lib/src/japanese/LexiconJpn.gf b/lib/src/japanese/LexiconJpn.gf
index 380e58066..669011056 100644
--- a/lib/src/japanese/LexiconJpn.gf
+++ b/lib/src/japanese/LexiconJpn.gf
@@ -1,4 +1,4 @@
-concrete LexiconJpn of Lexicon = GrammarJpn ** open ParadigmsJpn, ResJpn, Prelude in {
+concrete LexiconJpn of Lexicon = CatJpn ** open ParadigmsJpn, ResJpn, Prelude in {
 
 flags coding = utf8 ;