diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm
index 2bea399e..c6fea653 100644
--- a/kalyptus/kalyptusCxxToJNI.pm
+++ b/kalyptus/kalyptusCxxToJNI.pm
@@ -2554,8 +2554,8 @@ sub preParseClass
 			|| ($classNode->{astNodeName} eq 'TDEGlobalAccel' and $name eq 'setEnabled')
 			|| ($classNode->{astNodeName} eq 'KCharsets' and $name eq 'encodingsForLanguage')
 			|| ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getInteger')
-			|| ($classNode->{astNodeName} eq 'KIO' and $name eq 'buildHTMLErrorString')
-			|| ($classNode->{astNodeName} eq 'KIO' and $name eq 'calculateRemainingSeconds')
+			|| ($classNode->{astNodeName} eq 'TDEIO' and $name eq 'buildHTMLErrorString')
+			|| ($classNode->{astNodeName} eq 'TDEIO' and $name eq 'calculateRemainingSeconds')
 			|| ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'checkCachedAuthentication')
 			|| ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'cacheAuthentication')
 			|| ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getDouble')
@@ -3111,7 +3111,7 @@ sub writeClassDoc
 		print JNISOURCE "#include <kdejava/$javaClassName" . ".h>\n";
 	}
 	
-	if ($javaClassName eq 'KIO') {
+	if ($javaClassName eq 'TDEIO') {
 		# Hack: namespaces can be defined in several source files, which doesn't work, so this..
 		print JNISOURCE "#include <tdeio/job.h>\n";
 		print JNISOURCE "#include <tdeio/davjob.h>\n";
diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm
index cf561602..a96f65b9 100644
--- a/kalyptus/kalyptusCxxToJava.pm
+++ b/kalyptus/kalyptusCxxToJava.pm
@@ -861,7 +861,7 @@ sub preParseClass
 			|| ($classNode->{astNodeName} eq 'TDEGlobalAccel' and $name eq 'setEnabled')
 			|| ($classNode->{astNodeName} eq 'KCharsets' and $name eq 'encodingsForLanguage')
 			|| ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getInteger')
-			|| ($classNode->{astNodeName} eq 'KIO' and $name eq 'buildHTMLErrorString')
+			|| ($classNode->{astNodeName} eq 'TDEIO' and $name eq 'buildHTMLErrorString')
 			|| ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'checkCachedAuthentication')
 			|| ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'cacheAuthentication')
 			|| ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getDouble')
diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm
index ede0c88a..0bd049bf 100644
--- a/kalyptus/kalyptusCxxToKimono.pm
+++ b/kalyptus/kalyptusCxxToKimono.pm
@@ -907,7 +907,7 @@ sub preParseClass
 			|| ($classNode->{astNodeName} eq 'TDEGlobalAccel' and $name eq 'setEnabled')
 			|| ($classNode->{astNodeName} eq 'KCharsets' and $name eq 'encodingsForLanguage')
 			|| ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getInteger')
-			|| ($classNode->{astNodeName} eq 'KIO' and $name eq 'buildHTMLErrorString')
+			|| ($classNode->{astNodeName} eq 'TDEIO' and $name eq 'buildHTMLErrorString')
 			|| ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'checkCachedAuthentication')
 			|| ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'cacheAuthentication')
 			|| ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getDouble')
diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm
index f733da4d..90cb276a 100644
--- a/kalyptus/kalyptusCxxToSmoke.pm
+++ b/kalyptus/kalyptusCxxToSmoke.pm
@@ -589,11 +589,11 @@ sub preParseClass
 			|| ($classNode->{astNodeName} eq 'KTabWidget' and $name eq 'hoverCloseButton')
 			|| ($classNode->{astNodeName} eq 'KTabWidget' and $name eq 'hoverCloseButtonDelayed')
 			|| ($classNode->{astNodeName} eq 'KTar' and $name eq 'writeFile_impl')
-			|| ($classNode->{astNodeName} eq 'KIO' and $name eq 'buildHTMLErrorString')
-			|| ($classNode->{astNodeName} eq 'KIO' and $name eq 'pasteClipboard')
-			|| ($classNode->{astNodeName} eq 'KIO' and $name eq 'pasteData')
-			|| ($classNode->{astNodeName} eq 'KIO' and $name eq 'pasteDataAsync')
-			|| ($classNode->{astNodeName} eq 'KIO' and $name eq 'isClipboardEmpty')
+			|| ($classNode->{astNodeName} eq 'TDEIO' and $name eq 'buildHTMLErrorString')
+			|| ($classNode->{astNodeName} eq 'TDEIO' and $name eq 'pasteClipboard')
+			|| ($classNode->{astNodeName} eq 'TDEIO' and $name eq 'pasteData')
+			|| ($classNode->{astNodeName} eq 'TDEIO' and $name eq 'pasteDataAsync')
+			|| ($classNode->{astNodeName} eq 'TDEIO' and $name eq 'isClipboardEmpty')
 			|| ($classNode->{astNodeName} eq 'DCOPRef' and $name eq 'callExt')
 			|| ($classNode->{astNodeName} eq 'DCOPRef' and $name eq 'call')
 			|| ($classNode->{astNodeName} eq 'DCOPRef' and $name eq 'send')