22 files changed, 76 insertions, 90 deletions
diff --git a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_cdma_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_cdma_widget.cpp
index 09b9ed3..4036518 100644
--- a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_cdma_widget.cpp
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_cdma_widget.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting_cdma_widget.cpp - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting_cdma_widget.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -34,7 +34,7 @@
 #include <kuser.h>
 
 // knm headers
-#include "knetworkmanager-connection_setting_cdma_widget.h"
+#include "tdenetman-connection_setting_cdma_widget.h"
 
 // ui headers
 #include "connection_setting_cdma.h"
@@ -90,4 +90,4 @@ CDMAWidgetImpl::dirty()
 }
 
 
-#include "knetworkmanager-connection_setting_cdma_widget.moc"
+#include "tdenetman-connection_setting_cdma_widget.moc"
diff --git a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_cdma_widget.h b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_cdma_widget.h
index 0cbbfee..36c9224 100644
--- a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_cdma_widget.h
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_cdma_widget.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting_cdma_widget.cpp - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting_cdma_widget.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2008 Novell, Inc.
  *
@@ -35,7 +35,7 @@
 #include <tdenetworkconnections.h>
 
 // knm headers
-#include "knetworkmanager-connection_setting_widget_interface.h"
+#include "tdenetman-connection_setting_widget_interface.h"
 
 //class VPNService;
 class ConnectionSettingCdmaWidget;
diff --git a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_gsm_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_gsm_widget.cpp
index 36a9a57..3df8804 100644
--- a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_gsm_widget.cpp
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_gsm_widget.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting_gsm_widget.cpp - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting_gsm_widget.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -35,8 +35,7 @@
 #include <kuser.h>
 
 // knm headers
-#include "knetworkmanager-connection_setting_gsm.h"
-#include "knetworkmanager-connection_setting_gsm_widget.h"
+#include "tdenetman-connection_setting_gsm_widget.h"
 
 #include "connection_setting_gsm.h"
 
@@ -154,4 +153,4 @@ GSMWidgetImpl::getNetworkType()
 	}
 }
 
-#include "knetworkmanager-connection_setting_gsm_widget.moc"
+#include "tdenetman-connection_setting_gsm_widget.moc"
diff --git a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_gsm_widget.h b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_gsm_widget.h
index f4fd439..6010d3f 100644
--- a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_gsm_widget.h
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_gsm_widget.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting_gsm_widget.cpp - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting_gsm_widget.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2008 Novell, Inc.
  *
@@ -35,8 +35,7 @@
 #include <tdenetworkconnections.h>
 
 // knm headers
-#include "knetworkmanager-connection_setting_gsm.h"
-#include "knetworkmanager-connection_setting_widget_interface.h"
+#include "tdenetman-connection_setting_widget_interface.h"
 
 //class VPNService;
 class ConnectionSettingGsmWidget;
diff --git a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_info_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_info_widget.cpp
index f0c1972..48a22f7 100644
--- a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_info_widget.cpp
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_info_widget.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-devicestore_dbus.cpp - A NetworkManager frontend for KDE
+ * tdenetman-devicestore_dbus.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -30,8 +30,7 @@
 #include <tqlayout.h>
 
 // knm headers
-#include "knetworkmanager-connection_setting_info.h"
-#include "knetworkmanager-connection_setting_info_widget.h"
+#include "tdenetman-connection_setting_info_widget.h"
 
 using namespace ConnectionSettings;
 
@@ -74,4 +73,4 @@ InfoWidgetImpl::slotAutoconnectChanged(bool autoconnect)
 	_infosetting->autoConnect = autoconnect;
 }
 
-#include "knetworkmanager-connection_setting_info_widget.moc"
+#include "tdenetman-connection_setting_info_widget.moc"
diff --git a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_info_widget.h b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_info_widget.h
index c5900ce..8cad6c6 100644
--- a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_info_widget.h
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_info_widget.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-devicestore_dbus.cpp - A NetworkManager frontend for KDE
+ * tdenetman-devicestore_dbus.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -37,7 +37,7 @@
 
 // knm headers
 #include "connection_setting_info.h"
