diff --git a/Mp1.json b/Mp1.json
index ff4605f8c090ef89467c0b2911bf6a63d9897417..9288d269c19f4ae85d28c896e8fa6a660c11f85c 100644
Binary files a/Mp1.json and b/Mp1.json differ
diff --git a/Mp1.yaml b/Mp1.yaml
index 5ec6e2c06f7ab42a4e5a6d465e657f01af42a44d..352503e0bbd2d3c3a7e27ce37381be253dff877c 100644
--- a/Mp1.yaml
+++ b/Mp1.yaml
@@ -646,10 +646,10 @@ paths:
                     addresses:
                       - host: 192.0.2.0
                         port: '8080'
-                  security.mp1:
+                  security:
                     oAuth2Info:
                       grantTypes: OAUTH2_CLIENT_CREDENTIALS
-                      tokenEndpoint: /meMp1/security.mp1/TokenEndPoint
+                      tokenEndpoint: /meMp1/security/TokenEndPoint
                 serializer: JSON
         '400':
           description: Bad Request
@@ -715,10 +715,10 @@ paths:
                     addresses:
                       - host: 192.0.2.0
                         port: '8080'
-                  security.mp1:
+                  security:
                     oAuth2Info:
                       grantTypes: OAUTH2_CLIENT_CREDENTIALS
-                      tokenEndpoint: /meMp1/security.mp1/TokenEndPoint
+                      tokenEndpoint: /meMp1/security/TokenEndPoint
                 serializer: JSON
         '400':
           description: Bad Request
@@ -785,10 +785,10 @@ paths:
                     addresses:
                       - host: 192.0.2.0
                         port: '8080'
-                  security.mp1:
+                  security:
                     oAuth2Info:
                       grantTypes: OAUTH2_CLIENT_CREDENTIALS
-                      tokenEndpoint: /meMp1/security.mp1/TokenEndPoint
+                      tokenEndpoint: /meMp1/security/TokenEndPoint
                 serializer: JSON
         '400':
           description: Bad Request
@@ -854,10 +854,10 @@ paths:
                     addresses:
                       - host: 192.0.2.0
                         port: '8080'
-                  security.mp1:
+                  security:
                     oAuth2Info:
                       grantTypes: OAUTH2_CLIENT_CREDENTIALS
-                      tokenEndpoint: /meMp1/security.mp1/TokenEndPoint
+                      tokenEndpoint: /meMp1/security/TokenEndPoint
                 serializer: JSON
         '400':
           description: Bad Request
@@ -1341,7 +1341,7 @@ definitions:
     description: The token endpoint
     type: string
     format: uri
-    example: /meMp1/mp1.security/TokenEndPoint
+    example: /meMp1/security/TokenEndPoint
   SecurityInfo.OAuth2Info:
     description: Parameters related to use of OAuth 2.0
     required:
@@ -1788,7 +1788,7 @@ definitions:
       - protocol
       - version
       - endpoint
-      - security.mp1
+      - security
     properties:
       id:
         $ref: '#/definitions/TransportInfo.Id'
@@ -1804,7 +1804,7 @@ definitions:
         $ref: '#/definitions/TransportInfo.Version'
       endpoint:
         $ref: '#/definitions/EndPointInfo'
-      security.mp1:
+      security:
         $ref: '#/definitions/SecurityInfo'
       implSpecificInfo:
         $ref: '#/definitions/TransportInfo.ImplSpecificInfo'
@@ -1846,4 +1846,4 @@ definitions:
       tunnelDstAddress:
         $ref: '#/definitions/TunnelInfo.TunnelDstAddress'
       tunnelSrcAddress:
-        $ref: '#/definitions/TunnelInfo.TunnelSrcAddress'
+        $ref: '#/definitions/TunnelInfo.TunnelSrcAddress'
\ No newline at end of file
diff --git a/definitions/SecurityInfo.OAuth2Info.TokenEndpoint.yaml b/definitions/SecurityInfo.OAuth2Info.TokenEndpoint.yaml
index 666bdf3756f990b9b9564f50f3509200b26fd542..4e7ac4598a514d2214780e3d1de1c11d65c6673d 100644
--- a/definitions/SecurityInfo.OAuth2Info.TokenEndpoint.yaml
+++ b/definitions/SecurityInfo.OAuth2Info.TokenEndpoint.yaml
@@ -1,4 +1,4 @@
 description: The token endpoint
 type: string
 format: uri
-example: '/meMp1/mp1.security/TokenEndPoint'
\ No newline at end of file
+example: '/meMp1/security/TokenEndPoint'
\ No newline at end of file
diff --git a/definitions/TransportInfo.yaml b/definitions/TransportInfo.yaml
index 7ef20b73da0d45c1a6733a155a442bfb41b01ebd..a34a6c1c5a0ba861da15dce9d14a95114572a3b0 100644
--- a/definitions/TransportInfo.yaml
+++ b/definitions/TransportInfo.yaml
@@ -7,7 +7,7 @@ required:
 - protocol
 - version
 - endpoint
-- security.mp1
+- security
 properties:
   id:
     $ref: '#/definitions/TransportInfo.Id'
