[IM] [OSX] More refactoring, CollisionMapping to Mapping.