minor naming cleanup