Remove underscore in module name