diff --git a/manifests/init.pp b/manifests/init.pp
index dd0da05..1b54eab 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,10 +1,10 @@
-## cd_clamav::init.pp
-# Module name: cd_clamav
+## clamav_cd::init.pp
+# Module name: clamav_cd
 # Author: Arne Teuke (arne_teuke@confdroid.com)
-# @summary Class initializes the cd_clamav Module.
+# @summary Class initializes the clamav_cd Module.
 ##############################################################################
-class cd_clamav {
-  include cd_clamav::params
+class clamav_cd {
+  include clamav_cd::params
 
   resources { 'firewall':
     purge => true,
diff --git a/manifests/main/config.pp b/manifests/main/config.pp
index 91d217d..c61bfa8 100644
--- a/manifests/main/config.pp
+++ b/manifests/main/config.pp
@@ -1,11 +1,11 @@
-## cd_clamav::main::config.pp
-# Module name: cd_clamav
+## clamav_cd::main::config.pp
+# Module name: clamav_cd
 # Author: Arne Teuke (arne_teuke@confdroid.com)
 # @summary  Class manages all aspects of configuring the module logic for
-#   cd_clamav.
+#   clamav_cd.
 ##############################################################################
-class cd_clamav::main::config (
+class clamav_cd::main::config (
 
-) inherits cd_clamav::params {
-  include cd_clamav::main::service
+) inherits clamav_cd::params {
+  include clamav_cd::main::service
 }
diff --git a/manifests/main/dirs.pp b/manifests/main/dirs.pp
index 499c565..d81f701 100644
--- a/manifests/main/dirs.pp
+++ b/manifests/main/dirs.pp
@@ -1,12 +1,12 @@
-## cd_clamav::main::dirs.pp
-# Module name: cd_clamav
+## clamav_cd::main::dirs.pp
+# Module name: clamav_cd
 # Author: Arne Teuke (arne_teuke@confdroid.com)
-# @summary Class manages all directories required for cd_clamav.
+# @summary Class manages all directories required for clamav_cd.
 ###############################################################################
-class cd_clamav::main::dirs (
+class clamav_cd::main::dirs (
 
-) inherits cd_clamav::params {
-  require cd_clamav::main::install
+) inherits clamav_cd::params {
+  require clamav_cd::main::install
 
   # config.d dir
   file { $cv_config_d_dir:
diff --git a/manifests/main/files.pp b/manifests/main/files.pp
index 84c33d3..8841a5e 100644
--- a/manifests/main/files.pp
+++ b/manifests/main/files.pp
@@ -1,12 +1,12 @@
-## cd_clamav::main::files.pp
-# Module name: cd_clamav
+## clamav_cd::main::files.pp
+# Module name: clamav_cd
 # Author: Arne Teuke (arne_teuke@confdroid.com)
-# @summary  Class manages all configuration files required for cd_clamav.
+# @summary  Class manages all configuration files required for clamav_cd.
 ##############################################################################
-class cd_clamav::main::files (
+class clamav_cd::main::files (
 
-) inherits cd_clamav::params {
-  require cd_clamav::main::dirs
+) inherits clamav_cd::params {
+  require clamav_cd::main::dirs
 
   # clamd config file
   file { $cv_clamd_config_file:
diff --git a/manifests/main/install.pp b/manifests/main/install.pp
index 56675be..7bd6c77 100644
--- a/manifests/main/install.pp
+++ b/manifests/main/install.pp
@@ -1,12 +1,14 @@
-## cd_clamav	::main::install.pp
-# Module name: cd_clamav
+## clamav_cd	::main::install.pp
+# Module name: clamav_cd
 # Author: Arne Teuke (arne_teuke@confdroid.com)
 # @summary Class manage all aspects of installing binaries required for
-#   cd_clamav
+#   clamav_cd
 ###############################################################################
-class cd_clamav::main::install (
+class clamav_cd::main::install (
+
+) inherits clamav_cd::params {
+  require resources_cd::main::epel
 
-) inherits cd_clamav::params {
   package { $reqpackages:
     ensure => $pkg_ensure,
   }
diff --git a/manifests/main/service.pp b/manifests/main/service.pp
index 6696699..24a637a 100644
--- a/manifests/main/service.pp
+++ b/manifests/main/service.pp
@@ -1,12 +1,12 @@
-## cd_clamav::main::service.pp
-# Module name: cd_clamav
+## clamav_cd::main::service.pp
+# Module name: clamav_cd
 # Author: Arne Teuke (arne_teuke@confdroid.com)
-# @summary  Class manages the service(s) for cd_clamav.
+# @summary  Class manages the service(s) for clamav_cd.
 #############################################################################
-class cd_clamav::main::service (
+class clamav_cd::main::service (
 
-) inherits cd_clamav::params {
-  require cd_clamav::main::files
+) inherits clamav_cd::params {
+  require clamav_cd::main::files
 
 #  service { $cv_service:
 #    ensure     => running,
diff --git a/manifests/params.pp b/manifests/params.pp
index 0fc0c5a..e9c3c2e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,7 +1,7 @@
-## cd_clamav::params.pp
-# Module name: cd_clamav
+## clamav_cd::params.pp
+# Module name: clamav_cd
 # Author: Arne Teuke (arne_teuke@confdroid.com)
-# @summary  Class holds all parameters for the cd_clamav module and is
+# @summary  Class holds all parameters for the clamav_cd module and is
 #   inherited by all classes except defines.
 # @param [String] reqpackages List of packages to install.
 # @param [String] pkg_ensure
@@ -26,7 +26,7 @@
 # @param [String] cv_preludeanalyzername name of the analyzer used by
 #   prelude-admin.
 ##############################################################################
-class cd_clamav::params (
+class clamav_cd::params (
 
 # installation
   String $reqpackages            = ['clamav','clamav-update','clamd'],
@@ -54,11 +54,11 @@ class cd_clamav::params (
 
   # files
   $cv_clamd_config_file = "${cv_config_d_dir}/scan.conf"
-  $cv_clamd_config_erb  = 'cd_clamav/scan_conf.erb'
+  $cv_clamd_config_erb  = 'clamav_cd/scan_conf.erb'
   $cv_freshclam_file    = '/etc/freshclam.conf'
-  $cv_freshclam_erb     = 'cd_clamav/freshclam_conf.erb'
+  $cv_freshclam_erb     = 'clamav_cd/freshclam_conf.erb'
 
   # includes must be last
 
-  include cd_clamav::main::config
+  include clamav_cd::main::config
 }