2.3 only: Making consistent component names
Merge pull request #3189 from bicpi/component_names_consistency_2_3_only

2.3 only: Making consistent component names
Merge branch '2.3' into 2.4