@@ -72,16 +72,16 @@ import Language.Haskell.Exts.Pretty (prettyPrint)
7272import Language.Haskell.Exts.Syntax (Name)
7373
7474aname :: Text -> Name
75−aname = name . Text.unpack . mappend "API" . upperHead . Text.replace "." ""
75+aname = name . Text.unpack . (<> "API") . upperHead . Text.replace "." ""
7676
7777mname :: Text -> Global -> (Name, Global, Text)
7878mname abrv (Global g) =
79− ( name (Text.unpack (mconcat n) <> "API") -- Action service type alias.
80− , Global (n <> ["'"]) -- Action data type.
81− , Text.intercalate "." ns -- Action namespace.
79+ ( aname (mconcat n) -- Action service type alias.
80+ , Global (n <> ["'"]) -- Action data type.
81+ , Text.intercalate "." ns -- Action namespace.
8282 )
8383 where
84− n = drop 1 ns
84+ n = drop 1 (map (upperHead . upperAcronym) ns)
8585
8686 ns | CI.mk e == CI.mk x = e:xs
8787 | otherwise = x:xs