diff --git a/pegleg/engine/util/pegleg_managed_document.py b/pegleg/engine/util/pegleg_managed_document.py
index 76b3fa2f..dab64903 100644
--- a/pegleg/engine/util/pegleg_managed_document.py
+++ b/pegleg/engine/util/pegleg_managed_document.py
@@ -80,7 +80,10 @@ class PeglegManagedSecretsDocument(object):
             [('abstract', False), ('layer', layer)])
         metadata = OrderedDict(
             [
-                ('name', secrets_document['metadata']['name']),
+                (
+                    'name', '{}/{}'.format(
+                        secrets_document['schema'],
+                        secrets_document['metadata']['name'])),
                 ('schema', 'metadata/Document/v1'),
                 ('labels', secrets_document['metadata'].get('labels', {})),
                 ('layeringDefinition', layering_definition),
diff --git a/tests/unit/engine/catalog/test_pki_generator.py b/tests/unit/engine/catalog/test_pki_generator.py
index 047ec7cb..4fbb4569 100644
--- a/tests/unit/engine/catalog/test_pki_generator.py
+++ b/tests/unit/engine/catalog/test_pki_generator.py
@@ -279,7 +279,9 @@ class TestPKIGenerator(object):
             wrapper_storage_policy = document['metadata']['storagePolicy']
             # This document is owned by Pegleg so begins with pegleg.
             assert "pegleg/PeglegManagedDocument/v1" == wrapper_schema
-            assert expected_name == wrapper_name
+            expected_wrapper_name = '{}/{}'.format(
+                wrapped_schema, expected_name)
+            assert expected_wrapper_name == wrapper_name
             assert "cleartext" == wrapper_storage_policy
 
     def _validate_keypairs(self, documents):