renaming and cleaning entry points