cleaning up package names