change column names to something more readable
adapt more code to the new column names
even more column name adjustment
update more fields
rename even more fields
Merge branch 'master' into columnnames
more column name rename
more of the same
Merge branch 'master' into columnnames