Refactor module names