Fix names in singleshot mode.