Two parts to this.

1. Decide our convention and document in Document coding standards and conventions #523.
2. Fix inconsistencies in the current codebase.