Update diagrams and text for consistency

UserAccount -> User