changing column names to not use reserved postgres names