Remove hashes in names when possibe

Whenever there are no collisions, we should remove the hashes from names / locations.

If possible we should do this before moving to LHCb.