diff --git a/health/Makefile.am b/health/Makefile.am
index 86ad5969a8b600..81d58e853c6069 100644
--- a/health/Makefile.am
+++ b/health/Makefile.am
@@ -68,7 +68,6 @@ dist_healthconfig_DATA = \
     health.d/retroshare.conf \
     health.d/softnet.conf \
     health.d/squid.conf \
-    health.d/sslcheck.conf \
     health.d/stiebeleltron.conf \
     health.d/swap.conf \
     health.d/tcp_conn.conf \
@@ -79,5 +78,6 @@ dist_healthconfig_DATA = \
     health.d/udp_errors.conf \
     health.d/varnish.conf \
     health.d/web_log.conf \
+    health.d/x509check.conf \
     health.d/zfs.conf \
     $(NULL)
diff --git a/health/health.d/sslcheck.conf b/health/health.d/x509check.conf
similarity index 67%
rename from health/health.d/sslcheck.conf
rename to health/health.d/x509check.conf
index 29a017e3d6db25..dc0e6c6951634f 100644
--- a/health/health.d/sslcheck.conf
+++ b/health/health.d/x509check.conf
@@ -1,7 +1,7 @@
 
-template: sslcheck_days_until_expiration
-      on: sslcheck.time_until_expiration
-   calc:  $time
+template: x509check_days_until_expiration
+      on: x509check.time_until_expiration
+   calc:  $expiry
    units: seconds
    every: 60s
     warn: $this < $days_until_expiration_warning*24*60*60