@@ -23,7 +23,7 @@ properties:
     $ref: '#/definitions/TransportInfo.Version'
   endpoint:
     $ref: '#/definitions/EndPointInfo'
-  security.mp1:
+  security:
     $ref: '#/definitions/SecurityInfo'
   implSpecificInfo:
     $ref: '#/definitions/TransportInfo.ImplSpecificInfo'
\ No newline at end of file
diff --git a/examples/ServiceInfo.json b/examples/ServiceInfo.json
index 4de6a68bac303a3820f16dd3f7132ef1c7fbe06a..c603db011e42a4609688fd69868f5577a6e75428 100644
--- a/examples/ServiceInfo.json
+++ b/examples/ServiceInfo.json
@@ -29,10 +29,10 @@
           }
         ]
       },
-      "security.mp1": {
+      "security": {
         "oAuth2Info": {
           "grantTypes": "OAUTH2_CLIENT_CREDENTIALS",
-          "tokenEndpoint": "/meMp1/security.mp1/TokenEndPoint"
+          "tokenEndpoint": "/meMp1/security/TokenEndPoint"
         }
       }
     },
diff --git a/examples/ServiceInfo.yaml b/examples/ServiceInfo.yaml
index 0386a4f7bd0cc0fd0a28f589e82141f2251237e4..ff9a4b194675ac64677f48060d579ad47c26971d 100644
--- a/examples/ServiceInfo.yaml
+++ b/examples/ServiceInfo.yaml
@@ -22,8 +22,8 @@ ServiceInfo:
       addresses:
        - host: '192.0.2.0'
          port: '8080'
-    security.mp1:
+    security:
       oAuth2Info:
         grantTypes: OAUTH2_CLIENT_CREDENTIALS
-        tokenEndpoint: /meMp1/security.mp1/TokenEndPoint
+        tokenEndpoint: /meMp1/security/TokenEndPoint
   serializer: JSON
diff --git a/paths/Services.GET.yaml b/paths/Services.GET.yaml
index a2453752f686abcb273a506f9c3a087b5ae379e6..0ee0a979e74a346c14e34bcb8c7ea4337a4ed9d2 100644
--- a/paths/Services.GET.yaml
+++ b/paths/Services.GET.yaml
@@ -43,10 +43,10 @@ responses:
               addresses:
               - host: '192.0.2.0'
                 port: '8080'
-            security.mp1:
+            security:
               oAuth2Info:
                 grantTypes: OAUTH2_CLIENT_CREDENTIALS
-                tokenEndpoint: /meMp1/security.mp1/TokenEndPoint
+                tokenEndpoint: /meMp1/security/TokenEndPoint
           serializer: JSON
   400:
     description: Bad Request
diff --git a/paths/Services.POST.yaml b/paths/Services.POST.yaml
index 784eb6d179675d56875ee32b3d3aff905fe32164..0c8ac85f9380416d1007a648eeeeb0b55fdc9b5f 100644
--- a/paths/Services.POST.yaml
+++ b/paths/Services.POST.yaml
@@ -39,10 +39,10 @@ responses:
               addresses:
               - host: '192.0.2.0'
                 port: '8080'
-            security.mp1:
+            security:
               oAuth2Info:
                 grantTypes: OAUTH2_CLIENT_CREDENTIALS
-                tokenEndpoint: /meMp1/security.mp1/TokenEndPoint
+                tokenEndpoint: /meMp1/security/TokenEndPoint
           serializer: JSON
   400:
     description: Bad Request
diff --git a/paths/ServicesServiceId.GET.yaml b/paths/ServicesServiceId.GET.yaml
index fea37a7c7d7821f2472d22dd6913c048fbb2a411..ea63177a2d5adb86323e2953278f65d1a86f49f0 100644
--- a/paths/ServicesServiceId.GET.yaml
+++ b/paths/ServicesServiceId.GET.yaml
@@ -37,10 +37,10 @@ responses:
               addresses:
               - host: '192.0.2.0'
                 port: '8080'
-            security.mp1:
+            security:
               oAuth2Info:
                 grantTypes: OAUTH2_CLIENT_CREDENTIALS
-                tokenEndpoint: /meMp1/security.mp1/TokenEndPoint
+                tokenEndpoint: /meMp1/security/TokenEndPoint
           serializer: JSON
   400:
     description: Bad Request
diff --git a/paths/ServicesServiceId.PUT.yaml b/paths/ServicesServiceId.PUT.yaml
index c1ec0a899b63fb79ee5ecfb5ee20ab53be5ed7fb..d18feddccdac24ac70295b26395984d2465d16d0 100644
--- a/paths/ServicesServiceId.PUT.yaml
+++ b/paths/ServicesServiceId.PUT.yaml
@@ -39,10 +39,10 @@ responses:
               addresses:
               - host: '192.0.2.0'
                 port: '8080'
-            security.mp1:
+            security:
               oAuth2Info:
                 grantTypes: OAUTH2_CLIENT_CREDENTIALS
-                tokenEndpoint: /meMp1/security.mp1/TokenEndPoint
+                tokenEndpoint: /meMp1/security/TokenEndPoint
           serializer: JSON
   400:
     description: Bad Request