What work processes does Mathworks suggest for signal name refactoring in Simulink?

The m-code editor has made strides in making variable name refactoring easier by highlighting all the references to a selected identifier and making scoped variables visible by highlighting them. Are there tools coming to the Simulink realm for signal name refactoring?

When working in a team on a project changing the name of a signal can be a bit of an overhaul to ensure all subsystems are updated at once. What compounds this is the difficulty of merging models when dealing with file version control. Has anyone discovered improvements to merging feasibility now that the models are xml format?