checkpoint: more namespace work