Merge "Update package type name"