Cleanup package names