Updated UML to fix duplicate variable names