Naming cleanup.