diff --git a/rapids/serializers.py b/rapids/serializers.py
index 31c83149..1d632a29 100644
--- a/rapids/serializers.py
+++ b/rapids/serializers.py
@@ -16,7 +16,7 @@ class QuestionAnswerSerializer(serializers.HyperlinkedModelSerializer):
         fields = ('id', 'question', 'answer', "answer_compare", "status")
         permission_classes = [permissions.IsAuthenticated]
 
-class QuestionSerializer(serializers.ModelSerializer):
+class RapidSerializer(serializers.ModelSerializer):
     class Meta:
         model = Rapid
         fields = ('id', 'question', 'normal', "abnormality", "region", "examination", "exams", "author", "open_access")
diff --git a/rapids/views.py b/rapids/views.py
index e3700cb4..098a9b45 100755
--- a/rapids/views.py
+++ b/rapids/views.py
@@ -69,7 +69,7 @@ from rapids.models import RapidCreationDefault
 
 from rest_framework import viewsets
 
-from .serializers import ExamSerializer, QuestionAnswerSerializer, QuestionSerializer
+from .serializers import ExamSerializer, QuestionAnswerSerializer, RapidSerializer
 
 from generic.mixins import SuperuserRequiredMixin
 
@@ -964,6 +964,6 @@ class QuestionAnswerViewSet(viewsets.ModelViewSet):
     queryset = Answer.objects.all()#.order_by('name')
     serializer_class = QuestionAnswerSerializer
 
-class QuestionViewSet(viewsets.ModelViewSet):
+class RapidViewSet(viewsets.ModelViewSet):
     queryset = Rapid.objects.all()#.order_by('name')
-    serializer_class = QuestionSerializer
\ No newline at end of file
+    serializer_class = RapidSerializer
\ No newline at end of file