Hee :) I sympathise about being bugged by these sorts of things, last term I completely tied myself into knots about how to refer to the pre-1948 Jewish population in Palestine (Israelis obviously inaccurate, and referring to 'the Jews' feels icky - despite the fact that Israeli polscis quite happily talk about 'world Jewry', yeah). Eventually I just stuck with Yishuv, despite that not being 100% accurate...