I'm puzzled. Why shouldn't they be referred to as Edinburgh Waverley and Edinburgh Haymarket? There's also Edinburgh Park. Waverley and Haymarket are abbreviations used by people who already know which city we are referring to.Possibly, I've still very occasionally heard East Coast guards refer to it as Edinburgh Haymarket!