diff --git a/src/slovenian/DocumentationSlv.gf b/src/slovenian/DocumentationSlv.gf
index 345b480b0..373d49351 100644
--- a/src/slovenian/DocumentationSlv.gf
+++ b/src/slovenian/DocumentationSlv.gf
@@ -1,6 +1,6 @@
 --# -path=.:../abstract:../common
 concrete DocumentationSlv of Documentation = CatSlv ** open 
-  ResSlv, ParamX,
+  ResSlv, (P=ParamX),
   HTML in {
 flags coding=utf8 ;
 
@@ -73,8 +73,8 @@ lin
     t = "li" ;
     s1= heading1 ("Dano Ime"++
                   case n.g of {
-                    Male   => "(moški)" ;
-                    Female => "(ženski)"
+                    P.Male   => "(moški)" ;
+                    P.Female => "(ženski)"
                   }) ;
     s2= frameTable (
           tr (th "imen." ++ td (n.s!Nom))++
@@ -90,12 +90,12 @@ lin
     t = "li" ;
     s1= heading1 "Družinsko Ime" ;
     s2= frameTable (
-          tr (th "imen." ++ td (n.s!Male!Nom))++
-          tr (th "rod." ++ td (n.s!Male!Gen))++
-          tr (th "daj." ++ td (n.s!Male!Dat))++
-          tr (th "tož." ++ td (n.s!Male!Acc))++
-          tr (th "mest." ++ td (n.s!Male!Loc))++
-          tr (th "orod."++td (n.s!Male!Instr))
+          tr (th "imen." ++ td (n.s!P.Male!Nom))++
+          tr (th "rod." ++ td (n.s!P.Male!Gen))++
+          tr (th "daj." ++ td (n.s!P.Male!Dat))++
+          tr (th "tož." ++ td (n.s!P.Male!Acc))++
+          tr (th "mest." ++ td (n.s!P.Male!Loc))++
+          tr (th "orod."++td (n.s!P.Male!Instr))
         )
   } ;
 
diff --git a/src/slovenian/NamesSlv.gf b/src/slovenian/NamesSlv.gf
index 1b767352d..874930391 100644
--- a/src/slovenian/NamesSlv.gf
+++ b/src/slovenian/NamesSlv.gf
@@ -1,4 +1,4 @@
-concrete NamesSlv of Names = CatSlv ** open ResSlv, ParamX, Prelude in {
+concrete NamesSlv of Names = CatSlv ** open ResSlv, (P=ParamX), Prelude in {
 
 lin GivenName = \n -> {
       s = n.s;
@@ -6,12 +6,12 @@ lin GivenName = \n -> {
       isPron = False
       } ;
 lin MaleSurname = \n -> {
-      s = n.s ! Male;
+      s = n.s ! P.Male;
       a = {g=Masc; n=Sg; p=P3};
       isPron = False
       } ;
 lin FemaleSurname = \n -> {
-      s = n.s ! Female;
+      s = n.s ! P.Female;
       a = {g=Fem; n=Sg; p=P3};
       isPron = False
       } ;
diff --git a/src/slovenian/ParadigmsSlv.gf b/src/slovenian/ParadigmsSlv.gf
index 54d0ab792..7cb1a45a3 100644
--- a/src/slovenian/ParadigmsSlv.gf
+++ b/src/slovenian/ParadigmsSlv.gf
@@ -1,4 +1,4 @@
-resource ParadigmsSlv = open CatSlv, ResSlv, ParamX, Prelude, Predef in {
+resource ParadigmsSlv = open CatSlv, ResSlv, (P=ParamX), Prelude, Predef in {
 
 oper
   nominative : Case = Nom ;
@@ -16,12 +16,12 @@ oper
   feminine  = AFem;
   neuter    = ANeut;
 
-  male = Male ;
-  female = Female ;
+  male = P.Male ;
+  female = P.Female ;
 
-  singular : Number = Sg ;
-  dual : Number = Dl ;
-  plural : Number = Pl ;
+  singular : ResSlv.Number = ResSlv.Sg ;
+  dual : ResSlv.Number = Dl ;
+  plural : ResSlv.Number = ResSlv.Pl ;
 
   definite : Species = Def ;
   indefinite : Species = Indef ; 
@@ -45,7 +45,7 @@ oper
 --In case the genitive singular has an extra vowel in the end, it is dropped before coming here.  
 
   mascAll : (_,_ : Str) -> Animacy -> N = \oce,ocet,anim ->
-    let accsg = case anim of {Animate => ocet + "a"; _ => oce}; --Special case: Masc Sg Acc Animate
+    let accsg = case anim of {Animate => ocet + "a"; _ => oce}; --Special case: Masc ResSlv.Sg Acc Animate
         oceto : Str
               = case ocet of {
                   _ + ("c"|"j"|"ž"|"š"|"č") => ocet+"e" ;
@@ -208,12 +208,12 @@ oper
     } ;
 
   mkGN = overload {
-    mkGN : Str -> Sex -> GN =
+    mkGN : Str -> P.Sex -> GN =
       \s,g -> lin GN {
          s = \\_ => s ;
          g = g
       };
-    mkGN : (_,_,_,_,_,_ : Str) -> Sex -> GN =
+    mkGN : (_,_,_,_,_,_ : Str) -> P.Sex -> GN =
       \nom,gen,dat,acc,loc,instr,g -> lin GN {
          s = table {
                Nom   => nom;