diff --git a/kommander/examples/old/widgetgenerator.kmdr b/kommander/examples/old/widgetgenerator.kmdr
index 3d6fe5b5..ba719405 100644
--- a/kommander/examples/old/widgetgenerator.kmdr
+++ b/kommander/examples/old/widgetgenerator.kmdr
@@ -236,7 +236,7 @@ void @className::showEvent( QShowEvent *e )
     emit widgetOpened();
 }
 
-#include \"$classNameLower.tqmoc\"
+#include \"$classNameLower.moc\"
 "
 
 echo "$headerContent" > @directory/$classNameLower.h
diff --git a/kommander/working/plugintemplate/src-Makefile.am b/kommander/working/plugintemplate/src-Makefile.am
index f5dc15f9..e5c1ca06 100644
--- a/kommander/working/plugintemplate/src-Makefile.am
+++ b/kommander/working/plugintemplate/src-Makefile.am
@@ -13,7 +13,7 @@ libkmdr%{APPNAMELC}_la_SOURCES = %{APPNAMELC}.cpp %{APPNAMELC}plugin.cpp
 
 # these are the headers for your project that won't be installed
 
-# let autotqmoc handle all of the meta source files (tqmoc)
+# let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
 AM_CXXFLAGS= -DHAVE_SSTREAM
 AM_CPPFLAGS= $(all_includes)
diff --git a/lib/compatibility/kmdi/qextmdi/kdemacros.h.in b/lib/compatibility/kmdi/qextmdi/kdemacros.h.in
index bfae0947..008bac11 100644
--- a/lib/compatibility/kmdi/qextmdi/kdemacros.h.in
+++ b/lib/compatibility/kmdi/qextmdi/kdemacros.h.in
@@ -105,11 +105,11 @@
  * this is because usually get called by the class which they belong to,
  * and one'd assume that a class author doesn't use deprecated methods of his
  * own class. The only exception to this are signals which are connected to
- * other signals; they get invoked from tqmoc-generated code. In any case, 
+ * other signals; they get invoked from moc-generated code. In any case, 
  * printing a warning message in either case is not useful.
  * For slots, it can make sense (since slots can be invoked directly) but be
  * aware that if the slots get triggered by a signal, the will get called from
- * tqmoc code as well and thus the warnings are useless.
+ * moc code as well and thus the warnings are useless.
  *
  * \par
  * Also note that it is not possible to use KDE_DEPRECATED for classes which