Refactor with consistent Models property naming according to ColumnMap.