Start renaming columns

Rename columns for ease of use