schema column adjustments and renaming