Which distinction between marfu‘ and mawquf is correct?

Ziyadat al-Thiqah, Mahfuz and Shadh, Ma‘ruf and Munkar

• Marfu` stops at a Companion; mawquf at the Prophet
• Both are necessarily mutawatir
• They always mean the same thing
• Marfu` is attributed to the Prophet; mawquf stops at a Companion