Use consistant constants constantly.
Merge branch 'master' into constants