path/module name fixes