Refactor: packages renaming