more constantly constanting the constants
Merge pull request #146 from willtp87/7.x.something

more constantly constanting the constants