2.3 only: Making consistent component names

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.3+
| Fixed tickets | -

This PR corresponds to #3183, but for 2.3+ components. It is independant from the 2.2 PR.