Some renaming in direction of abstraction