Tweak names to match column names.