diff --git a/doc/source/userdoc/guest-requirements.rst b/doc/source/userdoc/guest-requirements.rst
index 85b2aaef..9b0611ec 100644
--- a/doc/source/userdoc/guest-requirements.rst
+++ b/doc/source/userdoc/guest-requirements.rst
@@ -30,7 +30,7 @@ To support EDP, the following components must also be installed on the guest:
 * mysql
 * hive
 
-See :doc:`diskimagebuilder` for instructions on building images for this plugin.
+See :doc:`vanilla_imagebuilder` for instructions on building images for this plugin.
 
 HDP Plugin
 ----------
diff --git a/doc/source/userdoc/spark_plugin.rst b/doc/source/userdoc/spark_plugin.rst
index b0e60c71..d6407784 100644
--- a/doc/source/userdoc/spark_plugin.rst
+++ b/doc/source/userdoc/spark_plugin.rst
@@ -10,7 +10,10 @@ Images
 ------
 
 For cluster provisioning prepared images should be used. The Spark plugin
-has been developed and tested with the images generated by the :doc:`diskimagebuilder`.
+has been developed and tested with the images generated by sahara-image-elements:
+
+* https://github.com/openstack/sahara-image-elements
+
 Those Ubuntu images already have Cloudera CDH4 HDFS and Apache Spark installed.
 A prepared image can be found at the following location:
 
diff --git a/doc/source/userdoc/diskimagebuilder.rst b/doc/source/userdoc/vanilla_imagebuilder.rst
similarity index 100%
rename from doc/source/userdoc/diskimagebuilder.rst
rename to doc/source/userdoc/vanilla_imagebuilder.rst
diff --git a/doc/source/userdoc/vanilla_plugin.rst b/doc/source/userdoc/vanilla_plugin.rst
index eb29dd23..52a35a99 100644
--- a/doc/source/userdoc/vanilla_plugin.rst
+++ b/doc/source/userdoc/vanilla_plugin.rst
@@ -7,7 +7,7 @@ a cluster with Apache Hadoop.
 For cluster provisioning prepared images should be used. They already have
 Apache Hadoop 1.2.1 and Apache Hadoop 2.6.0 installed.
 
-You may build images by yourself using :doc:`diskimagebuilder` or you could
+You may build images by yourself using :doc:`vanilla_imagebuilder` or you could
 download prepared images from http://sahara-files.mirantis.com/images/upstream/kilo/
 
 Keep in mind that if you want to use the Swift Integration feature