More naming updates