Cleanup and use of common property names prior to release 1.0.