Some naming cleanup