Refactored NameFix to generalize compRenamings (which allows re-usage for name graph error based renaming);
Made internal NameFix methods private