Shepherds Pie or Cottage Pie?

In the list of favourite food (UK) Cottage Pie came in at 76% and Shepherds Pie came in at 75%. But there is confusion about what is in them! The clue is in the name, tradionally shepherds looked after sheep - the Shepherds Pie is made with minced lamb. The Cottage Pie is with minced beef.

Should you add vegetables? There is no right or wrong it is down to your taste - of course there is the benefit that if you add vegetables the whole meal is cooked in one dish and there's less washing up!

How do you make yours?