Issue#90 Fix UML name to fit convention