More naming cleanup.