Rename some columns
Updated forms, variable names