diff --git a/server/assignments/models.py b/server/assignments/models.py
index 815bb6b2..ce4bf10c 100644
--- a/server/assignments/models.py
+++ b/server/assignments/models.py
@@ -21,5 +21,5 @@ class CustomAssignment(Assignment):
 class StudentSubmission(TimeStampedModel):
     text = models.TextField(blank=True)
     document = models.FilePathField(null=True)
-    assignment = models.ForeignKey(Assignment, on_delete=models.CASCADE)
+    assignment = models.ForeignKey(Assignment, on_delete=models.CASCADE, related_name='submissions')
     student = models.ForeignKey(get_user_model(), on_delete=models.CASCADE)
diff --git a/server/book/factories.py b/server/book/factories.py
index d8373333..09766130 100644
--- a/server/book/factories.py
+++ b/server/book/factories.py
@@ -5,7 +5,7 @@ import wagtail_factories
 from factory import CREATE_STRATEGY
 from wagtail.core.rich_text import RichText
 
-from book.blocks import BasicKnowledgeBlock, StudentEntryBlock, ImageUrlBlock, LinkBlock
+from book.blocks import BasicKnowledgeBlock, ImageUrlBlock, LinkBlock, AssignmentBlock
 from book.models import Book, Topic, Module, Chapter, ContentBlock, TextBlock
 from core.factories import BasePageFactory, fake, DummyImageFactory, fake_paragraph, fake_title
 
@@ -72,9 +72,9 @@ class LinkBlockFactory(wagtail_factories.StructBlockFactory):
         model = LinkBlock
 
 
-class StudentEntryBlockFactory(wagtail_factories.StructBlockFactory):
+class AssignmentBlockFactory(wagtail_factories.StructBlockFactory):
     class Meta:
-        model = StudentEntryBlock
+        model = AssignmentBlock
 
 
 block_types = ['text_block', 'basic_knowledge', 'student_entry', 'image_block', 'task']
@@ -89,7 +89,7 @@ class ContentBlockFactory(BasePageFactory):
     contents = wagtail_factories.StreamFieldFactory({
         'text_block': TextBlockFactory,
         'basic_knowledge': BasicKnowledgeBlockFactory,
-        'student_entry': StudentEntryBlockFactory,
+        'assignment': AssignmentBlockFactory,
         'image_block': wagtail_factories.ImageChooserBlockFactory,
         'task': TextBlockFactory
     })
@@ -124,7 +124,8 @@ class ContentBlockFactory(BasePageFactory):
                                 fake_paragraph())
                         else:
                             kwargs[
-                                '{}__{}__{}__{}'.format(stream_field_name, idx, block_type, field)] = 'https://google.ch'
+                                '{}__{}__{}__{}'.format(stream_field_name, idx, block_type,
+                                                        field)] = 'https://google.ch'
                     elif block_type == 'image_block':
                         kwargs['{}__{}__{}__{}'.format(stream_field_name, idx, block_type,
                                                        'image__title')] = fake_paragraph()
@@ -144,8 +145,8 @@ class ContentBlockFactory(BasePageFactory):
                     kwargs['{}__{}__{}__{}'.format(stream_field_name, i, 'basic_knowledge', 'description')] = RichText(
                         fake_paragraph())
                     # kwargs['{}__{}__{}__{}'.format(stream_field_name, i, 'basic_knowledge', 'description')] = ..url..
-                elif block_type == 'student_entry':
-                    kwargs['{}__{}__{}__{}'.format(stream_field_name, i, 'student_entry', 'task_text')] = RichText(
+                elif block_type == 'assignment':
+                    kwargs['{}__{}__{}__{}'.format(stream_field_name, i, 'assignment', 'task_text')] = RichText(
                         fake_paragraph())
                 elif block_type == 'image_block':
                     kwargs[