naming simplification