Refactorted the package name changes