initialization fix, module name fix
another module name fix