HV-725 Updating package names in listings to match document structure