diff --git a/global/overlay/etc/puppet/modules/eid/manifests/nagios_monitor.pp b/global/overlay/etc/puppet/modules/eid/manifests/nagios_monitor.pp
index 4bd5c9ce..49b975aa 100644
--- a/global/overlay/etc/puppet/modules/eid/manifests/nagios_monitor.pp
+++ b/global/overlay/etc/puppet/modules/eid/manifests/nagios_monitor.pp
@@ -224,7 +224,7 @@ class eid::nagios_monitor {
       description    => 'proxy eidas metadata cache age',
       contact_groups => ['alerts']
   }
-  nagioscfg::service {'proxy_eidas_metadata_cache':
+  nagioscfg::service {'proxy_eidas_metadata_cache_age':
       hostgroup_name => ['eid::proxy'],
       check_command  => 'check_nrpe_1arg!check_fileage_proxy_eidas_metadata_cache',
       description    => 'proxy eidas metadata cache age',
diff --git a/global/overlay/etc/puppet/modules/eid/manifests/proxy.pp b/global/overlay/etc/puppet/modules/eid/manifests/proxy.pp
index f19d1578..625b51ce 100644
--- a/global/overlay/etc/puppet/modules/eid/manifests/proxy.pp
+++ b/global/overlay/etc/puppet/modules/eid/manifests/proxy.pp
@@ -72,7 +72,7 @@ class eid::proxy (
       group  => 'root',
     }
 
-    sunet::nagios::nrpe_check_fileage {'proxy_eidas_metadata_cache':
+    sunet::nagios::nrpe_check_fileage {'proxy_eidas_metadata_cache_age':
       filename     => "${proxy_directory}/se/ps-mdcache/metadata-cache.xml",
       warning_age  => '600',
       critical_age => '172800'