Refactoring: package name normalized