diff --git a/src/core/apparmor-setup.c b/src/core/apparmor-setup.c
index 104335a75e..c7bb9bf158 100644
--- a/src/core/apparmor-setup.c
+++ b/src/core/apparmor-setup.c
@@ -14,8 +14,8 @@
 
 int mac_apparmor_setup(void) {
 #if HAVE_APPARMOR
-        _cleanup_(sym_aa_policy_cache_unrefp) aa_policy_cache *policy_cache = NULL;
-        _cleanup_(sym_aa_features_unrefp) aa_features *features = NULL;
+        _cleanup_(aa_policy_cache_unrefp) aa_policy_cache *policy_cache = NULL;
+        _cleanup_(aa_features_unrefp) aa_features *features = NULL;
         _cleanup_free_ char *current_profile = NULL, *cache_dir_path = NULL;
         int r;
 
diff --git a/src/shared/apparmor-util.h b/src/shared/apparmor-util.h
index 52f8f7834c..c3f97ceaaf 100644
--- a/src/shared/apparmor-util.h
+++ b/src/shared/apparmor-util.h
@@ -17,8 +17,8 @@ extern DLSYM_PROTOTYPE(aa_policy_cache_new);
 extern DLSYM_PROTOTYPE(aa_policy_cache_replace_all);
 extern DLSYM_PROTOTYPE(aa_policy_cache_unref);
 
-DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(aa_features*, sym_aa_features_unref, NULL);
-DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(aa_policy_cache*, sym_aa_policy_cache_unref, NULL);
+DEFINE_TRIVIAL_CLEANUP_FUNC_FULL_RENAME(aa_features*, sym_aa_features_unref, aa_features_unrefp, NULL);
+DEFINE_TRIVIAL_CLEANUP_FUNC_FULL_RENAME(aa_policy_cache*, sym_aa_policy_cache_unref, aa_policy_cache_unrefp, NULL);
 
 int dlopen_libapparmor(void);
 #else