more naming simplifications