More naming updates.