Package name refactoring.