Module name change bug fix
Fix in main test
Name changes