- renamed components and
- added XML comments