Clean up package names