diff --git a/data/languages/belarusian.txt b/data/languages/belarusian.txt
index 87d358696..1d09b472f 100644
--- a/data/languages/belarusian.txt
+++ b/data/languages/belarusian.txt
@@ -703,13 +703,13 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 
-Please enter your nick name below.
+Please enter your nickname below.
 == 
 
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/bosnian.txt b/data/languages/bosnian.txt
index d6e236761..c3d2bb809 100644
--- a/data/languages/bosnian.txt
+++ b/data/languages/bosnian.txt
@@ -697,7 +697,7 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == Preporučeno je da provjeriš i podesiš postavke najbolje za tebe prije nego uđeš na server.
 
-Please enter your nick name below.
+Please enter your nickname below.
 == Molimo unesite vaš nadimak dole.
 
 Destination file already exist
@@ -1147,7 +1147,7 @@ Debug mode enabled. Press Ctrl+Shift+D to disable debug mode.
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/brazilian_portuguese.txt b/data/languages/brazilian_portuguese.txt
index 706e6fd76..1fd6855bf 100644
--- a/data/languages/brazilian_portuguese.txt
+++ b/data/languages/brazilian_portuguese.txt
@@ -1149,7 +1149,7 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == É recomendado que você verifique as configurações para ajustá-las ao seu gosto antes de entrar em um servidor.
 
-Please enter your nick name below.
+Please enter your nickname below.
 == Por favor, insira seu apelido abaixo.
 
 Destination file already exist
@@ -1273,7 +1273,7 @@ Debug mode enabled. Press Ctrl+Shift+D to disable debug mode.
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/bulgarian.txt b/data/languages/bulgarian.txt
index 22391c37c..c0d81313b 100644
--- a/data/languages/bulgarian.txt
+++ b/data/languages/bulgarian.txt
@@ -700,13 +700,13 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 
-Please enter your nick name below.
+Please enter your nickname below.
 == 
 
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/catalan.txt b/data/languages/catalan.txt
index dd24a57e8..5a09d5786 100644
--- a/data/languages/catalan.txt
+++ b/data/languages/catalan.txt
@@ -1026,7 +1026,7 @@ Most importantly communication is key: There is no tutorial so you'll have to ch
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == És recomanat que miris la configuració i ho canviïs al teu gust abans d'entrar a un servidor.
 
-Please enter your nick name below.
+Please enter your nickname below.
 == Si us plau, escriu el teu nom a sota.
 
 Destination file already exist
@@ -1164,7 +1164,7 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/chuvash.txt b/data/languages/chuvash.txt
index acbf86a73..48a241e97 100644
--- a/data/languages/chuvash.txt
+++ b/data/languages/chuvash.txt
@@ -703,13 +703,13 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 
-Please enter your nick name below.
+Please enter your nickname below.
 == 
 
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/czech.txt b/data/languages/czech.txt
index 82f4ad895..bcfb9e436 100644
--- a/data/languages/czech.txt
+++ b/data/languages/czech.txt
@@ -706,13 +706,13 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 
-Please enter your nick name below.
+Please enter your nickname below.
 == 
 
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/danish.txt b/data/languages/danish.txt
index 5324f9a57..c59c9a4b4 100644
--- a/data/languages/danish.txt
+++ b/data/languages/danish.txt
@@ -703,13 +703,13 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 
-Please enter your nick name below.
+Please enter your nickname below.
 == 
 
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/dutch.txt b/data/languages/dutch.txt
index dfa96c3b5..157e745ff 100644
--- a/data/languages/dutch.txt
+++ b/data/languages/dutch.txt
@@ -703,7 +703,7 @@ Most importantly communication is key: There is no tutorial so you'll have to ch
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == Het wordt aangeraden dat je de instellingen bekijkt en ze aanpast naar jouw wensen voordat je met een server verbindt.
 
-Please enter your nick name below.
+Please enter your nickname below.
 == Voer je bijnaam in a.u.b.
 
 Destination file already exist
@@ -1176,7 +1176,7 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/finnish.txt b/data/languages/finnish.txt
index a3e4bfbc5..0f4464ace 100644
--- a/data/languages/finnish.txt
+++ b/data/languages/finnish.txt
@@ -704,13 +704,13 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 
-Please enter your nick name below.
+Please enter your nickname below.
 == 
 
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/french.txt b/data/languages/french.txt
index 8859f1186..0ce7e12e2 100644
--- a/data/languages/french.txt
+++ b/data/languages/french.txt
@@ -1166,7 +1166,7 @@ Most importantly communication is key: There is no tutorial so you'll have to ch
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == Il est recommandé d'ajuster les configurations à votre goût avant de rejoindre un serveur.
 
