Issue#44 Fix UML to name convention