3 files changed, 5 insertions, 5 deletions
diff --git a/manifests/base/host.pp b/manifests/base/host.pp
index 799fe20..433364b 100644
--- a/manifests/base/host.pp
+++ b/manifests/base/host.pp
@@ -49,7 +49,7 @@ class nodo::base::host {
   # Munin configuration
   $munin = hiera('nodo::host::use_munin', True)
   if $munin == true {
-    munin_node { "$hostname":
+    nodo::subsystem::monitor::munin { "$hostname":
       port => '4900',
     }
   }
diff --git a/manifests/base/plug.pp b/manifests/base/plug.pp
index eedd9fe..b71b648 100644
--- a/manifests/base/plug.pp
+++ b/manifests/base/plug.pp
@@ -20,7 +20,7 @@ class nodo::base::plug {
   }
 
   # Munin configuration
-  munin_node { "${::hostname}":
+  nodo::subsystem::monitor::munin { "${::hostname}":
     port => '4900',
   }
 }
diff --git a/manifests/base/vserver.pp b/manifests/base/vserver.pp
index 0a8b589..f904f32 100644
--- a/manifests/base/vserver.pp
+++ b/manifests/base/vserver.pp
@@ -16,13 +16,13 @@ class nodo::base::vserver {
     "direct": {
       # Apply munin and monkeysphere configuration for
       # for directly hosted nodes.
-      Munin_node        <<| title == $::hostname |>>
-      Monkeysphere_host <<| title == $::hostname |>>
+      Nodo::Subsystem::Monitor::Munin <<| title == $::hostname |>>
+      Nodo::Subsystem::Monkeysphere   <<| title == $::hostname |>>
     }
     "third-party": {
       # Apply munin and monkeysphere configuration for
       # nodes hosted by third-parties.
-      munin_node { "${::hostname}": }
+      nodo::subsystem::monitor::munin { "${::hostname}": }
       monkeysphere_host { "${::hostname}":
         port => hiera('nodo::vserver::ssh_port', '22'),
       }