diff --git a/doc/tde_app_devel/index.docbook b/doc/tde_app_devel/index.docbook
index f24131a9..32a16a42 100644
--- a/doc/tde_app_devel/index.docbook
+++ b/doc/tde_app_devel/index.docbook
@@ -1276,7 +1276,7 @@ As an example, we have a look at the "New File" button in a generic application:
 </para>
 <para>
 There, the part i18n("New File") provides a tool-tip message. It is enclosed by the i18n()
-macro provided by kapp.h to translate the tool-tip towards the currently selected language. 
+macro provided by tdeapplication.h to translate the tool-tip towards the currently selected language. 
 </para>
 <para>
 Tool-tips can also be added to any custom widget by using the <classname>QToolTip</classname> 
diff --git a/languages/java/app_templates/kappjava/app_client.java b/languages/java/app_templates/kappjava/app_client.java
index ab327d4c..4b310179 100644
--- a/languages/java/app_templates/kappjava/app_client.java
+++ b/languages/java/app_templates/kappjava/app_client.java
@@ -2,10 +2,10 @@
  * Copyright (C) %{YEAR} %{AUTHOR} <%{EMAIL}>
  */
 
-#include <kapp.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
-#include <qdatastream.h>
-#include <qstring.h>
+#include <tqdatastream.h>
+#include <tqstring.h>
 
 int main(int argc, char **argv)
 {
@@ -16,8 +16,8 @@ int main(int argc, char **argv)
     client->attach();
 
     // do a 'send' for now
-    QByteArray data;
-    QDataStream ds(data, IO_WriteOnly);
+    TQByteArray data;
+    TQDataStream ds(data, IO_WriteOnly);
     if (argc > 1)
         ds << TQString(argv[1]);
     else