capitalize constants to keep with style. Squash down the new commits and we'll be good to go