more naming cleanup