It sounds like it. Two complete systems.
They'll now change the standard to include a requirement that all EAPCs have to be built in such a way that they can't be modified, like they tried before with the clause about tamperproofing, or they could make it illegal to modify a proprietary ebike.