mapp -> fmap
renaming axioms and fixing ===