API changes

This pull request primary deals with updating property names, but also includes the following changes:

* Fixing incorrect constant names
* Preventing unnecessary whitespace in generated files