More naming improvements