Feature #907 : refactoring code and paths to manage a component instance id without '-' character.