Small naming changes
Merge branch 'libgdx' of https://github.com/lukefiorante/monochrome into libgdx