diff --git a/src/gmon/src/battle.rs b/src/gmon/src/battle.rs
index f214ac9..f0552fd 100644
--- a/src/gmon/src/battle.rs
+++ b/src/gmon/src/battle.rs
@@ -1,7 +1,7 @@
 use ::mon::*;
 
-pub type BattleInstance = mon::battle::Instance;
-pub type BattleEngine = mon::battle::Engine;
-pub type BattleTeam = mon::battle::Team;
-pub type BattleEvent = mon::battle::Event;
-pub type BattleMove = mon::battle::Move;
+pub type Instance = mon::battle::Instance;
+pub type Engine = mon::battle::Engine;
+pub type Team = mon::battle::Team;
+pub type Event = mon::battle::Event;
+pub type Move = mon::battle::Move;
diff --git a/src/gmon/src/mon.rs b/src/gmon/src/mon.rs
index 6be0908..3aa8457 100644
--- a/src/gmon/src/mon.rs
+++ b/src/gmon/src/mon.rs
@@ -1,5 +1,5 @@
 use ::mon::*;
 
-pub type MonInstance = mon::mon::Instance;
-pub type MonSpecies = mon::mon::Species;
-pub type MonDex = mon::mon::Dex;
+pub type Instance = mon::mon::Instance;
+pub type Species = mon::mon::Species;
+pub type Dex = mon::mon::Dex;