Metadata: renamed MappedType to MapPrimitiveType. Part of #2054.