More naming issue fixes