I prefer "Grand Duchy" as well, but I do hesitate a bit about the "Deutscher Bund". I haven't really thought about it, because the situation didn't come up, but would you recommend using "European Union" for place names after 1993? To my thinking, that looks like overkill.