Rename offending fields (with dots and dollar signs)