Modify column names so they match regular foundation ones.