Updated UML class model

Updated UML class model to match changes.
Fixed minor item names.