Could you rename all the `*_byte_proximity` variables too?