diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/.content.xml
index 491392d539..10ece0a90c 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tableheader/v1/.content.xml
@@ -1,3 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:primaryType="sling:Folder"/>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+          jcr:primaryType="nt:unstructured">
+    <table/>
+</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/.content.xml
index 491392d539..10ece0a90c 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/.content.xml
@@ -1,3 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:primaryType="sling:Folder"/>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+          jcr:primaryType="nt:unstructured">
+    <table/>
+</jcr:root>