Rename type mapper to be more specific