Avengers 3: Civil War?

So I've been worried about the Avengers franchise. I liked "Age of Ultron," but Joss Whedon's departure from the franchise concerns me. And with the addition of every character in the Marvel Cinematic Universe to the cast of Captain America: Civil War, I was worried the film would be come a confusing mess. (Oh yeah, they are adding Spiderman, too.)

The first trailer has dropped for Captain American: Civil War and it's impressive:

The trailer looks awesome, but it does look like another Avengers movie. I was concerned about adding Tony Stark to a Captain America film, but I seems to make sense. You can't live in the universe and deal with big concepts and not include all the relevant characters. The emphasis on Bucky is surprising to me, but he is one or two people that Captain America would do anything to protect.* And it was good to see Black Panther, too.

I'm looking forward to the seeing Captain America: Civil War, even if it really is Avengers 3: Civil War.

* Bucky and Peggy Carter. Can't wait for season 2 of Agent Carter by the way...