Sonar Cleanup

Changed constant names back to their original names to fix the Jenkins
build failure.