Fixes lots of dubious variable shadowing.
Rename to coincide with moving the project to KhronosGroup.