diff --git a/lib.cf b/lib.cf
index b4b28e3..1ef9ff5 100644
--- a/lib.cf
+++ b/lib.cf
@@ -22,14 +22,15 @@ packages:
 		"$(pkgs)"
 			policy => "present",
 			package_module => pkg,
-			classes => if_repaired("$(name)_repaired"),
-			classes => if_ok("$(name)_ok");
+			handle => "$(name)_pkgs_installed",
+			classes => results("namespace","$(name)");
 	debian::
 		"$(pkgs)"
 			policy => "present",
 			package_module => apt_get,
-			classes => if_repaired("$(name)_repaired"),
-			classes => if_ok("$(name)_ok");
+			handle => "$(name)_pkgs_installed",
+			classes => results("namespace","$(name)");
+
 }
 
 body perms wmde_perms(user,group,mode)