Nice word play game! So the answer is yes in that you do not distinguish between the promises to Israel and the church. Nuff said.
So who are the 12,000 from each tribe during the tribulation?
It isn't a word-play game.