Small naming cleanup