Refactor module name