diff --git a/deployment_scripts/puppet/manifests/gcs_conf.pp b/deployment_scripts/puppet/manifests/config.pp
similarity index 93%
rename from deployment_scripts/puppet/manifests/gcs_conf.pp
rename to deployment_scripts/puppet/manifests/config.pp
index b350f2e..4e2092a 100644
--- a/deployment_scripts/puppet/manifests/gcs_conf.pp
+++ b/deployment_scripts/puppet/manifests/config.pp
@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-notice('MODULAR:gcs_conf.pp')
+notice('MODULAR: fuel-plugin-cinder-gcs/config.pp')
 include gcs
 class { 'gcs::config': }
 class { 'gcs::package_utils': }
diff --git a/deployment_scripts/puppet/manifests/gcs_horizon.pp b/deployment_scripts/puppet/manifests/horizon.pp
similarity index 91%
rename from deployment_scripts/puppet/manifests/gcs_horizon.pp
rename to deployment_scripts/puppet/manifests/horizon.pp
index 2b3193d..a1fde21 100644
--- a/deployment_scripts/puppet/manifests/gcs_horizon.pp
+++ b/deployment_scripts/puppet/manifests/horizon.pp
@@ -12,6 +12,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-notice('MODULAR:gcs_horizon.pp')
+notice('MODULAR: fuel-plugin-cinder-gcs/gcs_horizon.pp')
 include gcs
 class { 'gcs::horizon': }
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index 940f1f5..b7a94e3 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -7,7 +7,7 @@
     - name: /.*cinder.*/
       role: self
   parameters:
-    puppet_manifest: puppet/manifests/gcs_conf.pp
+    puppet_manifest: puppet/manifests/config.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 300
   condition:
@@ -22,7 +22,7 @@
     - name: gcs_config
       role: self
   parameters:
-    puppet_manifest: puppet/manifests/gcs_horizon.pp
+    puppet_manifest: puppet/manifests/horizon.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 300