diff --git a/configure.in.in b/configure.in.in
index 73bcc4d6b..5b7192ffa 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -307,7 +307,7 @@ AC_SUBST(ICE_RLIB, 'ICE/libkICE.la')
 AC_SUBST(DCOPIDL, '$(top_builddir)/dcop/dcopidl/dcopidl')
 AC_SUBST(DCOPIDLNG, '$(top_srcdir)/dcop/dcopidlng/dcopidlng')
 AC_SUBST(DCOPIDL2CPP, '$(top_builddir)/dcop/dcopidl2cpp/dcopidl2cpp')
-AC_SUBST(MAKEKDEWIDGETS, '$(top_builddir)/kdewidgets/makekdewidgets')
+AC_SUBST(MAKEKDEWIDGETS, '$(top_builddir)/kdewidgets/maketdewidgets')
 AC_SUBST(KCONFIG_COMPILER, '$(top_builddir)/tdecore/tdeconfig_compiler/tdeconfig_compiler')
 
 ac_save_LIBS="$LIBS"
diff --git a/kdewidgets/CMakeLists.txt b/kdewidgets/CMakeLists.txt
index 19768e7ef..ce8c223a9 100644
--- a/kdewidgets/CMakeLists.txt
+++ b/kdewidgets/CMakeLists.txt
@@ -32,12 +32,12 @@ link_directories(
 )
 
 
-##### makekdewidgets ############################
+##### maketdewidgets ############################
 
