PDI-10991 - Cleaning up package names