Index: config/doctrine/schema.yml
===================================================================
--- config/doctrine/schema.yml	(revision 476)
+++ config/doctrine/schema.yml	(working copy)
@@ -31,8 +31,8 @@
     action:
       type: string(255)
 
-aFormLayout:
-  tableName: a_form_layout
+aFormFieldset:
+  tableName: a_form_fieldset
   actAs:
     Sluggable:
       fields: [label]
@@ -61,10 +61,10 @@
       foreign: id
       local: form_id
       onDelete: CASCADE
-      foreignAlias: aFormLayouts
+      foreignAlias: aFormFieldsets
 
-aFormLayoutOption:
-  tableName: a_form_layout_option
+aFormFieldsetOption:
+  tableName: a_form_fieldset_option
   columns:
     layout_id:
       type: integer
@@ -76,12 +76,12 @@
       type: integer
       default: 1
   relations:
-    aFormLayout:
-      class: aFormLayout
+    aFormFieldset:
+      class: aFormFieldset
       foreign: id
       local: layout_id
       onDelete: CASCADE
-      foreignAlias: aFormLayoutOptions
+      foreignAlias: aFormFieldsetOptions
       
 aFormField:
   tableName: a_form_field
@@ -91,8 +91,8 @@
     name:
       type: string
   relations:
-    aFormLayout:
-      class: aFormLayout
+    aFormFieldset:
+      class: aFormFieldset
       foreign: id
       local: layout_id
       onDelete: CASCADE
@@ -147,8 +147,8 @@
       local: submission_id
       onDelete: CASCADE
       foreignAlias: aFormFieldSubmissions
-    aFormLayout:
-      class: aFormLayout
+    aFormFieldset:
+      class: aFormFieldset
       foreign: id
       local: layout_id
       onDelete: CASCADE