Fixing database column names