diff --git a/NodeTypes/Field/FriendlyCaptcha/FriendlyCaptcha.fusion b/NodeTypes/Field/FriendlyCaptcha/FriendlyCaptcha.fusion
index 616959e..36825ad 100644
--- a/NodeTypes/Field/FriendlyCaptcha/FriendlyCaptcha.fusion
+++ b/NodeTypes/Field/FriendlyCaptcha/FriendlyCaptcha.fusion
@@ -1,5 +1,5 @@
 prototype(Sitegeist.PaperTiger:Field.FriendlyCaptcha) < prototype(Neos.Neos:ContentComponent) {
-    name = ${q(node).property('_identifier')}
+    name = ${node.aggregateId}
 
     renderer = Neos.Fusion:Case {
         backend {
diff --git a/NodeTypes/Field/Honeypot/Honeypot.fusion b/NodeTypes/Field/Honeypot/Honeypot.fusion
index 2785441..66d2599 100644
--- a/NodeTypes/Field/Honeypot/Honeypot.fusion
+++ b/NodeTypes/Field/Honeypot/Honeypot.fusion
@@ -1,11 +1,11 @@
 prototype(Sitegeist.PaperTiger:Field.Honeypot) < prototype(Neos.Neos:ContentComponent) {
-    name = ${q(node).property('_identifier')}
+    name = ${node.aggregateId}
 
     style = 'display:none !important;'
     class = null
 
     honeypotScript = afx`
-        <script data-name={"field_" + q(node).property('_identifier')} data-value={PaperTiger.timestampWithHmac()}>
+        <script data-name={"field_" + node.aggregateId} data-value={PaperTiger.timestampWithHmac()}>
             {StaticResource.content('Sitegeist.PaperTiger', 'Public/Scripts/Honeypot.js')}
         </script>
     `
diff --git a/NodeTypes/Form.fusion b/NodeTypes/Form.fusion
index 68c23ab..c730440 100644
--- a/NodeTypes/Form.fusion
+++ b/NodeTypes/Form.fusion
@@ -26,7 +26,7 @@ prototype(Sitegeist.PaperTiger:Form) < prototype(Neos.Neos:ContentComponent) {
                         formAction = '_formAction'
                     }
 
-                    namespace = ${q(node).property('_identifier')}
+                    namespace = ${node.aggregateId}
                     attributes.class = ${_formClass}
                     attributes.action = ${_formAction}
 
diff --git a/Resources/Private/Fusion/Prototypes/FieldCollection.Schema.fusion b/Resources/Private/Fusion/Prototypes/FieldCollection.Schema.fusion
index 5eed880..15bf9f8 100644
--- a/Resources/Private/Fusion/Prototypes/FieldCollection.Schema.fusion
+++ b/Resources/Private/Fusion/Prototypes/FieldCollection.Schema.fusion
@@ -7,7 +7,7 @@ prototype(Sitegeist.PaperTiger:FieldCollection.Schema) < prototype(Neos.Fusion:C
             itemName = 'node'
             carryName = 'carry'
             itemReducer = Neos.Fusion:Value {
-                name = ${q(node).is('[instanceof Sitegeist.PaperTiger:Mixin.Name]') ? q(node).property('name') : q(node).property('_identifier')}
+                name = ${q(node).is('[instanceof Sitegeist.PaperTiger:Mixin.Name]') ? q(node).property('name') : node.aggregateId}
                 schema = Neos.Fusion:Renderer {
                     @if.canRender = Neos.Fusion:CanRender {
                         type = ${node.nodeTypeName + '.Schema'}