Yonash,
I guess a way to improve situational awareness of all concerned would be to include the runway in any clearance involving same.eg: "XXX line up RWY 29 and wait"
I believe this is an ICAO phraseology; the runway should be included where there is any possibility of confusion.
Some airlines make this SOP, to always read back the runway for TO or landing clearance.
Noticeable in my patch of dirt, coz there is only one runway.