Cleaning up package names (MID-1846)