diff --git a/anatomy/templates/anatomy/base.html b/anatomy/templates/anatomy/base.html
index 35770640..c1102cc7 100644
--- a/anatomy/templates/anatomy/base.html
+++ b/anatomy/templates/anatomy/base.html
@@ -10,7 +10,7 @@ Anatomy:
 <a href="{% url 'anatomy:index' %}">Packets</a> /
 <a href="{% url 'anatomy:exam_list' %}">Exams</a> /
 <a href="{% url 'anatomy:exam_create' %}" title="Create a new exam">Create Exam</a> / 
-<a href="{% url 'anatomy:anatomy_question_view' %}">Questions</a> /
+<a href="{% url 'anatomy:question_list' %}">Questions</a> /
 <a href="{% url 'anatomy:anatomy_question_create' %}" title="Create a new question">Create Question</a>
 {% if request.user.is_superuser %}
  / <a href="{% url 'anatomy:user_answer_table_view' %}" title="User answers">Answers</a>
diff --git a/anatomy/urls.py b/anatomy/urls.py
index 49f42bfe..d5212467 100644
--- a/anatomy/urls.py
+++ b/anatomy/urls.py
@@ -10,7 +10,7 @@ urlpatterns = [
     path(
         "question/",
         cache_page(60 * 1)(views.AnatomyQuestionView.as_view()),
-        name="anatomy_question_view",
+        name="question_list",
     ),
     path("question/<int:pk>/", views.GenericViews.question_detail, name="question_detail"),
     path(
diff --git a/anatomy/views.py b/anatomy/views.py
index e172f604..cc23afe9 100644
--- a/anatomy/views.py
+++ b/anatomy/views.py
@@ -945,17 +945,10 @@ def get_structure_id(request):
 class AnatomyQuestionView(LoginRequiredMixin, SingleTableMixin, FilterView):
     model = AnatomyQuestion
     table_class = AnatomyQuestionTable
-    template_name = "anatomy/anatomy_question_view.html"
+    template_name = "anatomy/question_list.html"
 
     filterset_class = AnatomyQuestionFilter
 
-class UserAnswerTableView(LoginRequiredMixin, SingleTableMixin, FilterView):
-    model = CidUserAnswer
-    table_class = AnatomyUserAnswerTable
-    template_name = "anatomy/user_answer_question_view.html"
-
-    filterset_class = AnatomyUserAnswerFilter
-
 @user_is_author_or_anatomy_checker
 def question_save_annotation(request, pk):
     if request.is_ajax() and request.method == "POST":
@@ -977,15 +970,23 @@ AnatomyExamViews = ExamViews(Exam, AnatomyQuestion, "anatomy", "anatomy", loadJs
 class UserAnswerView(LoginRequiredMixin, DetailView):
     model = CidUserAnswer
 
+class UserAnswerTableView(LoginRequiredMixin, SingleTableMixin, FilterView):
+    model = CidUserAnswer
+    table_class = AnatomyUserAnswerTable
+    template_name = "anatomy/user_answer_question_view.html"
+
+    filterset_class = AnatomyUserAnswerFilter
+
+
 
 class UserAnswerDelete(SuperuserRequiredMixin, DeleteView):
     model = CidUserAnswer
     template_name = "user_answer_delete.html"
-    success_url = reverse_lazy("anatomy:anatomy_user_answer_view")
+    success_url = reverse_lazy("anatomy:user_answer_table_view")
 
 class QuestionDelete(AuthorOrCheckerRequiredMixin, DeleteView):
     model = AnatomyQuestion
-    success_url = reverse_lazy("anatomy:anatomy_question_view")
+    success_url = reverse_lazy("anatomy:question_list")
 
 class ExamCreate(RevisionMixin, LoginRequiredMixin, CreateView):
     model = Exam