Naming consistency fixes.
Merge branch 'master' of github.com:slembcke/Chipmunk-Physics