diff --git a/src/common/core/session/plugin.json b/src/common/core/sessions/plugin.json
similarity index 88%
rename from src/common/core/session/plugin.json
rename to src/common/core/sessions/plugin.json
index 02ff90935..d46ab18e6 100644
--- a/src/common/core/session/plugin.json
+++ b/src/common/core/sessions/plugin.json
@@ -1,11 +1,11 @@
 {
-  "id": "session",
+  "id": "sessions",
   "order": 999,
-  "name": "Session",
+  "name": "Sessions",
   "description": "Management of session used by other plugins.",
   "version": "0.1",
   "settings": {
-    "SESSION_SECRET": {
+    "SESSIONS_SECRET": {
       "context": "global",
       "default": "random",
       "help": "Secret used to encrypt sessions variables for storing data related to challenges.",
@@ -14,7 +14,7 @@
       "regex": "^\\w+$",
       "type": "password"
     },
-    "SESSION_NAME": {
+    "SESSIONS_NAME": {
       "context": "global",
       "default": "random",
       "help": "Name of the cookie given to clients.",
@@ -23,7 +23,7 @@
       "regex": "^\\w+$",
       "type": "text"
     },
-    "SESSION_IDLING_TIMEOUT": {
+    "SESSIONS_IDLING_TIMEOUT": {
       "context": "global",
       "default": "1800",
       "help": "Maximum time (in seconds) of inactivity before the session is invalidated.",
@@ -32,7 +32,7 @@
       "regex": "^\\d+$",
       "type": "text"
     },
-    "SESSION_ROLLING_TIMEOUT": {
+    "SESSIONS_ROLLING_TIMEOUT": {
       "context": "global",
       "default": "3600",
       "help": "Maximum time (in seconds) before a session must be renewed.",
@@ -41,7 +41,7 @@
       "regex": "^\\d+$",
       "type": "text"
     },
-    "SESSION_ABSOLUTE_TIMEOUT": {
+    "SESSIONS_ABSOLUTE_TIMEOUT": {
       "context": "global",
       "default": "86400",
       "help": "Maximum time (in seconds) before a session is destroyed.",
diff --git a/src/common/core/session/session.lua b/src/common/core/sessions/sessions.lua
similarity index 78%
rename from src/common/core/session/session.lua
rename to src/common/core/sessions/sessions.lua
index 165de0386..b4551f0ab 100644
--- a/src/common/core/session/session.lua
+++ b/src/common/core/sessions/sessions.lua
@@ -12,11 +12,11 @@ end
 function _M:init()
     -- Get vars
     local vars = {
-        ["SESSION_SECRET"] = "",
-        ["SESSION_NAME"] = "",
-        ["SESSION_IDLING_TIMEOUT"] = "",
-        ["SESSION_ROLLING_TIMEOUT"] = "",
-        ["SESSION_ABSOLUTE_TIMEOUT"] = "",
+        ["SESSIONS_SECRET"] = "",
+        ["SESSIONS_NAME"] = "",
+        ["SESSIONS_IDLING_TIMEOUT"] = "",
+        ["SESSIONS_ROLLING_TIMEOUT"] = "",
+        ["SESSIONS_ABSOLUTE_TIMEOUT"] = "",
         ["USE_REDIS"] = "",
         ["REDIS_HOST"] = "",
         ["REDIS_PORT"] = "",
@@ -33,16 +33,16 @@ function _M:init()
     end
     -- Init configuration
     local config = {
-        secret = vars["SESSION_SECRET"],
-        cookie_name = vars["SESSION_NAME"],
-        idling_timeout = tonumber(vars["SESSION_IDLING_TIMEOUT"]),
-        rolling_timeout = tonumber(vars["SESSION_ROLLING_TIMEOUT"]),
-        absolute_timeout = tonumber(vars["SESSION_ABSOLUTE_TIMEOUT"])
+        secret = vars["SESSIONS_SECRET"],
+        cookie_name = vars["SESSIONS_NAME"],
+        idling_timeout = tonumber(vars["SESSIONS_IDLING_TIMEOUT"]),
+        rolling_timeout = tonumber(vars["SESSIONS_ROLLING_TIMEOUT"]),
+        absolute_timeout = tonumber(vars["SESSIONS_ABSOLUTE_TIMEOUT"])
     }
-    if vars["SESSION_SECRET"] == "random" then
+    if vars["SESSIONS_SECRET"] == "random" then
         config.secret = utils.rand(16)
     end
-    if vars["SESSION_NAME"] == "random" then
+    if vars["SESSIONS_NAME"] == "random" then
         config.cookie_name = utils.rand(16)
     end
     if vars["USE_REDIS"] == "no" then