I had a brilliant idea to resolve my Yugoslavia problem, thanks to Age of Ultron (best MCU film so far).

I shall go ahead and change every mention of Yugoslavia to Sokovia now.