Naming updates and cleanup.
Cleanup.