Fix up data names when mappings include expressions