camelCasing across the board, plus some extra fixes for annex,compliance