Name Refactoring, update Class diagram