Update to new Subcomponent naming convention