More naming simplification