major refactoring of property keys. a consistent naming convention throughout.