-emptyNameEnv = emptyUFM
-foldNameEnv = foldUFM
-mkNameEnv = listToUFM
-nameEnvElts = eltsUFM
-extendNameEnv_C = addToUFM_C
-extendNameEnv_Acc = addToUFM_Acc
-extendNameEnv = addToUFM
-plusNameEnv = plusUFM
-plusNameEnv_C = plusUFM_C
-extendNameEnvList = addListToUFM
-extendNameEnvList_C = addListToUFM_C
-delFromNameEnv = delFromUFM
-delListFromNameEnv = delListFromUFM
-elemNameEnv = elemUFM
-unitNameEnv = unitUFM
-filterNameEnv = filterUFM
-mapNameEnv = mapUFM
+nameEnvElts x = eltsUFM x
+emptyNameEnv = emptyUFM
+unitNameEnv x y = unitUFM x y
+extendNameEnv x y z = addToUFM x y z
+extendNameEnvList x l = addListToUFM x l
+lookupNameEnv x y = lookupUFM x y
+mkNameEnv l = listToUFM l
+elemNameEnv x y = elemUFM x y
+foldNameEnv a b c = foldUFM a b c
+plusNameEnv x y = plusUFM x y
+plusNameEnv_C f x y = plusUFM_C f x y
+extendNameEnv_C f x y z = addToUFM_C f x y z
+mapNameEnv f x = mapUFM f x
+nameEnvUniqueElts x = ufmToList x
+extendNameEnv_Acc x y z a b = addToUFM_Acc x y z a b
+extendNameEnvList_C x y z = addListToUFM_C x y z
+delFromNameEnv x y = delFromUFM x y
+delListFromNameEnv x y = delListFromUFM x y
+filterNameEnv x y = filterUFM x y