-#include "knetworkmanager-connection_setting_widget_interface.h"
+#include "tdenetman-connection_setting_widget_interface.h"
 
 namespace ConnectionSettings
 {
diff --git a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_ipv4_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ipv4_widget.cpp
index 7b48dfe..e229b2f 100644
--- a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_ipv4_widget.cpp
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ipv4_widget.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-devicestore_dbus.cpp - A NetworkManager frontend for KDE
+ * tdenetman-devicestore_dbus.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -29,8 +29,7 @@
 #include <tqlayout.h>
 #include <tqhostaddress.h>
 
-#include "knetworkmanager-connection_setting_ipv4_widget.h"
-#include "knetworkmanager-connection_setting_ipv4.h"
+#include "tdenetman-connection_setting_ipv4_widget.h"
 
 using namespace ConnectionSettings;
 
@@ -206,4 +205,4 @@ IPv4WidgetImpl::slotGatewayChanged(const TQString& ip)
 	_ipv4_setting->ipConfig.ipConfigurations = addrs;
 }
 
-#include "knetworkmanager-connection_setting_ipv4_widget.moc"
+#include "tdenetman-connection_setting_ipv4_widget.moc"
diff --git a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_ipv4_widget.h b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ipv4_widget.h
index cfee028..61fdb12 100644
--- a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_ipv4_widget.h
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ipv4_widget.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-devicestore_dbus.h - A NetworkManager frontend for KDE
+ * tdenetman-devicestore_dbus.h - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -32,9 +32,8 @@
 // ui headers
 #include "connection_setting_ipv4.h"
 
-// knetworkmanager headers
-#include "knetworkmanager-connection_setting_widget_interface.h"
-#include "knetworkmanager-connection_setting_ipv4.h"
+// tdenetman headers
+#include "tdenetman-connection_setting_widget_interface.h"
 
 namespace ConnectionSettings
 {
diff --git a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_ppp_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ppp_widget.cpp
index 3bc4783..e3688e0 100644
--- a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_ppp_widget.cpp
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ppp_widget.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting_ppp_widget.cpp - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting_ppp_widget.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2008 Novell, Inc.
  *
@@ -37,9 +37,7 @@
 #include <kuser.h>
 
 // knm headers
-#include "knetworkmanager-connection_setting_ppp.h"
-#include "knetworkmanager-connection_setting_ppp_widget.h"
-
+#include "tdenetman-connection_setting_ppp_widget.h"
 #include "connection_setting_ppp.h"
 
 using namespace ConnectionSettings;
@@ -142,4 +140,4 @@ PPPWidgetImpl::dirty()
 	_pppsetting->pppConfig.valid = true;
 }
 
-#include "knetworkmanager-connection_setting_ppp_widget.moc"
+#include "tdenetman-connection_setting_ppp_widget.moc"
diff --git a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_ppp_widget.h b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ppp_widget.h
index 7cd4121..983369d 100644
--- a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_ppp_widget.h
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ppp_widget.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting_ppp_widget.cpp - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting_ppp_widget.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2008 Novell, Inc.
  *
@@ -35,8 +35,7 @@
 #include <tdenetworkconnections.h>
 
 // knm headers
-#include "knetworkmanager-connection_setting_ppp.h"
-#include "knetworkmanager-connection_setting_widget_interface.h"
+#include "tdenetman-connection_setting_widget_interface.h"
 
 //class VPNService;
 class ConnectionSettingPppWidget;
diff --git a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_serial_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_serial_widget.cpp
index 574cdb7..fe1b937 100644
--- a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_serial_widget.cpp
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_serial_widget.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting_serial_widget.cpp - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting_serial_widget.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2008 Novell, Inc.
  *
@@ -36,8 +36,7 @@
 #include <kuser.h>
 
 // knm headers
-#include "knetworkmanager-connection_setting_serial.h"
-#include "knetworkmanager-connection_setting_serial_widget.h"
+#include "tdenetman-connection_setting_serial_widget.h"
 
 #include "connection_setting_serial.h"
 
@@ -131,4 +130,4 @@ SerialWidgetImpl::getParityType()
 	}
 }
 
-#include "knetworkmanager-connection_setting_serial_widget.moc"
+#include "tdenetman-connection_setting_serial_widget.moc"
diff --git a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_serial_widget.h b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_serial_widget.h
index d12db89..d597c9b 100644
--- a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_serial_widget.h
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_serial_widget.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting_serial_widget.cpp - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting_serial_widget.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2008 Novell, Inc.
  *
@@ -35,8 +35,7 @@
 #include <tdenetworkconnections.h>
 
 // knm headers
-#include "knetworkmanager-connection_setting_serial.h"
-#include "knetworkmanager-connection_setting_widget_interface.h"
+#include "tdenetman-connection_setting_widget_interface.h"
 
 //class VPNService;
 class ConnectionSettingSerialWidget;
