diff --git a/doc/common/figures/SCH_5002_V00_NUAC-Keystone.png b/doc/common/figures/SCH_5002_V00_NUAC-Keystone.png
index 3bd22ae022..29678ac185 100644
Binary files a/doc/common/figures/SCH_5002_V00_NUAC-Keystone.png and b/doc/common/figures/SCH_5002_V00_NUAC-Keystone.png differ
diff --git a/doc/common/figures/SCH_5002_V00_NUAC-Keystone.svg b/doc/common/figures/SCH_5002_V00_NUAC-Keystone.svg
index 7fe018a6ff..a73d3fcbcc 100644
--- a/doc/common/figures/SCH_5002_V00_NUAC-Keystone.svg
+++ b/doc/common/figures/SCH_5002_V00_NUAC-Keystone.svg
@@ -849,7 +849,7 @@
        v:groupContext="shape"
        transform="translate(459.567,-503.15)"><title
          id="title243">Sheet.17</title><desc
-         id="desc245">3- Keystone provides Alice her list of Services</desc><v:textBlock
+         id="desc245">3- Keystone provides Alice with a list of services</desc><v:textBlock
          v:margins="rect(4,0,4,0)"
          v:tabSpace="42.5197" /><v:textRect
          cx="113.031"
@@ -868,7 +868,7 @@
          v:langID="1036"
          id="text249"><tspan
            style="font-size:11.20001637000000017px;font-weight:bold;-inkscape-font-specification:Calibri Bold"
-           id="tspan3880">3-Keystone provides Alice her list of Services</tspan></text>
+           id="tspan3880">3- Keystone provides Alice with a list of services</tspan></text>
 </g><g
        id="shape79-115"
        v:mID="79"
@@ -910,7 +910,7 @@
          v:langID="1036"
          id="text274"><tspan
            style="font-size:11.20001637000000017px;font-weight:bold;-inkscape-font-specification:Calibri Bold"
-           id="tspan3870">4-The service verifies Alice’s token</tspan></text>
+           id="tspan3870">4- The service verifies Alice’s token</tspan></text>
 </g><g
        id="shape80-131"
        v:mID="80"
@@ -965,7 +965,7 @@
        v:groupContext="shape"
        transform="translate(121.89,-274.961)"><title
          id="title306">Sheet.51</title><desc
-         id="desc308">5- Keystone provides extra infos along the token</desc><v:textBlock
+         id="desc308">5- Keystone provides extra info along with the token</desc><v:textBlock
          v:margins="rect(4,4,4,4)"
          v:tabSpace="42.5197" /><v:textRect
          cx="126.85"
@@ -984,7 +984,7 @@
          v:langID="1036"
          id="text312"><tspan
            style="font-size:11.20001637000000017px;font-weight:bold;-inkscape-font-specification:Calibri Bold"
-           id="tspan3868">5-Keystone provides extra infos along the token</tspan></text>
+           id="tspan3868">5- Keystone provides extra info along with the token</tspan></text>
 </g><g
        id="shape16-145"
        v:mID="16"
@@ -1252,7 +1252,7 @@
        v:groupContext="shape"
        transform="translate(141.024,-503.15)"><title
          id="title427">Sheet.2</title><desc
-         id="desc429">1- Alice wants to launch a server</desc><v:textBlock
+         id="desc429">1- Alice wants to launch an instance</desc><v:textBlock
          v:margins="rect(4,4,4,4)"
          v:tabSpace="42.5197" /><v:textRect
          cx="99.5669"
@@ -1271,7 +1271,7 @@
          v:langID="1036"
          id="text433"><tspan
            style="font-size:11.20001637000000017px;font-weight:bold;-inkscape-font-specification:Calibri Bold"
-           id="tspan3878">1-Alice wants to launch a server</tspan></text>
+           id="tspan3878">1- Alice wants to launch an instance</tspan></text>
 </g><g
        id="shape106-203"
        v:mID="106"
@@ -1448,14 +1448,14 @@
          v:langID="1036"
          id="text513"><tspan
            style="font-size:11.20001637000000017px;font-weight:bold;-inkscape-font-specification:Calibri Bold"
-           id="tspan3894">6-The service executes the request</tspan></text>
+           id="tspan3894">6- The service executes the request</tspan></text>
 </g><g
        id="shape29-239"
        v:mID="29"
        v:groupContext="shape"
        transform="translate(453.543,-109.134)"><title
          id="title522">Sheet.29</title><desc
-         id="desc524">7- The server reports the status back to Alice</desc><v:textBlock
+         id="desc524">7- The service reports the status back to Alice</desc><v:textBlock
          v:margins="rect(4,4,4,4)"
          v:tabSpace="42.5197" /><v:textRect
          cx="116.929"
@@ -1474,7 +1474,7 @@
          v:langID="1036"
          id="text528"><tspan
            style="font-size:11.20001637000000017px;font-weight:bold;-inkscape-font-specification:Calibri Bold"
-           id="tspan3892">7-The server reports the status back to Alice</tspan></text>
+           id="tspan3892">7- The service reports the status back to Alice</tspan></text>
 </g><g
        id="shape30-245"
        v:mID="30"
