Rotate the keys to the new simpler scheme