diff --git a/client/src/components/ContentBlock.vue b/client/src/components/ContentBlock.vue
index 5e2af3ff..99e9b906 100644
--- a/client/src/components/ContentBlock.vue
+++ b/client/src/components/ContentBlock.vue
@@ -40,7 +40,7 @@
   import VideoBlock from '@/components/content-blocks/VideoBlock';
   import LinkBlock from '@/components/content-blocks/LinkBlock';
   import DocumentBlock from '@/components/content-blocks/DocumentBlock';
-  import StudentEntry from '@/components/content-blocks/StudentEntry';
+  import Assignment from '@/components/content-blocks/Assignment';
   import AddContentBlockButton from '@/components/AddContentBlockButton';
   import VisibilityPopover from '@/components/VisibilityPopover';
   import EyeIcon from '@/components/icons/EyeIcon';
@@ -52,12 +52,12 @@
     components: {
       'text_block': TextBlock,
       'basic_knowledge': BasicKnowledgeWidget,
-      'student_entry': StudentEntry,
       'image_block': ImageBlock,
       'image_url_block': ImageUrlBlock,
       'video_block': VideoBlock,
       'link_block': LinkBlock,
       'document_block': DocumentBlock,
+      Assignment,
       Task,
       AddContentBlockButton,
       VisibilityPopover,
diff --git a/client/src/components/content-blocks/Assignment.vue b/client/src/components/content-blocks/Assignment.vue
new file mode 100644
index 00000000..b1021e0f
--- /dev/null
+++ b/client/src/components/content-blocks/Assignment.vue
@@ -0,0 +1,43 @@
+<template>
+  <div class="assignment">
+    <p v-html="value.assignment"></p>
+    <textarea class="assignment__input" placeholder="Text schreiben"></textarea>
+    <button class="assignment__submit button">Ergebnis teilen</button>
+  </div>
+</template>
+
+<script>
+  import vue2Dropzone from 'vue2-dropzone'
+  import 'vue2-dropzone/dist/vue2Dropzone.min.css'
+
+  export default {
+    props: ['value'],
+
+    components: {
+      vueDropzone: vue2Dropzone
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  @import '@/styles/_variables.scss';
+
+  .assignment {
+    margin-bottom: 2em;
+
+    &__input {
+      display: block;
+      width: 100%;
+      border-radius: 3px;
+      border: 1px solid #DBDBDB;
+      padding: 13px;
+      box-shadow: inset 0 1px 4px 0 rgba(0, 0, 0, 0.15);
+      box-sizing: border-box;
+      line-height: 1.5;
+      margin-bottom: 12px;
+    }
+
+    &__submit {
+    }
+  }
+</style>
diff --git a/client/src/components/content-blocks/StudentEntry.vue b/client/src/components/content-blocks/StudentEntry.vue
deleted file mode 100644
index fcdd7190..00000000
--- a/client/src/components/content-blocks/StudentEntry.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<template>
-  <div class="student-entry">
-    <p v-html="value.task_text"></p>
-    <textarea class="student-entry__input" placeholder="Text schreiben"></textarea>
-    <div class="student-entry__dropzone-dummy">Dokument hier hinziehen oder hier klicken</div>
-    <button class="student-entry__submit button">Ergebnis teilen</button>
-  </div>
-</template>
-
-<script>
-  import vue2Dropzone from 'vue2-dropzone'
-  import 'vue2-dropzone/dist/vue2Dropzone.min.css'
-
-  export default {
-    props: ['value'],
-
-    components: {
-      vueDropzone: vue2Dropzone
-    },
-
-    data() {
-      return {
-        dropzoneOptions: {
-          url: 'https://httpbin.org/post',
-          thumbnailWidth: 100,
-          maxFilesize: 0.5,
-          language: {
-            dictDefaultMessage: 'Halo Dropzone'
-          }
-        }
-      }
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-  @import '@/styles/_variables.scss';
-
-  .student-entry {
-    margin-bottom: 2em;
-
-    &__input {
-      display: block;
-      width: 100%;
-      border-radius: 3px;
-      border: 1px solid #DBDBDB;
-      padding: 13px;
-      box-shadow: inset 0 1px 4px 0 rgba(0, 0, 0, 0.15);
-      box-sizing: border-box;
-      line-height: 1.5;
-      margin-bottom: 12px;
-    }
-
-    &__dropzone-dummy {
-      padding: 15px;
-      border: 1px dashed #C5C5C5;
-      font-family: $sans-serif-font-family;
-      font-weight: 500;
-      margin-bottom: 12px;
-      border-radius: 3px;
-      opacity: 0.6;
-    }
-
-    &__submit {
-    }
-  }
-</style>
diff --git a/client/src/components/content-forms/AssignmentForm.vue b/client/src/components/content-forms/AssignmentForm.vue
index bb8d3e3b..d784e97d 100644
--- a/client/src/components/content-forms/AssignmentForm.vue
+++ b/client/src/components/content-forms/AssignmentForm.vue
@@ -1,17 +1,17 @@
 <template>
-  <div class="exercise-form">
-    <input class="exercise-form__title skillbox-input"
+  <div class="assignment-form">
+    <input class="assignment-form__title skillbox-input"
            placeholder="Aufgabentitel"
            :value="value.title"
            v-on:input="$emit('assignment-change-title', $event.target.value, index)"
     >
-    <textarea class="exercise-form__exercise-text skillbox-textarea"
+    <textarea class="assignment-form__exercise-text skillbox-textarea"
               placeholder="Aufgabe erfassen..."
               :value="value.assignment"
               v-on:input="$emit('assignment-change-assignment', $event.target.value, index)"
     ></textarea>
-    <info-icon class="exercise-form__help-icon help-text__icon"></info-icon>
-    <p class="exercise-form__help-description help-text__description">
+    <info-icon class="assignment-form__help-icon help-text__icon"></info-icon>
+    <p class="assignment-form__help-description help-text__description">
       Ein Eingabefeld für die Antwort wird automatisch hinzugefügt.
     </p>
   </div>
@@ -31,7 +31,7 @@
 <style scoped lang="scss">
   @import "@/styles/_variables.scss";
 
-  .exercise-form {
+  .assignment-form {
     display: grid;
     grid-auto-rows: auto;
     grid-row-gap: 13px;