diff --git a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_vpn_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_vpn_widget.cpp
index 0e9ac95..4196989 100644
--- a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_vpn_widget.cpp
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_vpn_widget.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting_vpn_widget.cpp - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting_vpn_widget.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -35,12 +35,12 @@
 #include <kuser.h>
 
 // knm headers
-#include "knetworkmanager-connection.h"
-#include "knetworkmanager-connection_setting_vpn.h"
-#include "knetworkmanager-connection_setting_vpn_widget.h"
-#include "knetworkmanager-device.h"
-#include "knetworkmanager-vpnmanager.h"
-#include "knetworkmanager-vpnservice.h"
+#include "tdenetman-connection.h"
+#include "tdenetman-connection_setting_vpn.h"
+#include "tdenetman-connection_setting_vpn_widget.h"
+#include "tdenetman-device.h"
+#include "tdenetman-vpnmanager.h"
+#include "tdenetman-vpnservice.h"
 
 using namespace ConnectionSettings;
 
@@ -203,4 +203,4 @@ VPNWidgetImpl::Activate()
 
 }
 
-#include "knetworkmanager-connection_setting_vpn_widget.moc"
+#include "tdenetman-connection_setting_vpn_widget.moc"
diff --git a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_vpn_widget.h b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_vpn_widget.h
index f7c16cd..a00ec17 100644
--- a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_vpn_widget.h
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_vpn_widget.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting_vpn_widget.cpp - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting_vpn_widget.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -32,8 +32,8 @@
 
 // knm headers
 #include "connection_setting_vpn.h"
-#include "knetworkmanager-connection_setting_widget_interface.h"
-#include "knetworkmanager-device.h"
+#include "tdenetman-connection_setting_widget_interface.h"
+#include "tdenetman-device.h"
 
 class VPNService;
 class VPNConfigWidget;
diff --git a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_widget_interface.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_widget_interface.cpp
index 2c00288..2be4796 100644
--- a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_widget_interface.cpp
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_widget_interface.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting_widget_interface.cpp - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting_widget_interface.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -24,7 +24,7 @@
 
 // qt headers
 #include <tqwidget.h>
-#include "knetworkmanager-connection_setting_widget_interface.h"
+#include "tdenetman-connection_setting_widget_interface.h"
 
 using namespace ConnectionSettings;
 
@@ -34,4 +34,4 @@ WidgetInterface::WidgetInterface(TQWidget* parent, const char* name, WFlags fl)
 
 }
 
-#include "knetworkmanager-connection_setting_widget_interface.moc"
+#include "tdenetman-connection_setting_widget_interface.moc"
diff --git a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_widget_interface.h b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_widget_interface.h
index 13ea65e..82755b5 100644
--- a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_widget_interface.h
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_widget_interface.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting_widget_interface.h - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting_widget_interface.h - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
diff --git a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_wireless_security_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp
index 4b6d70a..7647136 100644
--- a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_wireless_security_widget.cpp
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting_wireless_security_widget.cpp
+ * tdenetman-connection_setting_wireless_security_widget.cpp
  * - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
@@ -40,11 +40,11 @@
 #include <kdebug.h>
 #include <kpassdlg.h>
 
-/* knetworkmanager headers */
-#include "knetworkmanager-connection_setting_wireless_security_widget.h"
+/* tdenetman headers */
+#include "tdenetman-connection_setting_wireless_security_widget.h"
 #include "sha1.h"
 #include "md5.h"
-#include "knetworkmanager-wireless_manager.h"
+#include "tdenetman-wireless_manager.h"
 
 #define WPA_PMK_LEN 32
 
@@ -1026,4 +1026,4 @@ WirelessSecurityWidgetImpl::configureForIEEE8021X()
 
 
 
-#include "knetworkmanager-connection_setting_wireless_security_widget.moc"
+#include "tdenetman-connection_setting_wireless_security_widget.moc"
diff --git a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_wireless_security_widget.h b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.h
index b6e4a5e..e0605db 100644
--- a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_wireless_security_widget.h
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-devicestore_dbus.h - A NetworkManager frontend for KDE
+ * tdenetman-devicestore_dbus.h - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -39,9 +39,9 @@
 #include <tdehardwaredevices.h>
 #include <tdenetworkconnections.h>
 
-/* knetworkmanager headers */
+/* tdenetman headers */
 #include "qbidirectionalmap.h"
