diff --git a/allianceauth/services/modules/teamspeak3/templates/admin/teamspeak3/authts/change_list.html b/allianceauth/services/modules/teamspeak3/templates/admin/teamspeak3/authts/change_list.html
index 2e157736..49df399f 100644
--- a/allianceauth/services/modules/teamspeak3/templates/admin/teamspeak3/authts/change_list.html
+++ b/allianceauth/services/modules/teamspeak3/templates/admin/teamspeak3/authts/change_list.html
@@ -5,7 +5,7 @@
 {{ block.super }}
 <li>
     <a href="{% url 'teamspeak3:admin_update_ts3_groups' %}" class="btn btn-high">
-        {% translate "Update TS3 groups" %}
+        {% translate "Update TeamSpeak3 groups" %}
     </a>
 </li>
 {% endblock %}
diff --git a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
index c77fcc23..dbe61c28 100644
--- a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
+++ b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
@@ -2,12 +2,12 @@
 {% load bootstrap %}
 {% load i18n %}
 
-{% block page_title %}{% translate "Verify Teamspeak" %}{% endblock page_title %}
+{% block page_title %}{% translate "Verify TeamSpeak3" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
 
 {% block content %}
     <div class="col-lg-12">
-        <h1 class="page-header text-center">{% translate "Verify Teamspeak Identity" %}</h1>
+        <h1 class="page-header text-center">{% translate "Verify TeamSpeak3 Identity" %}</h1>
         <div class="container-fluid">
             <div class="col-md-4 col-md-offset-4">
                 <a href="ts3server://{{ public_url }}?token={{ authinfo.teamspeak3_perm_key }}&nickname={{ authinfo.teamspeak3_uid }}" class="btn btn-primary btn-block btn-lg" title="Join">{% translate "Join Server" %}</a>
diff --git a/allianceauth/services/modules/teamspeak3/views.py b/allianceauth/services/modules/teamspeak3/views.py
index e54bd84b..be6d7cd3 100644
--- a/allianceauth/services/modules/teamspeak3/views.py
+++ b/allianceauth/services/modules/teamspeak3/views.py
@@ -24,17 +24,17 @@ def activate_teamspeak3(request):
 
     character = request.user.profile.main_character
     with Teamspeak3Manager() as ts3man:
-        logger.debug(f"Adding TS3 user for user {request.user} with main character {character}")
+        logger.debug(f"Adding TeamSpeak3 user for user {request.user} with main character {character}")
         result = ts3man.add_user(request.user, Teamspeak3Tasks.get_username(request.user))
 
     # if its empty we failed
     if result[0] != "":
         Teamspeak3User.objects.update_or_create(user=request.user, defaults={'uid': result[0], 'perm_key': result[1]})
-        logger.debug("Updated authserviceinfo for user %s with TS3 credentials. Updating groups." % request.user)
-        logger.info("Successfully activated TS3 for user %s" % request.user)
+        logger.debug("Updated authserviceinfo for user %s with TeamSpeak3 credentials. Updating groups." % request.user)
+        logger.info("Successfully activated TeamSpeak3 for user %s" % request.user)
         messages.success(request, _('Activated TeamSpeak3 account.'))
         return redirect("teamspeak3:verify")
-    logger.error("Unsuccessful attempt to activate TS3 for user %s" % request.user)
+    logger.error("Unsuccessful attempt to activate TeamSpeak3 for user %s" % request.user)
     messages.error(request, _('An error occurred while processing your TeamSpeak3 account.'))
     return redirect("services:services")
 
@@ -67,10 +67,10 @@ def verify_teamspeak3(request):
 def deactivate_teamspeak3(request):
     logger.debug("deactivate_teamspeak3 called by user %s" % request.user)
     if Teamspeak3Tasks.has_account(request.user) and Teamspeak3Tasks.delete_user(request.user):
-        logger.info("Successfully deactivated TS3 for user %s" % request.user)
+        logger.info("Successfully deactivated TeamSpeak3 for user %s" % request.user)
         messages.success(request, _('Deactivated TeamSpeak3 account.'))
     else:
-        logger.error("Unsuccessful attempt to deactivate TS3 for user %s" % request.user)
+        logger.error("Unsuccessful attempt to deactivate TeamSpeak3 for user %s" % request.user)
         messages.error(request, _('An error occurred while processing your TeamSpeak3 account.'))
     return redirect("services:services")
 
@@ -81,7 +81,7 @@ def reset_teamspeak3_perm(request):
     logger.debug("reset_teamspeak3_perm called by user %s" % request.user)
     if not Teamspeak3Tasks.has_account(request.user):
         return redirect("services:services")
-    logger.debug("Deleting TS3 user for user %s" % request.user)
+    logger.debug("Deleting TeamSpeak3 user for user %s" % request.user)
     with Teamspeak3Manager() as ts3man:
         ts3man.delete_user(request.user.teamspeak3.uid)
 
@@ -91,12 +91,12 @@ def reset_teamspeak3_perm(request):
     # if blank we failed
     if result[0] != "":
         Teamspeak3User.objects.update_or_create(user=request.user, defaults={'uid': result[0], 'perm_key': result[1]})
-        logger.debug("Updated authserviceinfo for user %s with TS3 credentials. Updating groups." % request.user)
+        logger.debug("Updated authserviceinfo for user %s with TeamSpeak3 credentials. Updating groups." % request.user)
         Teamspeak3Tasks.update_groups.delay(request.user.pk)
-        logger.info("Successfully reset TS3 permission key for user %s" % request.user)
+        logger.info("Successfully reset TeamSpeak3 permission key for user %s" % request.user)
         messages.success(request, _('Reset TeamSpeak3 permission key.'))
     else:
-        logger.error("Unsuccessful attempt to reset TS3 permission key for user %s" % request.user)
+        logger.error("Unsuccessful attempt to reset TeamSpeak3 permission key for user %s" % request.user)
         messages.error(request, _('An error occurred while processing your TeamSpeak3 account.'))
     return redirect("services:services")
 
@@ -105,5 +105,5 @@ def reset_teamspeak3_perm(request):
 @staff_member_required
 def admin_update_ts3_groups(request):
     Teamspeak3Tasks.run_ts3_group_update.delay()
-    messages.info(request, "Started updating TS3 server groups...")
+    messages.info(request, "Started updating TeamSpeak3 server groups...")
     return redirect("admin:teamspeak3_authts_changelist")