You are right confused it with the Winter Soldier.
Yes, I have seen some theories of how they are going to do this and sound very good from Rogue appearing with Cap Marvel to Xavier showing with Reed and Dr Strange as a iluminati, hope some of them are trueAgreed. X-Men need time and development all their own.