-#include "knetworkmanager-connection_setting_widget_interface.h"
+#include "tdenetman-connection_setting_widget_interface.h"
 
 namespace ConnectionSettings
 {
diff --git a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_wireless_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp
index 5d34190..c5b70bd 100644
--- a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_wireless_widget.cpp
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-devicestore_dbus.cpp - A NetworkManager frontend for KDE
+ * tdenetman-devicestore_dbus.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -36,10 +36,9 @@
 #include <kpushbutton.h>
 #include <klocale.h>
 
-#include "knetworkmanager-connection_setting_widget_interface.h"
-#include "knetworkmanager-connection_setting_wireless_widget.h"
-#include "knetworkmanager-connection_setting_info.h"
-#include "knetworkmanager-wireless_manager.h"
+#include "tdenetman-connection_setting_widget_interface.h"
+#include "tdenetman-connection_setting_wireless_widget.h"
+#include "tdenetman-wireless_manager.h"
 
 using namespace ConnectionSettings;
 
@@ -228,4 +227,4 @@ TQString WirelessWidgetImpl::hexStringFromByteArray(const TQByteArray& bytes)
 	return tmp;
 }
 
-#include "knetworkmanager-connection_setting_wireless_widget.moc"
+#include "tdenetman-connection_setting_wireless_widget.moc"
diff --git a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_wireless_widget.h b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.h
index 37a3de7..da78621 100644
--- a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_wireless_widget.h
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-devicestore_dbus.cpp - A NetworkManager frontend for KDE
+ * tdenetman-devicestore_dbus.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -30,7 +30,7 @@
 #include <tdehardwaredevices.h>
 #include <tdenetworkconnections.h>
 
-#include "knetworkmanager-connection_setting_widget_interface.h"
+#include "tdenetman-connection_setting_widget_interface.h"
 #include "connection_setting_wireless.h"
 
 class KListViewSearchLineWidget;
diff --git a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_settings_dialog.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_settings_dialog.cpp
index 41d2776..a783d23 100644
--- a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_settings_dialog.cpp
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_settings_dialog.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-devicestore_dbus.cpp - A NetworkManager frontend for KDE
+ * tdenetman-devicestore_dbus.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -42,18 +42,18 @@
 #include <tqdbusobjectpath.h>
 
 // knm headers
-#include "knetworkmanager-connection_setting_widget_interface.h"
-#include "knetworkmanager-connection_settings_dialog.h"
-#include "knetworkmanager-connection_setting_cdma_widget.h"
-#include "knetworkmanager-connection_setting_gsm_widget.h"
-#include "knetworkmanager-connection_setting_ppp_widget.h"
-#include "knetworkmanager-connection_setting_serial_widget.h"
-#include "knetworkmanager-connection_setting_wireless_widget.h"
-#include "knetworkmanager-connection_setting_wireless_security_widget.h"
-#include "knetworkmanager-connection_setting_ipv4_widget.h"
-#include "knetworkmanager-connection_setting_info_widget.h"
-#include "knetworkmanager-wireless_network.h"
-#include "knetworkmanager-wireless_manager.h"
+#include "tdenetman-connection_setting_widget_interface.h"
+#include "tdenetman-connection_settings_dialog.h"
+#include "tdenetman-connection_setting_cdma_widget.h"
+#include "tdenetman-connection_setting_gsm_widget.h"
+#include "tdenetman-connection_setting_ppp_widget.h"
+#include "tdenetman-connection_setting_serial_widget.h"
+#include "tdenetman-connection_setting_wireless_widget.h"
+#include "tdenetman-connection_setting_wireless_security_widget.h"
+#include "tdenetman-connection_setting_ipv4_widget.h"
+#include "tdenetman-connection_setting_info_widget.h"
+#include "tdenetman-wireless_network.h"
+#include "tdenetman-wireless_manager.h"
 
 char use_new_wireless_essid = 0;
 TQByteArray new_wireless_essid;
@@ -458,4 +458,4 @@ ConnectionSettingsDialogImpl::slotEnableButtons()
 	}
 }
 
-#include "knetworkmanager-connection_settings_dialog.moc"
+#include "tdenetman-connection_settings_dialog.moc"
diff --git a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_settings_dialog.h b/tdenetworkmanager/src/configwidgets/tdenetman-connection_settings_dialog.h
index f65de7a..8337338 100644
--- a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_settings_dialog.h
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_settings_dialog.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-devicestore_dbus.h - A NetworkManager frontend for KDE
+ * tdenetman-devicestore_dbus.h - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -36,9 +36,6 @@
 // ui autogenerated headers
 #include "connection_settings.h"
 
-// knm headers
-#include "knetworkmanager-connection_setting.h"
-
 class TQWidget;
 class Device;