Standardise columns to match mapper schema preferences
Fixes T177