update UML model to reflect name changes of classes
Merge pull request #32 from CharlesGust/model2

update UML model to reflect name changes of classes