Added DB friendly column names