Package names refactoring.