-Please enter your nick name below.
+Please enter your nickname below.
 == Veuillez entrer votre pseudonyme ci-dessous.
 
 Show DDNet map finishes in server browser
@@ -1284,7 +1284,7 @@ Debug mode enabled. Press Ctrl+Shift+D to disable debug mode.
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/german.txt b/data/languages/german.txt
index 8f1962e07..0dbf9eb9e 100644
--- a/data/languages/german.txt
+++ b/data/languages/german.txt
@@ -1135,7 +1135,7 @@ Personal best:
 Kill
 == Kill
 
-Please enter your nick name below.
+Please enter your nickname below.
 == Bitte gib deinen Spitznamen unten ein.
 
 The maps contain freeze, which temporarily make a tee unable to move. You have to work together to get through these parts.
@@ -1274,7 +1274,7 @@ Debug mode enabled. Press Ctrl+Shift+D to disable debug mode.
 Existing Player
 == Existierender Spieler
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == Dein Spitzname '%s' wird bereits genutzt (%d Punkte). Willst du ihn dennoch nutzen?
 
 Checking for existing player with your name
diff --git a/data/languages/greek.txt b/data/languages/greek.txt
index 47830d6b8..f712ca78e 100644
--- a/data/languages/greek.txt
+++ b/data/languages/greek.txt
@@ -706,13 +706,13 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 
-Please enter your nick name below.
+Please enter your nickname below.
 == 
 
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/hungarian.txt b/data/languages/hungarian.txt
index c9a0ee9c6..a9658495f 100644
--- a/data/languages/hungarian.txt
+++ b/data/languages/hungarian.txt
@@ -1122,7 +1122,7 @@ Most importantly communication is key: There is no tutorial so you'll have to ch
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == Ajánlott, hogy ellenőrizze a beállításokat, hogy a kedvéhez igazítsa őket, mielőtt csatlakozna egy szerverhez. (Tipp: szűrők)
 
-Please enter your nick name below.
+Please enter your nickname below.
 == Írja be lent a becenevét.
 
 9+ new mentions
@@ -1170,7 +1170,7 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/italian.txt b/data/languages/italian.txt
index a47e10c93..7ea1c9be0 100644
--- a/data/languages/italian.txt
+++ b/data/languages/italian.txt
@@ -755,13 +755,13 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 
-Please enter your nick name below.
+Please enter your nickname below.
 == 
 
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/japanese.txt b/data/languages/japanese.txt
index e1ad1ca39..83f20ec42 100644
--- a/data/languages/japanese.txt
+++ b/data/languages/japanese.txt
@@ -703,13 +703,13 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 
-Please enter your nick name below.
+Please enter your nickname below.
 == 
 
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/korean.txt b/data/languages/korean.txt
index 5de3fccb9..bc6b59cb0 100644
--- a/data/languages/korean.txt
+++ b/data/languages/korean.txt
@@ -702,13 +702,13 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 
-Please enter your nick name below.
+Please enter your nickname below.
 == 
 
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/kyrgyz.txt b/data/languages/kyrgyz.txt
index 505973a03..e5803a52c 100644
--- a/data/languages/kyrgyz.txt
+++ b/data/languages/kyrgyz.txt
@@ -697,13 +697,13 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 
-Please enter your nick name below.
+Please enter your nickname below.
 == 
 
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/norwegian.txt b/data/languages/norwegian.txt
index e74934e5b..9de7e071b 100644
--- a/data/languages/norwegian.txt
+++ b/data/languages/norwegian.txt
@@ -692,7 +692,7 @@ Most importantly communication is key: There is no tutorial so you'll have to ch
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == Det anbefales å sjekke innstillingene og justere dem slik det passer deg før du går inn på en server.
 
-Please enter your nick name below.
+Please enter your nickname below.
 == Skriv inn ditt ønskede kallenavn under.
 
 Destination file already exist
@@ -1172,7 +1172,7 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/persian.txt b/data/languages/persian.txt
index 0ef50a0e0..d5fe4d553 100644
--- a/data/languages/persian.txt
+++ b/data/languages/persian.txt
@@ -346,13 +346,13 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 
-Please enter your nick name below.
+Please enter your nickname below.
 == 
 
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/polish.txt b/data/languages/polish.txt
index 607694ab2..abcd5c6af 100644
--- a/data/languages/polish.txt
+++ b/data/languages/polish.txt
@@ -1143,7 +1143,7 @@ Most importantly communication is key: There is no tutorial so you'll have to ch
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == Przed wejściem na dowolny serwer zalecane jest sprawdzenie ustawień w celu dostosowania ich do własnych upodobań.
 
-Please enter your nick name below.
+Please enter your nickname below.
 == Proszę wpisać swój nick poniżej.
 
 Show DDNet map finishes in server browser
