Remap non-locals