Update namecleaning to try and pick up better hashes in collections and better names when importing/making releases.