Fixed UML Names