Change name ValueTypeFactory -> ValueTypeMapping