Minor fix to renaming some standard columns