diff --git a/technical/Name-Server-Protocol.md b/technical/Name-Server-Protocol.md
index 3e8235f2257d75534877b73a25a1006224f07f93..ec93ba96b7aaeff06c72ba6e50cd8a54aa9483b5 100644
--- a/technical/Name-Server-Protocol.md
+++ b/technical/Name-Server-Protocol.md
@@ -1,10 +1,10 @@
-The protocol used by Ring to query and register a name is based on an
+The protocol used by Jami to query and register a name is based on an
 HTTP
 [REST](https://en.wikipedia.org/wiki/Representational_state_transfer)
 API answering requests with JSON documents and regular HTTP status
 codes.
 
-The public nameserver is hosted at `ns.ring.cx` and uses a blockchain as
+The public nameserver is hosted at `ns.jami.net` and uses a blockchain as
 its backend. Another implementation could use any other database or
 directory service making the nameserver protocol reusable.
 
@@ -74,7 +74,7 @@ username is returned if one is registered on the name server.
 
 ### Request
 
-A request for the RingID `ring:29347542eb07159f316577e1ae16243d152f6b7b`
+A request for the ID `ring:29347542eb07159f316577e1ae16243d152f6b7b`
 is a `GET` request with
 `/addr/`*`29347542eb07159f316577e1ae16243d152f6b7b`* as the URI.