Backported new cdx naming strategy.