PDI-10368: Package renaming