diff --git a/application/core/Maps/MapList.php b/application/core/Maps/MapList.php
index 6277d5d7..4c87c1e4 100644
--- a/application/core/Maps/MapList.php
+++ b/application/core/Maps/MapList.php
@@ -2,7 +2,7 @@
 
 namespace ManiaControl\Maps;
 
-use CustomVotesPlugin;
+use MCTeam\CustomVotesPlugin;
 use FML\Controls\Control;
 use FML\Controls\Frame;
 use FML\Controls\Gauge;
@@ -50,7 +50,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 	const MAX_MAPS_PER_PAGE = 15;
 	const MAX_PAGES_PER_CHUNK = 2;
 	const DEFAULT_KARMA_PLUGIN = 'MCTeam\KarmaPlugin';
-	const DEFAULT_CUSTOM_VOTE_PLUGIN = 'CustomVotesPlugin';
+	const DEFAULT_CUSTOM_VOTE_PLUGIN = 'MCTeam\CustomVotesPlugin';
 	
 	/*
 	 * Private Properties
diff --git a/application/core/Players/PlayerList.php b/application/core/Players/PlayerList.php
index dc0a7caf..e2099acd 100644
--- a/application/core/Players/PlayerList.php
+++ b/application/core/Players/PlayerList.php
@@ -2,7 +2,7 @@
 
 namespace ManiaControl\Players;
 
-use CustomVotesPlugin;
+use MCTeam\CustomVotesPlugin;
 use FML\Controls\Control;
 use FML\Controls\Frame;
 use FML\Controls\Labels\Label_Button;
@@ -56,7 +56,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer
 	const ACTION_REVOKE_RIGHTS        = 'PlayerList.RevokeRights';
 	const ACTION_OPEN_PLAYER_DETAILED = 'PlayerList.OpenPlayerDetailed';
 	const ACTION_SPECTATE_PLAYER      = 'PlayerList.SpectatePlayer';
-	const DEFAULT_CUSTOM_VOTE_PLUGIN  = 'CustomVotesPlugin';
+	const DEFAULT_CUSTOM_VOTE_PLUGIN  = 'MCTeam\CustomVotesPlugin';
 	const SHOWN_MAIN_WINDOW           = -1;
 	const MAX_PLAYERS_PER_PAGE        = 15;
 
diff --git a/application/plugins/ChatMessagePlugin.php b/application/plugins/ChatMessagePlugin.php
index f1e24edc..7dd0c8f8 100644
--- a/application/plugins/ChatMessagePlugin.php
+++ b/application/plugins/ChatMessagePlugin.php
@@ -1,4 +1,5 @@
 <?php
+namespace MCTeam;
 
 use ManiaControl\Commands\CommandListener;
 use ManiaControl\ManiaControl;
@@ -9,9 +10,9 @@ use Maniaplanet\DedicatedServer\Xmlrpc\Exception;
 /**
  * ManiaControl Chat-Message Plugin
  *
- * @author kremsy
+ * @author    kremsy
  * @copyright ManiaControl Copyright © 2014 ManiaControl Team
- * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3
+ * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
 class ChatMessagePlugin implements CommandListener, Plugin {
 	/**
@@ -389,8 +390,8 @@ class ChatMessagePlugin implements CommandListener, Plugin {
 	 * @return mixed
 	 */
 	private function getTarget($login) {
-        /** @var Player $player */
-        $player = null;
+		/** @var Player $player */
+		$player = null;
 		foreach($this->maniaControl->playerManager->getPlayers() as $player) {
 			if ($login == $player->login || $login == $player->pid || $login == $player->nickname) {
 				return $player->nickname;
diff --git a/application/plugins/CustomVotes.php b/application/plugins/CustomVotes.php
index 80309669..df4d83e3 100644
--- a/application/plugins/CustomVotes.php
+++ b/application/plugins/CustomVotes.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace MCTeam;
+
 use FML\Controls\Control;
 use FML\Controls\Frame;
 use FML\Controls\Gauge;
diff --git a/application/plugins/Donations.php b/application/plugins/Donations.php
index bd4f8918..feaa4ad9 100644
--- a/application/plugins/Donations.php
+++ b/application/plugins/Donations.php
@@ -1,4 +1,6 @@
 <?php
+namespace MCTeam;
+
 use FML\Controls\Control;
 use FML\Controls\Frame;
 use FML\Controls\Label;
diff --git a/application/plugins/ServerRanking.php b/application/plugins/ServerRanking.php
index 2fea00c4..27e310f7 100644
--- a/application/plugins/ServerRanking.php
+++ b/application/plugins/ServerRanking.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace MCTeam;
+
 use ManiaControl\Callbacks\CallbackListener;
 use ManiaControl\Callbacks\Callbacks;
 use ManiaControl\Commands\CommandListener;