* Naming cleanup.