Thanks for the feedback. We have gone to re labeling the correct surface at this time, always a time issue at hand.
You mention being able to change/modify the associated xml files, have you had success with that? A co-worker says he was able to modify the file but the results were broken links or continued links to the wrong drawing+surface, therefore unsuccessful.