fixed file/module names