refactor module name for entities