Update names and be robust to missing flags.