naming cleanup