Naming cleanup