diff --git a/tree/30_generic_methods/service_disabled.cf b/tree/30_generic_methods/service_disabled.cf
index c487052f6..5ef84e07d 100644
--- a/tree/30_generic_methods/service_disabled.cf
+++ b/tree/30_generic_methods/service_disabled.cf
@@ -46,11 +46,11 @@ bundle agent service_disabled(service_name)
 
       "undefine_at_boot"
         usebundle => ncf_services("${service_name}", "disable"),
-        ifvarclass => "(!has_promiser_stack.service_check_disabled_${canonified_service_name}_not_ok)|(has_promiser_stack.${class_prefix}_check_disabled_not_ok)";
+        ifvarclass => "(!has_promiser_stack.service_check_disabled_at_boot_${canonified_service_name}_not_ok)|(has_promiser_stack.${class_prefix}_check_disabled_not_ok)";
 
       "already undefined"
         usebundle  => _classes_success("${old_class_prefix}"),
-        ifvarclass => "service_check_disabled_${canonified_service_name}_ok";
+        ifvarclass => "service_check_disabled_at_boot_${canonified_service_name}_ok";
 
       "already undefined"
         usebundle  => _classes_success("${class_prefix}"),
@@ -58,7 +58,7 @@ bundle agent service_disabled(service_name)
 
       "copy classes"
         usebundle  => _classes_copy("ncf_services_${canonified_service_name}_disable", "${old_class_prefix}"),
-        ifvarclass => "service_check_disabled_${canonified_service_name}_not_ok";
+        ifvarclass => "service_check_disabled_at_boot_${canonified_service_name}_not_ok";
 
       "copy classes"
         usebundle  => _classes_copy("${class_prefix}_disable", "${class_prefix}"),