diff --git a/binaries/data/mods/public/simulation/components/interfaces/EndGameManager.js b/binaries/data/mods/public/simulation/components/interfaces/EndGameManager.js
index 10e18df2a1..7fe9b233b6 100644
--- a/binaries/data/mods/public/simulation/components/interfaces/EndGameManager.js
+++ b/binaries/data/mods/public/simulation/components/interfaces/EndGameManager.js
@@ -1,17 +1,5 @@
 Engine.RegisterInterface("EndGameManager");
 
-/**
- * Message of the form { "playerID": number }
- * sent from Player component when a player is defeated.
- */
-Engine.RegisterMessageType("PlayerDefeated");
-
-/**
- * Message of the form { "playerID": number }
- * sent from Player component when a player has won.
- */
-Engine.RegisterMessageType("PlayerWon");
-
 /**
  * Message of the form {}
  * sent from EndGameManager component.
diff --git a/binaries/data/mods/public/simulation/components/interfaces/Messages.js b/binaries/data/mods/public/simulation/components/interfaces/Messages.js
index d70094f16f..b7502ee021 100644
--- a/binaries/data/mods/public/simulation/components/interfaces/Messages.js
+++ b/binaries/data/mods/public/simulation/components/interfaces/Messages.js
@@ -11,18 +11,6 @@
  */
 Engine.RegisterMessageType("EntityRenamed");
 
-/**
- * Message of the form { "player": number, "otherPlayer": number }
- * sent from Player component when diplomacy changed for one player or between two players.
- */
-Engine.RegisterMessageType("DiplomacyChanged");
-
-/**
- * Message of the form { "to": number, "from": number, "amounts": object }
- * sent from Player component whenever a tribute is sent.
- */
-Engine.RegisterMessageType("TributeExchanged");
-
 /**
  * Message of the form {}
  * sent from InitGame for component map-dependent initialization.
diff --git a/binaries/data/mods/public/simulation/components/interfaces/Player.js b/binaries/data/mods/public/simulation/components/interfaces/Player.js
index 3d14e3ef2a..490f9bfa0b 100644
--- a/binaries/data/mods/public/simulation/components/interfaces/Player.js
+++ b/binaries/data/mods/public/simulation/components/interfaces/Player.js
@@ -1,6 +1,42 @@
 /**
  * Message of the form { "player": number, "from": string, "to": string }
  * sent from Player component to warn other components when a player changed civs.
- * This should only happen in Atlas
+ * This should only happen in Atlas.
  */
 Engine.RegisterMessageType("CivChanged");
+
+/**
+ * Message of the form { "player": number, "otherPlayer": number }
+ * sent from Player component when diplomacy changed for one player or between two players.
+ */
+Engine.RegisterMessageType("DiplomacyChanged");
+
+/**
+ * Message of the form {}
+ * sent from Player component.
+ */
+Engine.RegisterMessageType("DisabledTechnologiesChanged");
+
+/**
+ * Message of the form {}
+ * sent from Player component.
+ */
+Engine.RegisterMessageType("DisabledTemplatesChanged");
+
+/**
+ * Message of the form { "playerID": number }
+ * sent from Player component when a player is defeated.
+ */
+Engine.RegisterMessageType("PlayerDefeated");
+
+/**
+ * Message of the form { "playerID": number }
+ * sent from Player component when a player has won.
+ */
+Engine.RegisterMessageType("PlayerWon");
+
+/**
+ * Message of the form { "to": number, "from": number, "amounts": object }
+ * sent from Player component whenever a tribute is sent.
+ */
+Engine.RegisterMessageType("TributeExchanged");
diff --git a/binaries/data/mods/public/simulation/components/interfaces/Trigger.js b/binaries/data/mods/public/simulation/components/interfaces/Trigger.js
index c56cefc263..a8b21083cf 100644
--- a/binaries/data/mods/public/simulation/components/interfaces/Trigger.js
+++ b/binaries/data/mods/public/simulation/components/interfaces/Trigger.js
@@ -1,13 +1 @@
 Engine.RegisterInterface("Trigger");
-
-/**
- * Message of the form {}
- * sent from Player component.
- */
-Engine.RegisterMessageType("DisabledTemplatesChanged");
-
-/**
- * Message of the form {}
- * sent from Player component.
- */
-Engine.RegisterMessageType("DisabledTechnologiesChanged");