diff --git a/pretix_matrix_inviter/forms.py b/pretix_matrix_inviter/forms.py
index 37a139d016b8fa86608be397fda4104526a6b04e..ce4def826ca0c74c077b116dbf94df29d250012b 100644
--- a/pretix_matrix_inviter/forms.py
+++ b/pretix_matrix_inviter/forms.py
@@ -11,7 +11,7 @@ from pretix.base.forms import SettingsForm
 from .helpers import matrix_room_info_for_event
 
 
-class MatrixInviterForm(SettingsForm):
+class MatrixInviterSettingsForm(SettingsForm):
     matrix_inviter_items = MultipleChoiceField(
         widget=CheckboxSelectMultiple(attrs={"class": "scrolling-multiple-choice"}),
         label=gettext_lazy("Ask Matrix ID for"),
diff --git a/pretix_matrix_inviter/signals.py b/pretix_matrix_inviter/signals.py
index 9cc033a1d1558e510527063d9aafa74241388962..b441167adb753df9b467e622298eebcff2abc42c 100644
--- a/pretix_matrix_inviter/signals.py
+++ b/pretix_matrix_inviter/signals.py
@@ -130,7 +130,7 @@ def matrix_inviter_kick_async(sender, order, **kwargs):
 
 
 @receiver(nav_event_settings, dispatch_uid="matrix_inviter_nav_settings")
-def navbar_settings(sender, request=None, **kwargs):
+def navbar_settings(sender, request, **kwargs):
     url = resolve(request.path_info)
     return [
         {
diff --git a/pretix_matrix_inviter/templates/pretix_matrix_inviter/settings.html b/pretix_matrix_inviter/templates/pretix_matrix_inviter/settings.html
index 27c5241ef8094077b39e505d530119c3117f683b..c2e41112ec67b514c160d4e73880747b0b19a150 100644
--- a/pretix_matrix_inviter/templates/pretix_matrix_inviter/settings.html
+++ b/pretix_matrix_inviter/templates/pretix_matrix_inviter/settings.html
@@ -7,7 +7,7 @@
     <form action="" method="post" class="form-horizontal">
         {% csrf_token %}
         <fieldset>
-            <legend>{% trans "Matrix inviter settings" %}</legend>
+            <legend>{% trans "Settings" %}</legend>
             {% bootstrap_form form layout="horizontal" %}
         </fieldset>
         <div class="form-group submit-group">
diff --git a/pretix_matrix_inviter/urls.py b/pretix_matrix_inviter/urls.py
index c87e9a08e383972cc794bee3864ce92e823a5aa3..f8d7e8edfec110445f7ff402dc7b2f564ba72bf2 100644
--- a/pretix_matrix_inviter/urls.py
+++ b/pretix_matrix_inviter/urls.py
@@ -1,11 +1,11 @@
 from django.urls import path
 
-from .views import MatrixInviterView
+from .views import MatrixInviterSettingsView
 
 urlpatterns = [
     path(
         "control/event/<str:organizer>/<str:event>/matrix_inviter/",
-        MatrixInviterView.as_view(),
+        MatrixInviterSettingsView.as_view(),
         name="settings",
     )
 ]
diff --git a/pretix_matrix_inviter/views.py b/pretix_matrix_inviter/views.py
index 92c5a72ccf399887093a9814e27bc5240c866d62..da2d490e414a17d24f3c6e903a65b3154c297ee8 100644
--- a/pretix_matrix_inviter/views.py
+++ b/pretix_matrix_inviter/views.py
@@ -2,13 +2,13 @@ from django.urls import reverse
 from pretix.base.models import Event
 from pretix.control.views.event import EventSettingsFormView, EventSettingsViewMixin
 
-from .forms import MatrixInviterForm
+from .forms import MatrixInviterSettingsForm
 
 
-class MatrixInviterView(EventSettingsViewMixin, EventSettingsFormView):
+class MatrixInviterSettingsView(EventSettingsViewMixin, EventSettingsFormView):
     model = Event
     permission = "can_change_settings"
-    form_class = MatrixInviterForm
+    form_class = MatrixInviterSettingsForm
     template_name = "pretix_matrix_inviter/settings.html"
 
     def get_success_url(self, **kwargs):