fixes to data name mappings