diff --git a/components/ReportModal.vue b/components/ReportModal.vue
index a195d1674..5e374e346 100644
--- a/components/ReportModal.vue
+++ b/components/ReportModal.vue
@@ -19,7 +19,7 @@
     </transition>
 
     <!-- eslint-disable-next-line vue/no-v-html -->
-    <p v-html="$t(`report.${data.context}.message`, { name: name })" />
+    <p v-html="message" />
 
     <template
       slot="footer"
@@ -67,8 +67,13 @@ export default {
       return this.$store.getters['modal/data'] || {}
     },
     title() {
+      if (!this.data.context) return ''
       return this.$t(`report.${this.data.context}.title`)
     },
+    message() {
+      if (!this.data.context) return ''
+      return this.$t(`report.${this.data.context}.message`, { name: this.name })
+    },
     name() {
       return this.$filters.truncate(this.data.name, 30)
     },
diff --git a/cypress/integration/common/report.js b/cypress/integration/common/report.js
index 985a62af1..6adeb1759 100644
--- a/cypress/integration/common/report.js
+++ b/cypress/integration/common/report.js
@@ -128,7 +128,7 @@ Given('somebody reported the following posts:', table => {
       .authenticateAs(submitter)
       .create('Report', {
         id,
-        description: "Offensive content"
+        description: 'Offensive content'
       })
   })
 })
diff --git a/graphql/ModerationListQuery.js b/graphql/ModerationListQuery.js
index 6126521cc..8ae827d7f 100644
--- a/graphql/ModerationListQuery.js
+++ b/graphql/ModerationListQuery.js
@@ -8,7 +8,7 @@ export default app => {
         description
         type
         createdAt
-        reporter {
+        submitter {
           name
           slug
         }
@@ -27,7 +27,7 @@ export default app => {
             slug
           }
         }
-        contribution {
+        post {
           title
           slug
           author {
diff --git a/locales/de.json b/locales/de.json
index b3e6289ac..93b6f34e6 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -98,7 +98,7 @@
     "reports": {
       "empty": "Glückwunsch, es gibt nichts zu moderieren.",
       "name": "Meldungen",
-      "reporter": "gemeldet von"
+      "submitter": "gemeldet von"
     }
   },
   "contribution": {
diff --git a/locales/en.json b/locales/en.json
index 78b7ab433..3102972d3 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -98,7 +98,7 @@
     "reports": {
       "empty": "Congratulations, nothing to moderate.",
       "name": "Reports",
-      "reporter": "reported by"
+      "submitter": "reported by"
     }
   },
   "contribution": {
diff --git a/pages/moderation/index.vue b/pages/moderation/index.vue
index 995c9d560..209f8dcba 100644
--- a/pages/moderation/index.vue
+++ b/pages/moderation/index.vue
@@ -13,18 +13,18 @@
         slot="name"
         slot-scope="scope"
       >
-        <div v-if="scope.row.type === 'contribution'">
-          <nuxt-link :to="{ name: 'post-slug', params: { slug: scope.row.contribution.slug } }">
-            <b>{{ scope.row.contribution.title | truncate(50) }}</b>
+        <div v-if="scope.row.type === 'Post'">
+          <nuxt-link :to="{ name: 'post-slug', params: { slug: scope.row.post.slug } }">
+            <b>{{ scope.row.post.title | truncate(50) }}</b>
           </nuxt-link><br>
           <ds-text
             size="small"
             color="soft"
           >
-            {{ scope.row.contribution.author.name }}
+            {{ scope.row.post.author.name }}
           </ds-text>
         </div>
-        <div v-else-if="scope.row.type === 'comment'">
+        <div v-else-if="scope.row.type === 'Comment'">
           <nuxt-link :to="{ name: 'post-slug', params: { slug: scope.row.comment.post.slug } }">
             <b>{{ scope.row.comment.contentExcerpt | truncate(50) }}</b>
           </nuxt-link><br>
@@ -49,28 +49,28 @@
           color="soft"
         >
           <ds-icon
-            v-if="scope.row.type === 'contribution'"
-            v-tooltip="{ content: $t(`report.${scope.row.type}.type`), placement: 'right' }"
+            v-if="scope.row.type === 'Post'"
+            v-tooltip="{ content: $t('report.contribution.type'), placement: 'right' }"
             name="bookmark"
           />
           <ds-icon
-            v-else-if="scope.row.type === 'comment'"
-            v-tooltip="{ content: $t(`report.${scope.row.type}.type`), placement: 'right' }"
+            v-else-if="scope.row.type === 'Comment'"
+            v-tooltip="{ content: $t('report.comment.type'), placement: 'right' }"
             name="comments"
           />
           <ds-icon
-            v-else
-            v-tooltip="{ content: $t(`report.${scope.row.type}.type`), placement: 'right' }"
+            v-else-if="scope.row.type === 'User'"
+            v-tooltip="{ content: $t('report.user.type'), placement: 'right' }"
             name="user"
           />
         </ds-text>
       </template>
       <template
-        slot="reporter"
+        slot="submitter"
         slot-scope="scope"
       >
-        <nuxt-link :to="{ name: 'profile-slug', params: { slug: scope.row.reporter.slug } }">
-          {{ scope.row.reporter.name }}
+        <nuxt-link :to="{ name: 'profile-slug', params: { slug: scope.row.submitter.slug } }">
+          {{ scope.row.submitter.name }}
         </nuxt-link>
       </template>
     </ds-table>
@@ -101,7 +101,7 @@ export default {
       return {
         type: ' ',
         name: ' ',
-        reporter: this.$t('moderation.reports.reporter')
+        submitter: this.$t('moderation.reports.submitter')
         // actions: ' '
       }
     }