PRD-3994: Automatic names fixed.