diff --git a/src/de/steamwar/bungeecore/BungeeCore.java b/src/de/steamwar/bungeecore/BungeeCore.java
index 1e3db217..a367b5de 100644
--- a/src/de/steamwar/bungeecore/BungeeCore.java
+++ b/src/de/steamwar/bungeecore/BungeeCore.java
@@ -135,7 +135,7 @@ public class BungeeCore extends Plugin {
         new PunishmentCommand("noschemsubmitting", Punishment.PunishmentType.NoSchemSubmitting);
         new PunishmentCommand("nodev", Punishment.PunishmentType.NoDevServer);
         new PunishmentCommand("nofight", Punishment.PunishmentType.NoFightServer);
-        new PunishmentCommand("noteamserver", Punishment.PunishmentType.NoTeamServerSet);
+        new PunishmentCommand("noteamserver", Punishment.PunishmentType.NoTeamServer);
         new PunishmentCommand("note", Punishment.PunishmentType.Note);
 
         if(!EVENT_MODE){
diff --git a/src/de/steamwar/bungeecore/commands/TeamCommand.java b/src/de/steamwar/bungeecore/commands/TeamCommand.java
index d81110da..20b4b955 100644
--- a/src/de/steamwar/bungeecore/commands/TeamCommand.java
+++ b/src/de/steamwar/bungeecore/commands/TeamCommand.java
@@ -592,7 +592,7 @@ public class TeamCommand extends BasicCommand {
     private void server(ProxiedPlayer player, SteamwarUser user, Team team, String[] args){
         if(notLeader(player, user, team))
             return;
-        if (user.isPunishedWithMessage(ChatSender.of(player), Punishment.PunishmentType.NoTeamServerSet)) {
+        if (user.isPunishedWithMessage(ChatSender.of(player), Punishment.PunishmentType.NoTeamServer)) {
             return;
         }
         if (args.length < 2) {
diff --git a/src/de/steamwar/bungeecore/sql/Punishment.java b/src/de/steamwar/bungeecore/sql/Punishment.java
index e320d736..a2a10853 100644
--- a/src/de/steamwar/bungeecore/sql/Punishment.java
+++ b/src/de/steamwar/bungeecore/sql/Punishment.java
@@ -144,7 +144,7 @@ public class Punishment {
         NoSchemSubmitting(true, "NOSCHEMSUBMITTING_TEAM", "NOSCHEMSUBMITTING_PERMA", "NOSCHEMSUBMITTING_UNTIL", "UNNOSCHEMSUBMITTING_ERROR", "UNNOSCHEMSUBMITTING"),
         NoDevServer(true, "NODEVSERVER_TEAM", "NODEVSERVER_PERMA", "NODEVSERVER_UNTIL", "UNNODEVSERVER_ERROR", "UNNODEVSERVER"),
         NoFightServer(false, "NOFIGHTSERVER_TEAM", "NOFIGHTSERVER_PERMA", "NOFIGHTSERVER_UNTIL", "UNNOFIGHTSERVER_ERROR", "UNNOFIGHTSERVER"),
-        NoTeamServerSet(true, "NOTEAMSERVERSET_TEAM", "NOTEAMSERVERSET_PERMA", "NOTEAMSERVERSET_UNTIL", "UNNOTEAMSERVERSET_ERROR", "UNNOTEAMSERVERSET"),
+        NoTeamServer(true, "NOTEAMSERVER_TEAM", "NOTEAMSERVER_PERMA", "NOTEAMSERVER_UNTIL", "UNNOTEAMSERVER_ERROR", "UNNOTEAMSERVER"),
         Note(false, "NOTE_TEAM", null, null, null, null, true),
         ;
 
diff --git a/src/de/steamwar/messages/BungeeCore.properties b/src/de/steamwar/messages/BungeeCore.properties
index 3dd97041..ee300bf1 100644
--- a/src/de/steamwar/messages/BungeeCore.properties
+++ b/src/de/steamwar/messages/BungeeCore.properties
@@ -162,11 +162,11 @@ NOFIGHTSERVER_UNTIL=§7Du bist §ebis zum {0} §7vom §e§lKämpfen§7 ausgeschl
 UNNOFIGHTSERVER_ERROR=§cDer Spieler ist nicht vom Kämpfen ausgeschlossen.
 UNNOFIGHTSERVER=§e{0} §7darf nun wieder §e§lKämpfen§7 beitreten§8.
 
-NOTEAMSERVERSET_TEAM={0} §e{1} §7wurde von §e{2} {3} §7vom §e§lTeamserver§7 setzen ausgeschlossen§8. §7Grund§8: §f{4}
-NOTEAMSERVERSET_PERMA=§7Du bist §epermanent §7vom §e§lTeamserver§7 setzen ausgeschlossen§8. §7Grund§8: §e{0}
-NOTEAMSERVERSET_UNTIL=§7Du bist §ebis zum {0} §7vom §e§lTeamserver§7 setzen ausgeschlossen§8. §7Grund§8: §e{1}
-UNNOTEAMSERVERSET_ERROR=§cDer Spieler ist nicht vom Teamserver setzten ausgeschlossen.
-UNNOTEAMSERVERSET=§e{0} §7darf nun wieder §e§lTeamserver§7 setzen§8.
+NOTEAMSERVER_TEAM={0} §e{1} §7wurde von §e{2} {3} §7vom §e§lTeamserver§7 setzen ausgeschlossen§8. §7Grund§8: §f{4}
+NOTEAMSERVER_PERMA=§7Du bist §epermanent §7vom §e§lTeamserver§7 setzen ausgeschlossen§8. §7Grund§8: §e{0}
+NOTEAMSERVER_UNTIL=§7Du bist §ebis zum {0} §7vom §e§lTeamserver§7 setzen ausgeschlossen§8. §7Grund§8: §e{1}
+UNNOTEAMSERVER_ERROR=§cDer Spieler ist nicht vom Teamserver setzten ausgeschlossen.
+UNNOTEAMSERVER=§e{0} §7darf nun wieder §e§lTeamserver§7 setzen§8.
 
 NOTE_TEAM={0} §e{1} §7erhielt von §e{2} {3} §7die §e§lNotiz§7§8: §f{4}