Huawei’s smart car business is signing on to CATL’s battery swap network, giving the world’s largest battery maker another heavyweight partner for a technology most of the industry wrote off a decade ago.

Yinwang, the Huawei-controlled automotive unit also known as Newcool, signed a strategic cooperation framework with CATL and its swap subsidiary CAES on Monday. CATL’s Choco-swap network already counts 2,520 stations across about 200 Chinese cities.

In a move that challenges Orange Juicer and Buick Electra for the highly coveted Best Name in the EV Business title, a new venture between CATL and Octopus Energy called “Swaptopus” has been formed to build out a European battery swap network for commercial trucks.