diff --git a/README.rst b/README.rst
index 3164ef7..5acc920 100644
--- a/README.rst
+++ b/README.rst
@@ -121,9 +121,9 @@ the same directory as "_composite.c".
 
 Running
 -------
-To generate a set of Google Map tiles, use the gmap.py script like this::
+To generate a set of Google Map tiles, use the overviewer.py script like this::
 
-    python gmap.py [OPTIONS] <World # / Name / Path to World> <Output Directory>
+    python overviewer.py [OPTIONS] <World # / Name / Path to World> <Output Directory>
 
 The output directory will be created if it doesn't exist. This will generate a
 set of image tiles for your world in the directory you choose. When it's done,
@@ -153,7 +153,7 @@ Options
 
     Example::
 
-        python gmap.py --cachedir=<chunk cache dir> <world> <output dir>
+        python overviewer.py --cachedir=<chunk cache dir> <world> <output dir>
 
 --imgformat=FORMAT
     Set the output image format used for the tiles. The default is 'png',
@@ -168,7 +168,7 @@ Options
 
     Example to run 5 worker processes in parallel::
 
-        python gmap.py -p 5 <Path to World> <Output Directory>
+        python overviewer.py -p 5 <Path to World> <Output Directory>
 
 -z ZOOM, --zoom=ZOOM
     The Overviewer by default will detect how many zoom levels are required
@@ -191,7 +191,7 @@ Options
 
     This will render your map with 7 zoom levels::
 
-        python gmap.py -z 7 <Path to World> <Output Directory>
+        python overviewer.py -z 7 <Path to World> <Output Directory>
 
     Remember that each additional zoom level adds 4 times as many tiles as
     the last. This can add up fast, zoom level 10 has over a million tiles.
@@ -210,13 +210,13 @@ Options
     By default, the chunk images are saved in your world directory. This
     example will remove them::
     
-        python gmap.py -d <World # / Path to World / Path to cache dir>
+        python overviewer.py -d <World # / Path to World / Path to cache dir>
 
     You can also delete the tile cache as well. This will force a full
     re-render, useful if you've changed texture packs and want your world
     to look uniform. Here's an example::
 
-        python gmap.py -d <# / path> <Tile Directory>
+        python overviewer.py -d <# / path> <Tile Directory>
 
     Be warned, this will cause the next rendering of your map to take
     significantly longer, since it is having to re-generate the files you just
diff --git a/contrib/clearOldCache.py b/contrib/clearOldCache.py
index 18b402b..01b604d 100644
--- a/contrib/clearOldCache.py
+++ b/contrib/clearOldCache.py
@@ -4,7 +4,7 @@ usage = "python contrib/%prog [OPTIONS] <World # / Name / Path to World>"
 
 description = """
 This script will delete files from the old chunk-based cache, a lot
-like the old `gmap.py -d World/` command. You should only use this if
+like the old `overviewer.py -d World/` command. You should only use this if
 you're updating from an older version of Overviewer, and you want to
 clean up your world folder.
 """
@@ -19,7 +19,7 @@ overviewer_dir = os.path.split(os.path.split(os.path.abspath(__file__))[0])[0]
 sys.path.insert(0, overviewer_dir)
 
 import world
-from gmap import list_worlds
+from overviewer import list_worlds
 
 def main():
     parser = OptionParser(usage=usage, description=description)
diff --git a/contrib/findSigns.py b/contrib/findSigns.py
index a5bfa5d..c390654 100644
--- a/contrib/findSigns.py
+++ b/contrib/findSigns.py
@@ -11,7 +11,7 @@ To run, simply give a path to your world directory, for example:
 
 Once that is done, simply re-run the overviewer to generate markers.js:
 
-    python gmap.py ../world.test/ output_dir/
+    python overviewer.py ../world.test/ output_dir/
 
 Note: if your cachedir is not the same as your world-dir, you'll need to manually
 move overviewer.dat into the correct location.
diff --git a/contrib/rerenderBlocks.py b/contrib/rerenderBlocks.py
index 19ab178..51940df 100644
--- a/contrib/rerenderBlocks.py
+++ b/contrib/rerenderBlocks.py
@@ -3,12 +3,12 @@
 '''
 This is used to force the regeneration of any chunks that contain a certain
 blockID.  The output is a chunklist file that is suitable to use with the
---chunklist option to gmap.py.
+--chunklist option to overviewer.py.
 
 Example:
 
 python contrib/rerenderBlocks.py --ids=46,79,91 --world=world/> chunklist.txt
-    python gmap.py --chunklist=chunklist.txt world/ output_dir/
+    python overviewer.py --chunklist=chunklist.txt world/ output_dir/
 
 This will rerender any chunks that contain either TNT (46), Ice (79), or 
 a Jack-O-Lantern (91)
diff --git a/gmap.py b/overviewer.py
similarity index 100%
rename from gmap.py
rename to overviewer.py
diff --git a/setup.py b/setup.py
index cf12c18..48a776d 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ setup_kwargs['cmdclass'] = {}
 #
 
 if py2exe is not None:
-    setup_kwargs['console'] = ['gmap.py']
+    setup_kwargs['console'] = ['overviewer.py']
     setup_kwargs['data_files'] = [('textures', ['textures/lava.png', 'textures/water.png', 'textures/fire.png']),
                                   ('', ['config.js', 'COPYING.txt', 'README.rst']),
                                   ('web_assets', glob.glob('web_assets/*'))]