Prepared NameFix for reversion of exported name renaming;
Some bugfixes