9 files changed, 12 insertions, 12 deletions
diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc
index af78932c24..d28f1d4f30 100644
--- a/crawl-ref/source/abyss.cc
+++ b/crawl-ref/source/abyss.cc
@@ -21,7 +21,7 @@
 #include "mon-iter.h"
 #include "mon-util.h"
 #include "mon-place.h"
-#include "mtransit.h"
+#include "mon-transit.h"
 #include "player.h"
 #include "dungeon.h"
 #include "items.h"
diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc
index dbd51ca9c6..5a8f18f599 100644
--- a/crawl-ref/source/files.cc
+++ b/crawl-ref/source/files.cc
@@ -60,7 +60,7 @@
 #include "mon-act.h"
 #include "mon-stuff.h"
 #include "mon-util.h"
-#include "mtransit.h"
+#include "mon-transit.h"
 #include "newgame.h"
 #include "notes.h"
 #include "options.h"
diff --git a/crawl-ref/source/ghost.cc b/crawl-ref/source/ghost.cc
index 6cb75f44d0..59b930c765 100644
--- a/crawl-ref/source/ghost.cc
+++ b/crawl-ref/source/ghost.cc
@@ -21,7 +21,7 @@
 #include "random.h"
 #include "skills2.h"
 #include "mon-util.h"
-#include "mtransit.h"
+#include "mon-transit.h"
 #include "place.h"
 #include "player.h"
 #include "religion.h"
diff --git a/crawl-ref/source/makefile.obj b/crawl-ref/source/makefile.obj
index 019002d56f..0869c13d07 100644
--- a/crawl-ref/source/makefile.obj
+++ b/crawl-ref/source/makefile.obj
@@ -111,8 +111,8 @@ mon-place.o \
 mon-speak.o \
 monster.o \
 mon-stuff.o \
+mon-transit.o \
 mt19937ar.o \
-mtransit.o \
 mutation.o \
 newgame.o \
 ng-init.o \
diff --git a/crawl-ref/source/mtransit.cc b/crawl-ref/source/mon-transit.cc
index e9bf292df2..0ed945f1b4 100644
--- a/crawl-ref/source/mtransit.cc
+++ b/crawl-ref/source/mon-transit.cc
@@ -1,5 +1,5 @@
 /*
- * File:       mtransit.cc
+ * File:       mon-transit.cc
  * Summary:    Tracks monsters that are in suspended animation between levels.
  * Written by: Darshan Shaligram
  */
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 
-#include "mtransit.h"
+#include "mon-transit.h"
 
 #include "artefact.h"
 #include "dungeon.h"
diff --git a/crawl-ref/source/mtransit.h b/crawl-ref/source/mon-transit.h
index 0685db598c..8075f88a90 100644
--- a/crawl-ref/source/mtransit.h
+++ b/crawl-ref/source/mon-transit.h
@@ -1,11 +1,11 @@
 /*
- * File:       mtransit.h
+ * File:       mon-transit.h
  * Summary:    Tracking monsters in transit between levels.
  * Written by: Darshan Shaligram
  */
 
-#ifndef MTRANSIT_H
-#define MTRANSIT_H
+#ifndef MON_TRANSIT_H
+#define MON_TRANSIT_H
 
 #include "monster.h"
 #include "travel.h"
diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc
index b09a98b5dc..fc1a726713 100644
--- a/crawl-ref/source/monster.cc
+++ b/crawl-ref/source/monster.cc
@@ -21,7 +21,7 @@
 #include "mon-behv.h"
 #include "mon-place.h"
 #include "mon-stuff.h"
-#include "mtransit.h"
+#include "mon-transit.h"
 #include "random.h"
 #include "religion.h"
 #include "shopping.h" // for item values
diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc
index c5d71c37fb..017a4d2db4 100644
--- a/crawl-ref/source/tags.cc
+++ b/crawl-ref/source/tags.cc
@@ -72,7 +72,7 @@
 #include "itemprop.h"
 #include "mapmark.h"
 #include "mon-util.h"
-#include "mtransit.h"
+#include "mon-transit.h"
 #include "quiver.h"
 #include "skills.h"
 #include "skills2.h"
diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc
index d595c09890..0b9b1f7636 100644
--- a/crawl-ref/source/traps.cc
+++ b/crawl-ref/source/traps.cc
@@ -27,7 +27,7 @@
 #include "misc.h"
 #include "mon-util.h"
 #include "mon-stuff.h"
-#include "mtransit.h"
+#include "mon-transit.h"
 #include "ouch.h"
 #include "player.h"
 #include "skills.h"