Refactoring of the names and modules