diff --git a/README.md b/README.md
index bfb43cf..282b11c 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
 # Readme
 
-[![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=prometheus_cd)](https://jenkins.confdroid.com/job/prometheus_cd/)
+[![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=confdroid_prometheus)](https://jenkins.confdroid.com/job/confdroid_prometheus/)
 
 ## Synopsis
 
 Prometheus is an open-source monitoring system with a dimensional data model, flexible query language, efficient time series database and modern alerting approach.
 
-`prometheus_cd` is a Puppet module to automate installation and configuration of prometheus and node exporter.
+`confdroid_prometheus` is a Puppet module to automate installation and configuration of prometheus and node exporter.
 This module supports either managing prometheus or node_exporter or both. You need to set the parameters `$manage_prometheus`and / or `$manage_node_exporter`to true ( false by default)
 
 ## WARNING
diff --git a/manifests/firewall/iptables.pp b/manifests/firewall/iptables.pp
index b6f44c5..4eae707 100644
--- a/manifests/firewall/iptables.pp
+++ b/manifests/firewall/iptables.pp
@@ -1,10 +1,10 @@
-# prometheus_cd::firewall::iptables.pp
-# Module name: prometheus_cd
+# confdroid_prometheus::firewall::iptables.pp
+# Module name: confdroid_prometheus
 # Author: Arne Teuke (arne_teuke@confdroid.com)
-# @summary Class manages the firewall rules for the prometheus_cd module.
+# @summary Class manages the firewall rules for the confdroid_prometheus module.
 ##############################################################################
-class prometheus_cd::firewall::iptables (
-) inherits prometheus_cd::params {
+class confdroid_prometheus::firewall::iptables (
+) inherits confdroid_prometheus::params {
   if  ($ps_prom_host == $fqdn) and ($ps_manage_fw == true) {
     # main port
     firewall { "${ps_fw_prefix}${$ps_main_port} main port":
diff --git a/manifests/init.pp b/manifests/init.pp
index 2598a50..2d0e277 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,8 +1,8 @@
-# prometheus_cd::init.pp
-# Module name: prometheus_cd
+# confdroid_prometheus::init.pp
+# Module name: confdroid_prometheus
 # Author: Arne Teuke (arne_teuke@confdroid.com)
-# @summary Class initializes the prometheus_cd module.
+# @summary Class initializes the confdroid_prometheus module.
 ##############################################################################
-class prometheus_cd {
-  include prometheus_cd::params
+class confdroid_prometheus {
+  include confdroid_prometheus::params
 }
diff --git a/manifests/main/config.pp b/manifests/main/config.pp
index 42777b6..1d0ffe5 100644
--- a/manifests/main/config.pp
+++ b/manifests/main/config.pp
@@ -1,11 +1,11 @@
-# prometheus_cd::main::config.pp
-# Module name: prometheus_cd
+# confdroid_prometheus::main::config.pp
+# Module name: confdroid_prometheus
 # Author: Arne Teuke (arne_teuke@confdroid.com)
-# @summary Class manages the module logic for the prometheus_cd module.
+# @summary Class manages the module logic for the confdroid_prometheus module.
 ##############################################################################
-class prometheus_cd::main::config (
-) inherits prometheus_cd::params {
-  include prometheus_cd::main::service
+class confdroid_prometheus::main::config (
+) inherits confdroid_prometheus::params {
+  include confdroid_prometheus::main::service
 
   exec { 'systemd-daemon-reload':
     command     => '/bin/systemctl daemon-reload',
diff --git a/manifests/main/dirs.pp b/manifests/main/dirs.pp
index 65a538f..4a23602 100644
--- a/manifests/main/dirs.pp
+++ b/manifests/main/dirs.pp
@@ -1,11 +1,11 @@
-# prometheus_cd::main::dirs.pp
-# Module name: prometheus_cd
+# confdroid_prometheus::main::dirs.pp
+# Module name: confdroid_prometheus
 # Author: Arne Teuke (arne_teuke@confdroid.com)
-# @summary Class manages directories for the prometheus_cd module.
+# @summary Class manages directories for the confdroid_prometheus module.
 ##############################################################################
-class prometheus_cd::main::dirs (
-) inherits prometheus_cd::params {
-  require prometheus_cd::main::install
+class confdroid_prometheus::main::dirs (
+) inherits confdroid_prometheus::params {
+  require confdroid_prometheus::main::install
   if ($ps_prom_host == $fqdn) and ($manage_prometheus == true) {
     # prometheus directory
     file { $ps_main_dir:
diff --git a/manifests/main/files.pp b/manifests/main/files.pp
index 5cbd933..814d849 100644
--- a/manifests/main/files.pp
+++ b/manifests/main/files.pp
@@ -1,12 +1,12 @@
-# prometheus_cd::main::files.pp
-# Module name: prometheus_cd
+# confdroid_prometheus::main::files.pp
+# Module name: confdroid_prometheus
 # Author: Arne Teuke (arne_teuke@confdroid.com)
-# @summary Class manages configuration files for the prometheus_cd module.
+# @summary Class manages configuration files for the confdroid_prometheus module.
 ##############################################################################
-class prometheus_cd::main::files (
-) inherits prometheus_cd::params {
+class confdroid_prometheus::main::files (
+) inherits confdroid_prometheus::params {
   if ($ps_prom_host == $fqdn) and ($manage_prometheus == true)  {
-    require prometheus_cd::main::dirs
+    require confdroid_prometheus::main::dirs
     file { $ps_main_file:
       ensure   => file,
       owner    => 'root',
@@ -16,7 +16,7 @@ class prometheus_cd::main::files (
       selrole  => object_r,
       seltype  => etc_t,
       seluser  => system_u,
-      content  => template('prometheus_cd/prometheus.yml.erb'),
+      content  => template('confdroid_prometheus/prometheus.yml.erb'),
       notify   => Service[$ps_prom_service],
     }
     file { $ps_system_service_file:
@@ -28,7 +28,7 @@ class prometheus_cd::main::files (
       selrole  => object_r,
       seltype  => systemd_unit_file_t,
       seluser  => unconfined_u,
-      content  => template('prometheus_cd/override.conf.erb'),
+      content  => template('confdroid_prometheus/override.conf.erb'),
       notify   => Service[$ps_prom_service],
     }
     file { $ps_web_config_file:
@@ -40,7 +40,7 @@ class prometheus_cd::main::files (
       selrole  => object_r,
       seltype  => etc_t,
       seluser  => system_u,
-      content  => template('prometheus_cd/web.yml.erb'),
+      content  => template('confdroid_prometheus/web.yml.erb'),
       notify   => Service[$ps_prom_service],
     }
     if $ps_enable_pruning == true {
@@ -53,7 +53,7 @@ class prometheus_cd::main::files (
         selrole  => object_r,
         seltype  => usr_,
         seluser  => unconfined_u,
-        content  => template('prometheus_cd/prune_blocks.erb'),
+        content  => template('confdroid_prometheus/prune_blocks.erb'),
         # notify Service ToDo,
       }
       file { $ps_env_file:
@@ -65,7 +65,7 @@ class prometheus_cd::main::files (
         selrole  => object_r,
         seltype  => usr_,
         seluser  => unconfined_u,
-        content  => template('prometheus_cd/prune.env.erb'),
+        content  => template('confdroid_prometheus/prune.env.erb'),
       }
       file { $ps_pruning_svc_file:
         ensure   => file,
@@ -76,7 +76,7 @@ class prometheus_cd::main::files (
         selrole  => object_r,
         seltype  => systemd_unit_file_t,
         seluser  => unconfined_u,
-        content  => template('prometheus_cd/prometheus-prune-service.erb'),
+        content  => template('confdroid_prometheus/prometheus-prune-service.erb'),
         notify   => Exec['systemd-daemon-reload'],
       }
       file { $ps_pruning_timer_file:
@@ -88,7 +88,7 @@ class prometheus_cd::main::files (
         selrole  => object_r,
         seltype  => systemd_unit_file_t,
         seluser  => unconfined_u,
-        content  => template('prometheus_cd/prometheus-prune-timer.erb'),
+        content  => template('confdroid_prometheus/prometheus-prune-timer.erb'),
         notify   => Exec['systemd-daemon-reload'],
       }
       file { $ps_prune_log_file:
diff --git a/manifests/main/install.pp b/manifests/main/install.pp
index ba8dca3..ef3b344 100644
--- a/manifests/main/install.pp
+++ b/manifests/main/install.pp
@@ -1,11 +1,11 @@
-# prometheus_cd::main::install.pp
-# Module name: prometheus_cd
+# confdroid_prometheus::main::install.pp
+# Module name: confdroid_prometheus
 # Author: Arne Teuke (arne_teuke@confdroid.com)
-# @summary Class install binaries for the prometheus_cd module.
+# @summary Class install binaries for the confdroid_prometheus module.
 ##############################################################################
-class prometheus_cd::main::install (
-) inherits prometheus_cd::params {
-  require prometheus_cd::main::yumrepo
+class confdroid_prometheus::main::install (
+) inherits confdroid_prometheus::params {
+  require confdroid_prometheus::main::yumrepo
   if $manage_prometheus  == true {
     package { $reqpackage_prom:
       ensure => $pkg_ensure,
diff --git a/manifests/main/service.pp b/manifests/main/service.pp
index 030c8a9..60eaeba 100644
--- a/manifests/main/service.pp
+++ b/manifests/main/service.pp
@@ -1,13 +1,13 @@
-# prometheus_cd::main::service.pp
-# Module name: prometheus_cd
+# confdroid_prometheus::main::service.pp
+# Module name: confdroid_prometheus
 # Author: Arne Teuke (arne_teuke@confdroid.com)
-# @summary Class manages the services for the prometheus_cd module.
+# @summary Class manages the services for the confdroid_prometheus module.
 ##############################################################################
-class prometheus_cd::main::service (
-) inherits prometheus_cd::params {
+class confdroid_prometheus::main::service (
+) inherits confdroid_prometheus::params {
   if  ($ps_prom_host == $fqdn) and ($manage_prometheus == true) {
-    require prometheus_cd::main::files
-    require prometheus_cd::firewall::iptables
+    require confdroid_prometheus::main::files
+    require confdroid_prometheus::firewall::iptables
     service { $ps_prom_service:
       ensure     => running,
       hasstatus  => true,
diff --git a/manifests/main/yumrepo.pp b/manifests/main/yumrepo.pp
index 2ebd8c4..90d2acc 100644
--- a/manifests/main/yumrepo.pp
+++ b/manifests/main/yumrepo.pp
@@ -1,10 +1,10 @@
-# prometheus_cd::main::yumrepo.pp
-# Module name: prometheus_cd
+# confdroid_prometheus::main::yumrepo.pp
+# Module name: confdroid_prometheus
 # Author: Arne Teuke (arne_teuke@confdroid.com)
-# @summary Class manages yumrepo for the prometheus_cd module.
+# @summary Class manages yumrepo for the confdroid_prometheus module.
 ##############################################################################
-class prometheus_cd::main::yumrepo (
-) inherits prometheus_cd::params {
+class confdroid_prometheus::main::yumrepo (
+) inherits confdroid_prometheus::params {
   yumrepo { 'prometheus':
     ensure   => 'present',
     name     => 'prometheus',
diff --git a/manifests/params.pp b/manifests/params.pp
index a1785e7..5740480 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,7 +1,7 @@
-# prometheus_cd::params.pp
-# Module name: prometheus_cd
+# confdroid_prometheus::params.pp
+# Module name: confdroid_prometheus
 # Author: Arne Teuke (arne_teuke@confdroid.com)
-# @summary Class holds all parameters for the prometheus_cd module.
+# @summary Class holds all parameters for the confdroid_prometheus module.
 # @param [String] reqpackage_prom the prometheus package
 # @param [String] reqpackage_ne the node_exporter package
 # @param [String] pkg_ensure which version of the package to install
@@ -40,9 +40,9 @@
 # @param [Boolean] ps_dry_run (true = just log, false = actually delete blocks)
 # @param [String] ps_min_age_hours Minimum block age in hours before pruning
 # @param [String] ps_grace_hours Grace period in hours to be extra safe
-# @param [String] ps_sql_template the SQL template to use for checks. 
+# @param [String] ps_sql_template the SQL template to use for checks.
 ##############################################################################
-class prometheus_cd::params (
+class confdroid_prometheus::params (
 
   # installation
   String $reqpackage_prom       = 'prometheus2',
@@ -128,5 +128,5 @@ class prometheus_cd::params (
   $ps_prune_timer         = 'prometheus-prune.timer'
 
   # includes must be last
-  include prometheus_cd::main::config
+  include confdroid_prometheus::main::config
 }