Remove mangling Map into name except in some instances necessary for clarity