Refactor because of duplicate module name