Do some renaming in HashPSQ