rename some internal attributes to clean up cruft