Rename query samples