@@ -1176,7 +1176,7 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/portuguese.txt b/data/languages/portuguese.txt
index ba8286926..0be31aa59 100644
--- a/data/languages/portuguese.txt
+++ b/data/languages/portuguese.txt
@@ -938,13 +938,13 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 
-Please enter your nick name below.
+Please enter your nickname below.
 == 
 
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/romanian.txt b/data/languages/romanian.txt
index 64fc9e5c7..27c4d565c 100644
--- a/data/languages/romanian.txt
+++ b/data/languages/romanian.txt
@@ -712,13 +712,13 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 
-Please enter your nick name below.
+Please enter your nickname below.
 == 
 
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/russian.txt b/data/languages/russian.txt
index be53c28db..300ece713 100644
--- a/data/languages/russian.txt
+++ b/data/languages/russian.txt
@@ -868,7 +868,7 @@ Most importantly communication is key: There is no tutorial so you'll have to ch
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == Перед посещением сервера рекомендуем изменить настройки на Ваш вкус.
 
-Please enter your nick name below.
+Please enter your nickname below.
 == Пожалуйста, ниже укажите свой никнейм.
 
 Destination file already exist
@@ -1229,7 +1229,7 @@ Debug mode enabled. Press Ctrl+Shift+D to disable debug mode.
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/serbian.txt b/data/languages/serbian.txt
index 5c60ec8f7..dba638372 100644
--- a/data/languages/serbian.txt
+++ b/data/languages/serbian.txt
@@ -710,13 +710,13 @@ Most importantly communication is key: There is no tutorial so you'll have to ch
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 
-Please enter your nick name below.
+Please enter your nickname below.
 == 
 
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/serbian_cyrillic.txt b/data/languages/serbian_cyrillic.txt
index 29e1f97dd..add75c6c6 100644
--- a/data/languages/serbian_cyrillic.txt
+++ b/data/languages/serbian_cyrillic.txt
@@ -723,7 +723,7 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == Препоручује се да проверите подешавања како бисте их прилагодили пре него што се придружите серверу.
 
-Please enter your nick name below.
+Please enter your nickname below.
 == Молимо вас напишите ваш надимак испод.
 
 Country / Region
@@ -1253,7 +1253,7 @@ Debug mode enabled. Press Ctrl+Shift+D to disable debug mode.
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/simplified_chinese.txt b/data/languages/simplified_chinese.txt
index f11b69df6..02eb2d435 100644
--- a/data/languages/simplified_chinese.txt
+++ b/data/languages/simplified_chinese.txt
@@ -1128,7 +1128,7 @@ Most importantly communication is key: There is no tutorial so you'll have to ch
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 推荐在进入服务器前，先将设置调整到符合你的习惯。
 
-Please enter your nick name below.
+Please enter your nickname below.
 == 请输入你的昵称。
 
 Render
@@ -1219,7 +1219,7 @@ Debug mode enabled. Press Ctrl+Shift+D to disable debug mode.
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/slovak.txt b/data/languages/slovak.txt
index 9cbf3c182..7e0a10151 100644
--- a/data/languages/slovak.txt
+++ b/data/languages/slovak.txt
@@ -703,13 +703,13 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 
 
-Please enter your nick name below.
+Please enter your nickname below.
 == 
 
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/spanish.txt b/data/languages/spanish.txt
index 6bc4dcd89..fa959cc25 100644
--- a/data/languages/spanish.txt
+++ b/data/languages/spanish.txt
@@ -700,7 +700,7 @@ Most importantly communication is key: There is no tutorial so you'll have to ch
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == Se recomienda que verifiques la configuración para ajustarla a tu gusto antes de unirte a un servidor.
 
-Please enter your nick name below.
+Please enter your nickname below.
 == Por favor, introduzca su apodo a continuación.
 
 Destination file already exist
@@ -1177,7 +1177,7 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/swedish.txt b/data/languages/swedish.txt
index e8d625c64..d2d32365b 100644
--- a/data/languages/swedish.txt
+++ b/data/languages/swedish.txt
@@ -769,7 +769,7 @@ Most importantly communication is key: There is no tutorial so you'll have to ch
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == Det är rekomenderad att du kollar igenom inställningarna och ändra dom så de passar dig innan du ansluter dig till en server.
 
-Please enter your nick name below.
+Please enter your nickname below.
 == Skriv ditt smeknamn nedanför.
 
 Render
@@ -1226,7 +1226,7 @@ Debug mode enabled. Press Ctrl+Shift+D to disable debug mode.
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/traditional_chinese.txt b/data/languages/traditional_chinese.txt
index 482744647..70598b8d9 100644
--- a/data/languages/traditional_chinese.txt
+++ b/data/languages/traditional_chinese.txt
@@ -1122,7 +1122,7 @@ Most importantly communication is key: There is no tutorial so you'll have to ch
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 推薦在進入伺服器前，先將設定調整到符合你的習慣。
 
