Refactoring of names and packages