A little more naming cleanup