Now property names are behind defines, so if a name changes, I don't have to hunt it down in up to six source files.
