More naming cleanup