Updated all columns to no longer use reserved words.