-Please enter your nick name below.
+Please enter your nickname below.
 == 請輸入你的暱稱。
 
 Render
@@ -1185,7 +1185,7 @@ Debug mode enabled. Press Ctrl+Shift+D to disable debug mode.
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/turkish.txt b/data/languages/turkish.txt
index bcfea526d..595d0ab55 100644
--- a/data/languages/turkish.txt
+++ b/data/languages/turkish.txt
@@ -696,7 +696,7 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == Sunuculara bağlanmadan önce ayarları kontrol edip kendine göre düzenlemeni öneriyoruz.
 
-Please enter your nick name below.
+Please enter your nickname below.
 == Lütfen takma adı girin.
 
 Destination file already exist
@@ -1179,7 +1179,7 @@ Debug mode enabled. Press Ctrl+Shift+D to disable debug mode.
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/data/languages/ukrainian.txt b/data/languages/ukrainian.txt
index 81b3a6e77..8ce1535c4 100644
--- a/data/languages/ukrainian.txt
+++ b/data/languages/ukrainian.txt
@@ -538,7 +538,7 @@ Most importantly communication is key: There is no tutorial so you'll have to ch
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == Рекомендується перевірити налаштування, щоб підлаштувати їх до душі перед тим, як приєднатися до сервера.
 
-Please enter your nick name below.
+Please enter your nickname below.
 == Будь ласка, введіть свій нікнейм нижче
 
 There's an unsaved map in the editor, you might want to save it before you quit the game.
@@ -1171,7 +1171,7 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
 Existing Player
 == 
 
-Your nick name '%s' is already used (%d points). Do you still want to use it?
+Your nickname '%s' is already used (%d points). Do you still want to use it?
 == 
 
 Checking for existing player with your name
diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp
index ba022acf6..27bfd4464 100644
--- a/src/engine/server/server.cpp
+++ b/src/engine/server/server.cpp
@@ -3406,8 +3406,8 @@ void CServer::RegisterCommands()
 	Console()->Register("auth_remove", "s[ident]", CFGFLAG_SERVER | CFGFLAG_NONTEEHISTORIC, ConAuthRemove, this, "Remove a rcon key");
 	Console()->Register("auth_list", "", CFGFLAG_SERVER, ConAuthList, this, "List all rcon keys");
 
-	Console()->Register("name_ban", "s[name] ?i[distance] ?i[is_substring] ?r[reason]", CFGFLAG_SERVER, ConNameBan, this, "Ban a certain nick name");
-	Console()->Register("name_unban", "s[name]", CFGFLAG_SERVER, ConNameUnban, this, "Unban a certain nick name");
+	Console()->Register("name_ban", "s[name] ?i[distance] ?i[is_substring] ?r[reason]", CFGFLAG_SERVER, ConNameBan, this, "Ban a certain nickname");
+	Console()->Register("name_unban", "s[name]", CFGFLAG_SERVER, ConNameUnban, this, "Unban a certain nickname");
 	Console()->Register("name_bans", "", CFGFLAG_SERVER, ConNameBans, this, "List all name bans");
 
 	Console()->Chain("sv_name", ConchainSpecialInfoupdate, this);
diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp
index adedc49a7..7746164c6 100644
--- a/src/game/client/components/menus.cpp
+++ b/src/game/client/components/menus.cpp
@@ -1419,7 +1419,7 @@ int CMenus::Render()
 				Localize("Most importantly communication is key: There is no tutorial so you'll have to chat (t key) with other players to learn the basics and tricks of the game."),
 				Localize("Use k key to kill (restart), q to pause and watch other players. See settings for other key binds."),
 				Localize("It's recommended that you check the settings to adjust them to your liking before joining a server."),
-				Localize("Please enter your nick name below."));
+				Localize("Please enter your nickname below."));
 			pExtraText = aBuf;
 			pButtonText = Localize("Ok");
 			ExtraAlign = -1;
@@ -1429,7 +1429,7 @@ int CMenus::Render()
 			pTitle = Localize("Existing Player");
 			if(Client()->m_Points > 50)
 			{
-				str_format(aBuf, sizeof(aBuf), Localize("Your nick name '%s' is already used (%d points). Do you still want to use it?"), Client()->PlayerName(), Client()->m_Points);
+				str_format(aBuf, sizeof(aBuf), Localize("Your nickname '%s' is already used (%d points). Do you still want to use it?"), Client()->PlayerName(), Client()->m_Points);
 				pExtraText = aBuf;
 			}
 			else if(Client()->m_Points >= 0)