Rename `BLOCK.CLIENT` to just `BLOCK` to match other values