Fixed naming style Mapping_Base