diff --git a/app/modules/ws2p/index.ts b/app/modules/ws2p/index.ts
index fa70b8ef8f06356945712b5427ca9ffe2a94dd62..6fe802697c15ade717bfee23f38ccc4682ae9a8f 100644
--- a/app/modules/ws2p/index.ts
+++ b/app/modules/ws2p/index.ts
@@ -254,7 +254,7 @@ export class WS2PAPI extends stream.Transform {
 
   startService = async () => {
     // Override ws2p public configuration from environment variables
-    if (process.env.DUNITER_WS2_PUBLIC === "true") {
+    if (process.env.DUNITER_WS2P_PUBLIC === "true") {
       if (!this.conf.ws2p) {
         this.conf.ws2p = {
           privateAccess: true,
@@ -277,30 +277,30 @@ export class WS2PAPI extends stream.Transform {
         this.conf.ws2p.maxPrivate = 4;
       }
 
-      if (process.env.DUNITER_WS2_HOST) {
-        this.conf.ws2p.host = process.env.DUNITER_WS2_HOST;
+      if (process.env.DUNITER_WS2P_HOST) {
+        this.conf.ws2p.host = process.env.DUNITER_WS2P_HOST;
       }
-      if (process.env.DUNITER_WS2_PORT) {
-        this.conf.ws2p.port = parseInt(process.env.DUNITER_WS2_PORT);
+      if (process.env.DUNITER_WS2P_PORT) {
+        this.conf.ws2p.port = parseInt(process.env.DUNITER_WS2P_PORT);
       }
-      if (process.env.DUNITER_WS2_REMOTE_HOST) {
-        this.conf.ws2p.remotehost = process.env.DUNITER_WS2_REMOTE_HOST;
+      if (process.env.DUNITER_WS2P_REMOTE_HOST) {
+        this.conf.ws2p.remotehost = process.env.DUNITER_WS2P_REMOTE_HOST;
       }
-      if (process.env.DUNITER_WS2_REMOTE_PORT) {
+      if (process.env.DUNITER_WS2P_REMOTE_PORT) {
         this.conf.ws2p.remoteport = parseInt(
-          process.env.DUNITER_WS2_REMOTE_PORT
+          process.env.DUNITER_WS2P_REMOTE_PORT
         );
       }
-      if (process.env.DUNITER_WS2_REMOTE_PATH) {
-        this.conf.ws2p.remotepath = process.env.DUNITER_WS2_REMOTE_PATH;
+      if (process.env.DUNITER_WS2P_REMOTE_PATH) {
+        this.conf.ws2p.remotepath = process.env.DUNITER_WS2P_REMOTE_PATH;
       }
-      if (process.env.DUNITER_WS2_PREFERED_KEYS) {
-        this.conf.ws2p.preferedNodes = process.env.DUNITER_WS2_PREFERED_KEYS.split(
+      if (process.env.DUNITER_WS2P_PREFERED_KEYS) {
+        this.conf.ws2p.preferedNodes = process.env.DUNITER_WS2P_PREFERED_KEYS.split(
           ","
         );
       }
-      if (process.env.DUNITER_WS2_PRIVILEGED_KEYS) {
-        this.conf.ws2p.privilegedNodes = process.env.DUNITER_WS2_PRIVILEGED_KEYS.split(
+      if (process.env.DUNITER_WS2P_PRIVILEGED_KEYS) {
+        this.conf.ws2p.privilegedNodes = process.env.DUNITER_WS2P_PRIVILEGED_KEYS.split(
           ","
         );
       }
diff --git a/doc/use/conf_env_var.md b/doc/use/conf_env_var.md
index 125be7f4abf92faff757413498fcb28419a5ef73..8cfe5f1ec21b8cf7bbc91f3f7cf715cee141f076 100644
--- a/doc/use/conf_env_var.md
+++ b/doc/use/conf_env_var.md
@@ -38,7 +38,7 @@ This mode is disabled by default, in order for it to work you must configure a W
 First enable the public WS2P mode:
 
 ```bash
-DUNITER_WS2_PUBLIC="true"
+DUNITER_WS2P_PUBLIC="true"
 ```
 
 #### Configure a WS2P endpoint
@@ -48,21 +48,21 @@ For WS2P Public to work you must configure a WS2P endpoint that other duniter no
 If you use a reverse proxy, you must define "remote" host and port:
 
 ```bash
-DUNITER_WS2_REMOTE_HOST="mydomaine.tld"
-DUNITER_WS2_REMOTE_PORT="443"
+DUNITER_WS2P_REMOTE_HOST="mydomaine.tld"
+DUNITER_WS2P_REMOTE_PORT="443"
 ```
 
 You can define a remote path:
 
 ```bash
-DUNITER_WS2_REMOTE_PATH="/ws2p"
+DUNITER_WS2P_REMOTE_PATH="/ws2p"
 ```
 
 If you not use a reverse proxy, you can expose duniter directly
 
 ```bash
-DUNITER_WS2_HOST="<your public IP>"
-DUNITER_WS2_PORT="your opened port"
+DUNITER_WS2P_HOST="<your public IP>"
+DUNITER_WS2P_PORT="your opened port"
 ```
 
 #### WS2P preferred and privileged nodes
diff --git a/doc/use/ws2p_preferred_privileged.md b/doc/use/ws2p_preferred_privileged.md
index 3a542c4b8a238ae928d6a42208c51223903fdbea..758f912d95725d06b44adbcfc0660acd9d0886cf 100644
--- a/doc/use/ws2p_preferred_privileged.md
+++ b/doc/use/ws2p_preferred_privileged.md
@@ -28,10 +28,10 @@ To consult the list of your preferred keys:
 duniter ws2p list-prefered
 ```
 
-Or use environment variable `DUNITER_WS2_PREFERED_KEYS`:
+Or use environment variable `DUNITER_WS2P_PREFERED_KEYS`:
 
 ```bash
-DUNITER_WS2_PREFERED_KEYS=PUBKEY1,PUBKEY2,PUBKEY3
+DUNITER_WS2P_PREFERED_KEYS=PUBKEY1,PUBKEY2,PUBKEY3
 ```
 
 ## Privileged nodes
@@ -56,8 +56,8 @@ To consult the list of your privileged keys:
 duniter ws2p list-privileged
 ```
 
-Or use environment variable `DUNITER_WS2_PRIVILEGED_KEYS`:
+Or use environment variable `DUNITER_WS2P_PRIVILEGED_KEYS`:
 
 ```bash
-DUNITER_WS2_PRIVILEGED_KEYS=PUBKEY1,PUBKEY2,PUBKEY3
+DUNITER_WS2P_PRIVILEGED_KEYS=PUBKEY1,PUBKEY2,PUBKEY3
 ```