Changed column names to no use reserved words