changed names of geometry constants
Merge branch 'master' of https://github.com/Fingerpaint/project-code