7 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/main.cc
index b39b0109f4..2b32824db3 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/main.cc
@@ -1,5 +1,5 @@
 /*
- *  File:       acr.cc
+ *  File:       main.cc
  *  Summary:    Main entry point, event loop, and some initialization functions
  *  Written by: Linley Henzell
  */
diff --git a/crawl-ref/source/makefile.obj b/crawl-ref/source/makefile.obj
index 0869c13d07..c67b008aad 100644
--- a/crawl-ref/source/makefile.obj
+++ b/crawl-ref/source/makefile.obj
@@ -1,7 +1,6 @@
 OBJECTS = \
 abl-show.o \
 abyss.o \
-acr.o \
 actor.o \
 actor-los.o \
 arena.o \
@@ -89,6 +88,7 @@ los_def.o \
 losparam.o \
 luaterp.o \
 macro.o \
+main.o \
 makeitem.o \
 map_knowledge.o \
 mapdef.o \
diff --git a/crawl-ref/source/ng-input.cc b/crawl-ref/source/ng-input.cc
index 4453ffe1e7..8ec4678555 100644
--- a/crawl-ref/source/ng-input.cc
+++ b/crawl-ref/source/ng-input.cc
@@ -9,7 +9,7 @@
 #include "options.h"
 #include "stuff.h"
 
-extern std::string init_file_error; // defined in acr.cc
+extern std::string init_file_error; // defined in main.cc
 
 // Eventually, this should be something more grand. {dlb}
 void opening_screen(void)
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index e59cf44cd9..765c40ebd1 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -327,7 +327,7 @@ bool move_player_to_grid( const coord_def& p, bool stepped, bool allow_shift,
     viewwindow(false);
 
     // Other Effects:
-    // Clouds -- do we need this? (always seems to double up with acr.cc call)
+    // Clouds -- do we need this? (always seems to double up with main.cc call)
     // if (is_cloud( you.x_pos, you.y_pos ))
     //     in_a_cloud();
 
@@ -1117,7 +1117,7 @@ int player_hunger_rate(void)
         && you.piety >= piety_breakpoint(0))
         hunger--;
 
-    // Moved here from acr.cc... maintaining the >= 40 behaviour.
+    // Moved here from main.cc... maintaining the >= 40 behaviour.
     if (you.hunger >= 40)
     {
         if (you.duration[DUR_INVIS] > 0)
diff --git a/crawl-ref/source/shout.cc b/crawl-ref/source/shout.cc
index d9dea1473c..64378ed7ad 100644
--- a/crawl-ref/source/shout.cc
+++ b/crawl-ref/source/shout.cc
@@ -30,7 +30,7 @@
 
 #include <sstream>
 
-extern int stealth;             // defined in acr.cc
+extern int stealth;             // defined in main.cc
 
 void handle_monster_shouts(monsters* monster, bool force)
 {
diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc
index dcdc1382eb..0ec85d0015 100644
--- a/crawl-ref/source/spl-util.cc
+++ b/crawl-ref/source/spl-util.cc
@@ -693,7 +693,7 @@ void apply_area_cloud( cloud_func func, const coord_def& where,
     if (number == 0)
         return;
 
-    // These indices depend on the order in Compass (see acr.cc)
+    // These indices depend on the order in Compass (see main.cc)
     int compass_order_orth[4] = { 2, 6, 4, 0 };
     int compass_order_diag[4] = { 1, 3, 5, 7 };
 
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index 18ab3969be..929ef4dd0e 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -835,7 +835,7 @@ void explore_pickup_event(int did_pickup, int tried_pickup)
     }
 }
 
-// Top-level travel control (called from input() in acr.cc).
+// Top-level travel control (called from input() in main.cc).
 //
 // travel() is responsible for making the individual moves that constitute
 // (interlevel) travel and explore and deciding when travel and explore