diff --git a/lib/constants.dart b/lib/constants.dart
index 9410ac749..cd1fc23b8 100644
--- a/lib/constants.dart
+++ b/lib/constants.dart
@@ -144,8 +144,8 @@ const String kGenerateNumberWhenSent = 'when_sent';
 const String kDesignHeader = 'header';
 const String kDesignBody = 'body';
 const String kDesignFooter = 'footer';
-const String kDesignProducts = 'products';
-const String kDesignTasks = 'tasks';
+const String kDesignProducts = 'product_table';
+const String kDesignTasks = 'task_table';
 const String kDesignIncludes = 'include';
 
 const String kEmailDesignPlain = 'plain';
diff --git a/lib/ui/design/edit/design_edit.dart b/lib/ui/design/edit/design_edit.dart
index 4dda11d67..59bf4a121 100644
--- a/lib/ui/design/edit/design_edit.dart
+++ b/lib/ui/design/edit/design_edit.dart
@@ -69,10 +69,10 @@ class _DesignEditState extends State<DesignEdit>
     final design = widget.viewModel.design;
     _nameController.text = design.name;
     _headerController.text = design.getSection(kDesignHeader); //design.design;
-    _footerController.text = design.getSection(kDesignHeader); //design.design;
-    _bodyController.text = design.getSection(kDesignHeader); //design.design;
+    _footerController.text = design.getSection(kDesignFooter); //design.design;
+    _bodyController.text = design.getSection(kDesignBody); //design.design;
     _productsController.text =
-        design.getSection(kDesignHeader); //design.design;
+        design.getSection(kDesignProducts); //design.design;
     _tasksController.text = design.getSection(kDesignTasks);
     _includesController.text = design.getSection(kDesignIncludes);