Use new binary names