* More naming cleanup