diff --git a/doc/fixes37.0 b/doc/fixes37.0
index 436623863..7717b9402 100644
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@ -1,4 +1,4 @@
-$NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.169 $ $NHDT-Date: 1586303701 2020/04/07 23:55:01 $
+$NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.170 $ $NHDT-Date: 1586375530 2020/04/08 19:52:10 $
 
 General Fixes and Modified Features
 -----------------------------------
@@ -166,6 +166,7 @@ fix flipping non-existent stairs and ladders (github #311)
 fix door created into random wall or position opening into solid wall
 'use_inverse' option was accidentally made Windows-only; change it back to
 	being more general; change its default to True
+change inconsistent achievement spelling of "Mine Town" to "Minetown"
 X11: was still initializing map to 'stone' instead of 'unexplored' after they
 	became separate glyphs
 X11: for text map without color, add support for black&white ice; draw it in
diff --git a/include/you.h b/include/you.h
index b51c34c67..d17d65ba2 100644
--- a/include/you.h
+++ b/include/you.h
@@ -1,4 +1,4 @@
-/* NetHack 3.6	you.h	$NHDT-Date: 1581322658 2020/02/10 08:17:38 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.42 $ */
+/* NetHack 3.6	you.h	$NHDT-Date: 1586375530 2020/04/08 19:52:10 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.44 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2016. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -86,7 +86,7 @@ enum achivements {
     /* 1 through 14 were present in 3.6.x; the rest are newer; first,
        some easier ones so less skilled players can have achievements */
     ACH_MINE = 15, /* entered Gnomish Mines */
-    ACH_TOWN = 16, /* reached Mine Town */
+    ACH_TOWN = 16, /* reached Minetown */
     ACH_SHOP = 17, /* entered a shop */
     ACH_TMPL = 18, /* entered a temple */
     ACH_ORCL = 19, /* consulted the Oracle */
diff --git a/src/insight.c b/src/insight.c
index 81038ebea..5ceb13c75 100644
--- a/src/insight.c
+++ b/src/insight.c
@@ -1,4 +1,4 @@
-/* NetHack 3.7	insight.c	$NHDT-Date: 1586267147 2020/04/07 13:45:47 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.13 $ */
+/* NetHack 3.7	insight.c	$NHDT-Date: 1586375531 2020/04/08 19:52:11 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.14 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -1933,7 +1933,7 @@ int final; /* used "behind the curtain" by enl_foo() macros */
             you_have_X("entered the Gnomish Mines");
             break;
         case ACH_TOWN:
-            you_have_X("entered Mine Town");
+            you_have_X("entered Minetown");
             break;
         case ACH_SHOP:
             you_have_X("entered a shop");
diff --git a/src/shknam.c b/src/shknam.c
index dd815c93f..8e64c9b9b 100644
--- a/src/shknam.c
+++ b/src/shknam.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	shknam.c	$NHDT-Date: 1454485432 2016/02/03 07:43:52 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.41 $ */
+/* NetHack 3.6	shknam.c	$NHDT-Date: 1586375496 2020/04/08 19:51:36 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.52 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2011. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -513,7 +513,7 @@ const char *const *nlp;
         /* We want variation from game to game, without needing the save
            and restore support which would be necessary for randomization;
            try not to make too many assumptions about time_t's internals;
-           use ledger_no rather than depth to keep mine town distinct. */
+           use ledger_no rather than depth to keep minetown distinct. */
         int nseed = (int) ((long) ubirthday / 257L);
 
         name_wanted = ledger_no(&u.uz) + (nseed % 13) - (nseed % 5);