-set( target makekdewidgets )
+set( target maketdewidgets )
 
 set( ${target}_SRCS
-  makekdewidgets.cpp
+  maketdewidgets.cpp
 )
 
 tde_add_executable( ${target}
@@ -55,8 +55,8 @@ set( ${target}_SRCS
 )
 
 add_custom_command( OUTPUT kdewidgets.cpp
-  COMMAND ./makekdewidgets -o kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
-  DEPENDS makekdewidgets ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
+  COMMAND ./maketdewidgets -o kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
+  DEPENDS maketdewidgets ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
 )
 
 tde_add_kpart( ${target} AUTOMOC
diff --git a/kdewidgets/Makefile.am b/kdewidgets/Makefile.am
index 6c496bf73..2ae867228 100644
--- a/kdewidgets/Makefile.am
+++ b/kdewidgets/Makefile.am
@@ -23,18 +23,18 @@ AM_CXXFLAGS = -DQT_PLUGIN
 
 INCLUDES = -I$(top_srcdir)/tdefile $(all_includes)
 
-bin_PROGRAMS = makekdewidgets
-makekdewidgets_SOURCES = makekdewidgets.cpp
-makekdewidgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-makekdewidgets_LDADD = $(LIB_QT) ../tdecore/libtdecore.la 
+bin_PROGRAMS = maketdewidgets
+maketdewidgets_SOURCES = maketdewidgets.cpp
+maketdewidgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+maketdewidgets_LDADD = $(LIB_QT) ../tdecore/libtdecore.la 
 
 kde_widget_LTLIBRARIES = kdewidgets.la
 kdewidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
 kdewidgets_la_LIBADD = $(LIB_KIO) $(LIB_TDEABC) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
 kdewidgets_la_SOURCES = classpreviews.cpp kdewidgets.cpp
 
-kdewidgets.cpp: $(srcdir)/kde.widgets makekdewidgets
-	./makekdewidgets -o kdewidgets.cpp $(srcdir)/kde.widgets
+kdewidgets.cpp: $(srcdir)/kde.widgets maketdewidgets
+	./maketdewidgets -o kdewidgets.cpp $(srcdir)/kde.widgets
 
 CLEANFILES = kdewidgets.cpp
 
diff --git a/kdewidgets/makekdewidgets.cpp b/kdewidgets/makekdewidgets.cpp
index 5e1338595..535ad0526 100644
--- a/kdewidgets/makekdewidgets.cpp
+++ b/kdewidgets/makekdewidgets.cpp
@@ -15,7 +15,7 @@
 static const char description[] = I18N_NOOP( "Builds Qt widget plugins from an ini style description file." );
 static const char version[] = "0.2";
 static const char classHeader[] = 	"/**\n"
-					"* This file was autogenerated by makekdewidgets. Any changes will be lost!\n"
+					"* This file was autogenerated by maketdewidgets. Any changes will be lost!\n"
 					"* The generated code in this file is licensed under the same license that the\n"
 					"* input file.\n"
                                    	"*/\n"
@@ -124,9 +124,9 @@ static void buildFile( TQTextStream &stream, const TQString& group, const TQStri
 static TQString buildPixmap( const TQString &name, TDEConfig &input, const TQString &iconPath );
 
 int main( int argc, char **argv ) {
-    new TDEInstance( "makekdewidgets" );
+    new TDEInstance( "maketdewidgets" );
 
-    TDEAboutData about( "makekdewidgets", I18N_NOOP( "makekdewidgets" ), version, description, TDEAboutData::License_GPL, "(C) 2004-2005 ian reinhart geiser", 0, 0, "geiseri@kde.org" );
+    TDEAboutData about( "maketdewidgets", I18N_NOOP( "maketdewidgets" ), version, description, TDEAboutData::License_GPL, "(C) 2004-2005 ian reinhart geiser", 0, 0, "geiseri@kde.org" );
     about.addAuthor( "ian reinhart geiser", 0, "geiseri@kde.org" );
     TDECmdLineArgs::init( argc, argv, &about );
     TDECmdLineArgs::addCmdLineOptions( options );
diff --git a/kdewidgets/tests/Makefile.am b/kdewidgets/tests/Makefile.am
index 3a4a9566a..220f8afac 100644
--- a/kdewidgets/tests/Makefile.am
+++ b/kdewidgets/tests/Makefile.am
@@ -23,9 +23,9 @@ check-local: testwithpixmaps.cpp testkde.cpp
 # md5sum -c $(srcdir)/sums
 
 testwithpixmaps.cpp: $(srcdir)/test.widgets
-	../makekdewidgets -o testwithpixmaps.cpp -p $(top_srcdir)/kdewidgets/pics $(srcdir)/test.widgets
+	../maketdewidgets -o testwithpixmaps.cpp -p $(top_srcdir)/kdewidgets/pics $(srcdir)/test.widgets
 testkde.cpp: $(srcdir)/test.widgets
-	../makekdewidgets -o testkde.cpp $(srcdir)/test.widgets
+	../maketdewidgets -o testkde.cpp $(srcdir)/test.widgets
 
 CLEANFILES = testwithpixmaps.cpp testkde.cpp
 
diff --git a/kdewidgets/tests/README b/kdewidgets/tests/README
index 9dd2132fa..5d97aa029 100644
--- a/kdewidgets/tests/README
+++ b/kdewidgets/tests/README
@@ -1,4 +1,4 @@
-These are the tests for the current makekdewidgets.
+These are the tests for the current maketdewidgets.
 
 Currently there are two modes generated, and the checksums checked.
 These files are correct and build plugins that are functionally 
diff --git a/win/pro_files/kdewidgets/kdewidgets.pro b/win/pro_files/kdewidgets/kdewidgets.pro
index dbfb3ba4d..1da63e6ec 100644
--- a/win/pro_files/kdewidgets/kdewidgets.pro
+++ b/win/pro_files/kdewidgets/kdewidgets.pro
@@ -3,7 +3,7 @@ CONFIG += trinitylib #this is a dynamic kde library
 
 include( $(KDELIBS)/win/common.pro )
 
-system( makekdewidgets -o kdewidgets.cpp kde.widgets )
+system( maketdewidgets -o kdewidgets.cpp kde.widgets )
 
 #no _d because it's a special case
 
diff --git a/win/pro_files/kdewidgets/makekdewidgets.pro b/win/pro_files/kdewidgets/makekdewidgets.pro
index cc9c0786b..bf0aabf05 100644
--- a/win/pro_files/kdewidgets/makekdewidgets.pro
+++ b/win/pro_files/kdewidgets/makekdewidgets.pro
@@ -3,7 +3,7 @@ TEMPLATE	= app
 include( $(KDELIBS)/win/common.pro )
 
 
-TARGET = makekdewidgets
+TARGET = maketdewidgets
 DESTDIR = .
 
 win32 {
@@ -11,7 +11,7 @@ win32 {
 #CONFIG += windows
 }
 
-SOURCES = makekdewidgets.cpp
+SOURCES = maketdewidgets.cpp
 
 HEADERS = 
 
diff --git a/win/tools/build_tdelibs_dbg b/win/tools/build_tdelibs_dbg
index 79f3b0f32..b3dcd7695 100644
--- a/win/tools/build_tdelibs_dbg
+++ b/win/tools/build_tdelibs_dbg
@@ -69,7 +69,7 @@ kate/part \
 done
 
 cd kdewidgets
-qmake makekdewidgets.pro && $make clean && $make || exit 1
+qmake maketdewidgets.pro && $make clean && $make || exit 1
 qmake && $make clean && $make || exit 1
 
 # copy kdewidgets plugin for Qt Designer