Some renaming for consistency. UML diagram in docu