Fixed issues on rename module refactoring.