UML Diagram & some renamings