Re #10123. Renamed column type names.