diff --git a/README.md b/README.md
index 990c30b..0420d3b 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ The plugin configures NetApp backend for Cinder using multibackend feature.
 
 
 The plugin support following storage families:
- - Clustered Data ONTAP
+ - Clustered Data ONTAP/ONTAP 9
  - Data ONTAP 7-Mode
  - E-Series/EF-Series
 
diff --git a/doc/source/description.rst b/doc/source/description.rst
index c431de9..148d6b0 100644
--- a/doc/source/description.rst
+++ b/doc/source/description.rst
@@ -2,11 +2,11 @@
 NetApp plugin
 =============
 
-The plugin provides support of ``Clustered Data ONTAP``, ``Data ONTAP 7-Mode`` and ``E-series`` storage clusters to Cinder.
+The plugin provides support of ``Clustered Data ONTAP/ONTAP 9``, ``Data ONTAP 7-Mode`` and ``E-series`` storage clusters to Cinder.
 The plugin uses NetApp unified driver, the latter is a
 block storage driver that supports multiple storage families and protocols.
 A storage family corresponds to storage systems built on different NetApp technologies
-such as Clustered Data ONTAP, Data ONTAP operating in 7-Mode,
+such as Clustered Data ONTAP/ONTAP 9, Data ONTAP operating in 7-Mode,
 and E-Series.
 The storage protocol refers to the protocol used to initiate data
 storage and access operations on those storage systems like iSCSI and NFS.
@@ -19,7 +19,7 @@ storage families and protocols.
 
 Features
 --------
-* Clustered Data ONTAP as a backend for Cinder with NFS or iSCSI data-transfer protocols
+* Clustered Data ONTAP/ONTAP 9 as a backend for Cinder with NFS or iSCSI data-transfer protocols
 * Data ONTAP 7-Mode as a backend for Cinder with NFS or iSCSI data-transfer protocols
 * E-Series or EF-Series as a backend for Cinder with iSCSI data-transfer protocol
 * Supports Cinder multibackend
@@ -32,7 +32,7 @@ Requirements
 Requirement             Version/Comment
 ======================= =================================
 Fuel                    9.0
-NetApp Storage System   Clustered ONTAP Data
+NetApp Storage System   Clustered Data ONTAP/ONTAP 9
 
                         Data ONTAP 7-Mode
 
@@ -42,7 +42,7 @@ NetApp Storage System   Clustered ONTAP Data
 
 Prerequisites
 -------------
-* If you plan to use the plugin with **Data ONTAP 7-Mode** or **Clustered ONTAP Data**, please make sure
+* If you plan to use the plugin with **Data ONTAP 7-Mode** or **Clustered Data ONTAP/ONTAP 9**, please make sure
   that it is configured, up and running. For instructions, see `the official NetApp ONTAP documentation`_.
 
 
diff --git a/doc/source/guide.rst b/doc/source/guide.rst
index 8b04ddd..c75d95b 100644
--- a/doc/source/guide.rst
+++ b/doc/source/guide.rst
@@ -20,7 +20,7 @@ Once the Fuel Cinder NetApp plugin has been installed, you can create OpenStack
 
 #. Choose storage family and storage protocol. Several options are available. For details consult `Cinder NetApp driver configuration`_.
 
-   - If you plan to use Clustered Data mode through NFS, click **Clustered Data ONTAP**
+   - If you plan to use Clustered Data mode through NFS, click **Clustered Data ONTAP/ONTAP 9**
      radio button and select *NFS* option in **NetApp Storage Protocol**.
      You should also choose NetApp transport type (http or https).
 
@@ -36,7 +36,7 @@ Once the Fuel Cinder NetApp plugin has been installed, you can create OpenStack
      .. image:: images/cmode_nfs.png
         :width: 100%
 
-   - If you plan to use Clustered Data mode through iSCSI, click **Clustered Data ONTAP**
+   - If you plan to use Clustered Data mode through iSCSI, click **Clustered Data ONTAP/ONTAP 9**
      radiobutton and select *iSCSI* option in **NetApp Storage Protocol**.
      You should also choose NetApp transport type (http or https).
 
diff --git a/doc/source/images/7mode_iscsi.png b/doc/source/images/7mode_iscsi.png
index 1535960..df77049 100644
Binary files a/doc/source/images/7mode_iscsi.png and b/doc/source/images/7mode_iscsi.png differ
diff --git a/doc/source/images/7mode_nfs.png b/doc/source/images/7mode_nfs.png
index 39eea7c..b404980 100644
Binary files a/doc/source/images/7mode_nfs.png and b/doc/source/images/7mode_nfs.png differ
diff --git a/doc/source/images/cmode_iscsi.png b/doc/source/images/cmode_iscsi.png
index f07d574..95eda01 100644
Binary files a/doc/source/images/cmode_iscsi.png and b/doc/source/images/cmode_iscsi.png differ
diff --git a/doc/source/images/cmode_nfs.png b/doc/source/images/cmode_nfs.png
index 19547b3..969e097 100644
Binary files a/doc/source/images/cmode_nfs.png and b/doc/source/images/cmode_nfs.png differ
diff --git a/doc/source/images/eseries.png b/doc/source/images/eseries.png
index 5b008fb..43d67ea 100644
Binary files a/doc/source/images/eseries.png and b/doc/source/images/eseries.png differ