See #1489 (comment)

src/Ampersand/ADL1/P2A_Converters.hs

@@ -1333,7 +1333,7 @@ pDecl2aDecl typ cptMap maybePatName defLanguage defFormat pd =
       P_Rfx -> [Rfx]
       P_Irf -> [Irf]
       P_Prop -> [Sym, Asy]
-      P_Fun -> [Uni, Tot]
+      P_Map -> [Uni, Tot]
       P_Bij -> [Inj, Sur]
 
     decSign = pSign2aSign cptMap (dec_sign pd)

src/Ampersand/Commands/AtlasImport.hs

@@ -308,7 +308,7 @@ instance JSON.FromJSON PProp where
       "rfx" -> pure P_Rfx
       "irf" -> pure P_Irf
       "prop" -> pure P_Prop
-      "fun" -> pure P_Fun
+      "map" -> pure P_Map
       "bij" -> pure P_Bij
       _ ->
         JSON.unexpected val

src/Ampersand/Core/A2P_Converters.hs

@@ -133,7 +133,7 @@ aProps2Pprops aps
       `elem` xs
       && P_Tot
       `elem` xs =
-      Set.singleton P_Fun `Set.union` aProps2Pprops (aps Set.\\ Set.fromList [Uni, Tot])
+      Set.singleton P_Map `Set.union` aProps2Pprops (aps Set.\\ Set.fromList [Uni, Tot])
   | P_Inj
       `elem` xs
       && P_Sur

src/Ampersand/Core/ParseTree.hs

@@ -1259,8 +1259,8 @@ data PProp
     P_Irf
   | -- | PROP keyword, the parser must replace this by [Sym, Asy].
     P_Prop
-  | -- | FUN keyword, the parser must replace this by [Uni, Tot].
-    P_Fun
+  | -- | MAP keyword, the parser must replace this by [Uni, Tot].
+    P_Map
   | -- | BIJ keyword, the parser must replace this by [Inj, Sur].
     P_Bij
   deriving (Eq, Ord, Typeable, Data, Enum, Bounded)
@@ -1276,7 +1276,7 @@ instance Show PProp where
   show P_Rfx = "RFX"
   show P_Irf = "IRF"
   show P_Prop = "PROP"
-  show P_Fun = "FUN"
+  show P_Map = "MAP"
   show P_Bij = "BIJ"
 
 instance Unique PProp where
@@ -1287,6 +1287,8 @@ instance Flippable PProp where
   flp P_Tot = P_Sur
   flp P_Sur = P_Tot
   flp P_Inj = P_Uni
+  flp P_Map = P_Bij
+  flp P_Bij = P_Map
   flp x = x
 
 data PRelationDefault

src/Ampersand/Input/ADL1/Parser.hs

@@ -432,7 +432,7 @@ pProps :: AmpParser (Set.Set PProp)
 pProps = normalizeProps <$> pBrackets (pProp `sepBy` pComma)
   where
     --- PropList ::= Prop (',' Prop)*
-    --- Prop ::= 'UNI' | 'INJ' | 'SUR' | 'TOT' | 'SYM' | 'ASY' | 'TRN' | 'RFX' | 'IRF' | 'PROP' |'FUN' | 'BIJ'
+    --- Prop ::= 'UNI' | 'INJ' | 'SUR' | 'TOT' | 'SYM' | 'ASY' | 'TRN' | 'RFX' | 'IRF' | 'PROP' |'MAP' | 'BIJ'
     pProp :: AmpParser PProp
     pProp = choice [p <$ pKey (show p) | p <- [minBound ..]]
     normalizeProps :: [PProp] -> PProps
@@ -442,7 +442,7 @@ pProps = normalizeProps <$> pBrackets (pProp `sepBy` pComma)
         rep :: PProps -> PProps
         rep ps
           | P_Prop `elem` ps = Set.fromList [P_Sym, P_Asy] `Set.union` (P_Prop `Set.delete` ps)
-          | P_Fun `elem` ps = Set.fromList [P_Uni, P_Tot] `Set.union` (P_Fun `Set.delete` ps)
+          | P_Map `elem` ps = Set.fromList [P_Uni, P_Tot] `Set.union` (P_Map `Set.delete` ps)
           | P_Bij `elem` ps = Set.fromList [P_Inj, P_Sur] `Set.union` (P_Bij `Set.delete` ps)
           | otherwise = ps
         -- add Uni and Inj if ps has neither Sym nor Asy