Components no longer end with Component suffix. In every context the component classes are used, it is clear that they are components.
Merge