More naming corrections