X/Y/Z grid was still using the old hash, prone to collisions. This changes it to use the name instead.

Should fix #10521.