They must be running both systems.
I can't see them doing all this rebranding and the app updates so people can book in advance and then decide to take it all away. Although I would prefer they did a single more expensive option, going from free fastpass, to paid Genie+ to $200 or so Universal...