You are right, except:

- "Peer-to-peer" (Ring, Bleep/BittorentChat) and

- "Federated" (Email, Matrix, XMPP/Jabber)

...would be a better way to convey that distinction.