ext-core: use shorter names when combining modules