Merge "Update package name change."