@@ -1489,7 +1489,7 @@
        v:groupContext="shape"
        transform="translate(549.827,-32.3465)"><title
          id="title542">Sheet.44</title><desc
-         id="desc544">The server is reacheable here</desc><v:textBlock
+         id="desc544">The instance is reachable here</desc><v:textBlock
          v:margins="rect(4,4,4,4)"
          v:tabSpace="42.5197" /><v:textRect
          cx="54.6142"
@@ -1508,7 +1508,7 @@
          v:langID="1036"
          id="text548"><tspan
            style="font-size:8.00001169px"
-           id="tspan3900">The server is reacheable here</tspan></text>
+           id="tspan3900">The instance is reachable here</tspan></text>
 </g><g
        id="shape112-253"
        v:mID="112"
@@ -1528,7 +1528,7 @@
          v:groupContext="shape"
          transform="translate(-6.39488E-014,-0.59969)"><title
            id="title559">Sheet.55</title><desc
-           id="desc561">Alice determines the correct endpoint to launch a server</desc><v:textBlock
+           id="desc561">Alice determines the correct endpoint to launch an instance</desc><v:textBlock
            v:margins="rect(4,4,4,4)"
            v:tabSpace="42.5197" /><v:textRect
            cx="96.0625"
@@ -1547,7 +1547,7 @@
            v:langID="1036"
            id="text565"><tspan
              style="font-size:8.00001169px"
-             id="tspan3888">Alice determines the correct endpoint to launch a server</tspan></text>
+             id="tspan3888">Alice determines the correct endpoint to launch an instance</tspan></text>
 </g><g
          id="shape15-262"
          v:mID="15"
@@ -1787,7 +1787,7 @@
          v:mID="34"
          v:groupContext="shape"><title
            id="title667">Sheet.34</title><desc
-           id="desc669">The server has been created</desc><v:textBlock
+           id="desc669">The instance has been created</desc><v:textBlock
            v:margins="rect(4,4,4,4)"
            v:tabSpace="42.5197" /><v:textRect
            cx="51.0709"
@@ -1806,7 +1806,7 @@
            v:langID="1036"
            id="text673"><tspan
              style="font-size:8.00001169px"
-             id="tspan3898">The server has been created</tspan></text>
+             id="tspan3898">The instance has been created</tspan></text>
 </g><g
          id="group39-304"
          transform="translate(93.6378,-4.33071)"
@@ -1866,7 +1866,7 @@
          v:langID="1036"
          id="text700"><tspan
            style="font-size:8.00001169px"
-           id="tspan3854">That token belong to the user Alice</tspan></text>
+           id="tspan3854">That token belongs to the user Alice</tspan></text>
 </g><g
        id="shape100-317"
        v:mID="100"
@@ -1963,7 +1963,7 @@
          v:mID="111"
          v:groupContext="shape"><title
            id="title736">Sheet.111</title><desc
-           id="desc738">Keystone sends the Services the tenant has</desc><v:textBlock
+           id="desc738">Keystone provides a list of services for the tenant</desc><v:textBlock
            v:margins="rect(4,4,4,4)"
            v:tabSpace="42.5197" /><v:textRect
            cx="48.7876"
@@ -1983,7 +1983,7 @@
            id="text742"
            style="fill:#3f3f3f;font-family:Calibri"><tspan
              style="font-size:8.00001144px"
-             id="tspan3884">Keystone sends the</tspan></text>
+             id="tspan3884">Keystone sends a list of</tspan></text>
 <text
            style="font-size:12px;fill:#3f3f3f;font-family:Calibri"
            x="4.0559244"
@@ -1992,7 +1992,7 @@
            v:langID="1036"
            id="text742-3"><tspan
              style="font-size:8.00001144px"
-             id="tspan3884-9">Services the tenant has</tspan></text>
+             id="tspan3884-9">available services</tspan></text>
 </g><g
          id="group128-340"
          transform="translate(93.9233,-8.25382)"
@@ -2109,7 +2109,7 @@
        v:groupContext="shape"
        transform="translate(177.165,-49.9426)"><title
          id="title795">Sheet.93</title><desc
-         id="desc797">The service creates a new server</desc><v:textBlock
+         id="desc797">The service creates a new instance</desc><v:textBlock
          v:margins="rect(4,4,4,4)"
          v:tabSpace="42.5197" /><v:textRect
          cx="57.7559"
@@ -2128,7 +2128,7 @@
          v:langID="1036"
          id="text801"><tspan
            style="font-size:8.00001169px"
-           id="tspan3896">The service creates a new server</tspan></text>
+           id="tspan3896">The service creates a new instance</tspan></text>
 </g><g
        id="shape129-364"
        v:mID="129"
@@ -2214,7 +2214,7 @@
        v:groupContext="shape"
        transform="translate(603.78,-431.76)"><title
          id="title841">Sheet.136</title><desc
-         id="desc843">Credentials are sent with desired tenant</desc><v:textBlock
+         id="desc843">Credentials are sent with the desired tenant</desc><v:textBlock
          v:margins="rect(4,4,4,4)"
          v:tabSpace="42.5197" /><v:textRect
          cx="36.8504"