Fix constants broken during rename.

Oops...
Merge pull request #115 from adam-vessey/7.x-fix-constant-renaming-error

Fix constants broken during rename.