Refactored column names