- Refactored names.
- Fixed a warning.
- Updated Diagram.