Gottt it, I should have read your map better, sorry for making you re-explain yourself. Those names all sound right to me, then.
I'd still vote for "Mattapan Loop" as the trolley terminus since it sounds more downtown-ey than "Mattapan Yard", but that's just my own nitpicky aesthetics.