Minor naming cleanup