diff --git a/Modules/Setup.in b/Modules/Setup.in
index e7e74e6..bbde3a5 100644
--- a/Modules/Setup.in
+++ b/Modules/Setup.in
@@ -235,8 +235,8 @@
 # See the section "The Tk interface" in ../README for more info.
 
 # *** Use ONE of the following two lines, see previous comments ***
-#tkinter tkintermodule.c -I/usr/local/include -L/usr/local/lib -ltk -ltcl -lX11
-#tkinter tkintermodule.c tkappinit.c -DWITH_APPINIT -I/usr/local/include -L/usr/local/lib -ltk -ltcl -lX11
+#_tkinter _tkinter.c -I/usr/local/include -L/usr/local/lib -ltk -ltcl -lX11
+#_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT -I/usr/local/include -L/usr/local/lib -ltk -ltcl -lX11
 
 # *** ALWAYS use this line as well ***
 #TKPATH=:$(DESTLIB)/tkinter
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index c1fa4a5..2e0a063 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -1,4 +1,4 @@
-/* tkintermodule.c -- Interface to libtk.a and libtcl.a.
+/* _tkinter.c -- Interface to libtk.a and libtcl.a.
    Copyright (C) 1994 Steen Lumholt */
 
 #include "Python.h"
@@ -11,7 +11,7 @@
 #define WITH_APPINIT
 #endif
 
-#define PyInit_tkinter inittkinter
+#define PyInit__tkinter init_tkinter
 
 #include <tcl.h>
 #include <tk.h>
@@ -1219,7 +1219,7 @@
 }
 
 void
-PyInit_tkinter ()
+PyInit__tkinter ()
 {
   static inited = 0;
 
@@ -1228,7 +1228,7 @@
 #endif /* WITH_READLINE */
   PyObject *m, *d, *v;
 
-  m = Py_InitModule ("tkinter", moduleMethods);
+  m = Py_InitModule ("_tkinter", moduleMethods);
 
   d = PyModule_GetDict (m);
   Tkinter_TclError = Py_BuildValue ("s", "TclError");
@@ -1270,7 +1270,7 @@
     }
 
   if (PyErr_Occurred ())
-    Py_FatalError ("can't initialize module tkinter");
+    Py_FatalError ("can't initialize module _tkinter");
 }
 
 #ifdef macintosh