I am using Rick Fisher's "Find and Replace" add-in to fix my non-conventional names. It worked very well when renaming tables, etc. Now I'm using the included "Control Name Change Builder".
My problem is it not only changes the control name and references, it also changes the control source...