EST-236: camelCase column names in the database

- and other similar tidy-up.