diff --git a/src/main/java/de/thm/arsnova/entities/Content.java b/src/main/java/de/thm/arsnova/entities/Content.java
index f716d21239f6e4664835c9bd73c63c8d37a7f5df..0b1b145e5138087c28c89f65b0d19b24ee339dd7 100644
--- a/src/main/java/de/thm/arsnova/entities/Content.java
+++ b/src/main/java/de/thm/arsnova/entities/Content.java
@@ -12,7 +12,8 @@ import java.util.Objects;
 @JsonTypeInfo(
 		use = JsonTypeInfo.Id.MINIMAL_CLASS,
 		include = JsonTypeInfo.As.PROPERTY,
-		property = "type"
+		property = "format",
+		visible = true
 )
 public class Content extends Entity {
 	public enum Format {
diff --git a/src/main/java/de/thm/arsnova/entities/serialization/CouchDbDocumentModule.java b/src/main/java/de/thm/arsnova/entities/serialization/CouchDbDocumentModule.java
index a99adbf9711bf6b297ad3f5350e454a4624e54ea..7584b1556dfb262231de5d419b02be36a4c344da 100644
--- a/src/main/java/de/thm/arsnova/entities/serialization/CouchDbDocumentModule.java
+++ b/src/main/java/de/thm/arsnova/entities/serialization/CouchDbDocumentModule.java
@@ -36,8 +36,12 @@ public class CouchDbDocumentModule extends SimpleModule {
 		context.setMixInAnnotations(Entity.class, CouchDbDocumentMixIn.class);
 		context.setMixInAnnotations(de.thm.arsnova.entities.migration.v2.Entity.class, CouchDbDocumentV2MixIn.class);
 		context.registerSubtypes(
-				new NamedType(Content.class, Content.class.getSimpleName()),
-				new NamedType(ChoiceQuestionContent.class, ChoiceQuestionContent.class.getSimpleName()),
+				new NamedType(Content.class, Content.Format.TEXT.toString()),
+				new NamedType(Content.class, Content.Format.NUMBER.toString()),
+				new NamedType(ChoiceQuestionContent.class, Content.Format.CHOICE.toString()),
+				new NamedType(ChoiceQuestionContent.class, Content.Format.BINARY.toString()),
+				new NamedType(ChoiceQuestionContent.class, Content.Format.SCALE.toString()),
+				new NamedType(ChoiceQuestionContent.class, Content.Format.GRID.toString()),
 				new NamedType(Answer.class, Answer.class.getSimpleName()),
 				new NamedType(ChoiceAnswer.class, ChoiceAnswer.class.getSimpleName()),
 				new NamedType(TextAnswer.class, TextAnswer.class.getSimpleName()));