BUG: Allow renaming of a column after mapping

Related #511

This should be merged before deciding on a less verbose way to rename things.