Removed constant renaming from master and moved it to branch 3.x