Consistent identifiers.
More identifier consitency
Even more identifier consistency
Merge branch 'master' into identifier-consistency
Bikeshedding according to @pleroy's review, spacing.
Merge pull request #21 from eggrobin/identifier-consistency

Identifier consistency