diff --git a/src/japanese/ParadigmsJpn.gf b/src/japanese/ParadigmsJpn.gf
index 79a4f7e27..80888a4d2 100644
--- a/src/japanese/ParadigmsJpn.gf
+++ b/src/japanese/ParadigmsJpn.gf
@@ -5,38 +5,42 @@ flags coding = utf8 ;
 
 oper
 
-  VerbGroup : Type ;
+  VerbGroup : Type ; -- Parameter for mkV*
   gr1 : VerbGroup ; -- Basic form ends in -u, consonant stem.
   gr2 : VerbGroup ; -- Basic form ends in -iru/-eru, vowel stem.
   suru : VerbGroup ; -- Irregular: kuru
   kuru : VerbGroup ; -- Irregular: suru
 
+  Animacy : Type ; -- Parameter for mkN*
+  animate : Animacy ;
+  inanimate : Animacy ;
+
   mkN = overload {
     mkN : (man : Str) -> N -- Inanimate noun. Counter is つ and not replaceable.
       = \n -> lin N (regNoun n Inanim "つ" False True) ;  ---- AR 15/11/2014
-    mkN : (man : Str) -> (anim : Animateness) -> N -- Animacy given as argument. Counter is つ and not replaceable.
+    mkN : (man : Str) -> (anim : Animacy) -> N -- Animacy given as argument. Counter is つ and not replaceable.
       = \n,a -> lin N (regNoun n a "つ" False True) ;
-    mkN : (kane,okane : Str) -> (anim : Animateness) -> N -- Style variation (plain, respectful) and animacy given. Counter is つ and not replaceable.
+    mkN : (kane,okane : Str) -> (anim : Animacy) -> N -- Style variation (plain, respectful) and animacy given. Counter is つ and not replaceable.
       = \kane,okane,a -> lin N (styleNoun kane okane a "つ" False True) ;
-    mkN : (man : Str) -> (anim : Animateness) -> (counter : Str) -> (counterReplace : Bool) -> N -- No style variation. Arguments are animacy, counter and whether counter is replaceable.
+    mkN : (man : Str) -> (anim : Animacy) -> (counter : Str) -> (counterReplace : Bool) -> N -- No style variation. Arguments are animacy, counter and whether counter is replaceable.
       = \n,a,c,b -> lin N (regNoun n a c b False) ;
-    mkN : (man : Str) -> (anim : Animateness) -> (counter : Str) -> (counterReplace : Bool) ->
+    mkN : (man : Str) -> (anim : Animacy) -> (counter : Str) -> (counterReplace : Bool) ->
           (men : Str) -> N -- Like previous, but unpredictable plural.
       = \n,a,c,b,pl -> lin N (numberNoun n a c b pl False) ;
-    mkN : (kane,okane : Str) -> (anim : Animateness) -> (counter : Str) ->
+    mkN : (kane,okane : Str) -> (anim : Animacy) -> (counter : Str) ->
           (counterReplace : Bool) -> N -- Style variation, animacy, counter and whether counter is replaceable.
       = \kane,okane,a,c,b -> lin N (styleNoun kane okane a c b False) ;
-    mkN : (tsuma,okusan : Str) -> (anim : Animateness) -> (counter : Str) ->
+    mkN : (tsuma,okusan : Str) -> (anim : Animacy) -> (counter : Str) ->
           (counterReplace : Bool) -> (tsumatachi : Str) -> N  -- Worst case paradigm: style variation, animacy, counter, whether counter is replaceable and unpredictable plural.
       = \tsuma,okusan,a,c,b,tsumatachi ->
              lin N (mkNoun tsuma okusan tsumatachi tsumatachi a c b False)
     } ;
 
-  mkN2 : (man : Str) -> (anim : Animateness) -> (counter : Str) -> (counterReplace : Bool) ->
+  mkN2 : (man : Str) -> (anim : Animacy) -> (counter : Str) -> (counterReplace : Bool) ->
          (men : Str) -> (prep : Str) -> N2 = \n,a,c,b,pl,pr ->
           lin N2 (numberNoun n a c b pl False) ** {prep = pr ; object = \\st => []} ;
 
-  mkN3 : (distance : Str) -> (prep1: Str) -> (prep2: Str) -> (anim : Animateness) -> N3
+  mkN3 : (distance : Str) -> (prep1: Str) -> (prep2: Str) -> (anim : Animacy) -> N3
       = \n,p1,p2,a -> lin N3 (regNoun n a "つ" False True) ** {prep1 = p1; prep2 = p2} ;
 
   mkPN = overload {
@@ -47,9 +51,9 @@ oper
     } ;
 
   mkPron = overload {
-    mkPron : (kare : Str) -> (Pron1Sg : Bool) -> (anim : Animateness) -> Pron
+    mkPron : (kare : Str) -> (Pron1Sg : Bool) -> (anim : Animacy) -> Pron
       = \kare,b,a -> lin Pron (regPron kare b a) ;
-    mkPron : (boku,watashi : Str) -> (Pron1Sg : Bool) -> (anim : Animateness) -> Pron
+    mkPron : (boku,watashi : Str) -> (Pron1Sg : Bool) -> (anim : Animacy) -> Pron
       = \boku,watashi,b,a -> lin Pron (stylePron boku watashi b a)
     } ;
 
@@ -130,6 +134,10 @@ oper
 --.
   -- Hidden definitions
 
+  Animacy : Type = ResJpn.Animateness ;
+  animate : Animacy = ResJpn.Anim ;
+  inanimate : Animacy = ResJpn.Inanim ;
+
   VerbGroup : Type = ResJpn.VerbGroup ;
   gr1 : VerbGroup = Gr1 ;
   gr2 : VerbGroup = Gr2 ;