Finished first implementation attempt of NameFixModular (still without conflict handling);
Fixed & updated tests for modular namefix