Rename files to something more sensible

107 files changed, 415 insertions, 436 deletions

diff --git a/tdenetworkmanager/CMakeLists.txt b/tdenetworkmanager/CMakeLists.txt
index 119a77e..1938a55 100644
--- a/tdenetworkmanager/CMakeLists.txt
+++ b/tdenetworkmanager/CMakeLists.txt
@@ -14,4 +14,4 @@ add_subdirectory( src )
 # add_subdirectory( vpn-plugins )
 # add_subdirectory( po )
 
-install( FILES knetworkmanager.conf DESTINATION ${DBUS_SYS_DIR} )
+install( FILES tdenetworkmanager.conf DESTINATION ${DBUS_SYS_DIR} )
diff --git a/tdenetworkmanager/pics/CMakeLists.txt b/tdenetworkmanager/pics/CMakeLists.txt
index 44de539..edb9979 100644
--- a/tdenetworkmanager/pics/CMakeLists.txt
+++ b/tdenetworkmanager/pics/CMakeLists.txt
@@ -9,5 +9,5 @@
 #
 #################################################
 
-tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/knetworkmanager/icons )
-tde_install_icons( knetworkmanager knetworkmanager_disabled )
+tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/tdenetworkmanager/icons )
+tde_install_icons( tdenetworkmanager tdenetworkmanager_disabled )
diff --git a/tdenetworkmanager/pics/hi16-app-knetworkmanager.png b/tdenetworkmanager/pics/hi16-app-tdenetman.png
index db29bb8..db29bb8 100644
--- a/tdenetworkmanager/pics/hi16-app-knetworkmanager.png
+++ b/tdenetworkmanager/pics/hi16-app-tdenetman.png
diff --git a/tdenetworkmanager/pics/hi16-app-knetworkmanager_disabled.png b/tdenetworkmanager/pics/hi16-app-tdenetman_disabled.png
index 971f7e3..971f7e3 100644
--- a/tdenetworkmanager/pics/hi16-app-knetworkmanager_disabled.png
+++ b/tdenetworkmanager/pics/hi16-app-tdenetman_disabled.png
diff --git a/tdenetworkmanager/pics/hi32-app-knetworkmanager.png b/tdenetworkmanager/pics/hi32-app-tdenetman.png
index 5e98e9c..5e98e9c 100644
--- a/tdenetworkmanager/pics/hi32-app-knetworkmanager.png
+++ b/tdenetworkmanager/pics/hi32-app-tdenetman.png
diff --git a/tdenetworkmanager/pics/hi32-app-knetworkmanager_disabled.png b/tdenetworkmanager/pics/hi32-app-tdenetman_disabled.png
index a9ed5f9..a9ed5f9 100644
--- a/tdenetworkmanager/pics/hi32-app-knetworkmanager_disabled.png
+++ b/tdenetworkmanager/pics/hi32-app-tdenetman_disabled.png
diff --git a/tdenetworkmanager/pics/hi48-app-knetworkmanager.png b/tdenetworkmanager/pics/hi48-app-tdenetman.png
index 8306829..8306829 100644
--- a/tdenetworkmanager/pics/hi48-app-knetworkmanager.png
+++ b/tdenetworkmanager/pics/hi48-app-tdenetman.png
diff --git a/tdenetworkmanager/pics/hi48-app-knetworkmanager_disabled.png b/tdenetworkmanager/pics/hi48-app-tdenetman_disabled.png
index 53eafb4..53eafb4 100644
--- a/tdenetworkmanager/pics/hi48-app-knetworkmanager_disabled.png
+++ b/tdenetworkmanager/pics/hi48-app-tdenetman_disabled.png
diff --git a/tdenetworkmanager/src/CMakeLists.txt b/tdenetworkmanager/src/CMakeLists.txt
index aa06061..28fa0f8 100644
--- a/tdenetworkmanager/src/CMakeLists.txt
+++ b/tdenetworkmanager/src/CMakeLists.txt
@@ -33,35 +33,35 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    knetworkmanager-plugin.h knetworkmanager-vpnplugin.h
+    tdenetman-plugin.h tdenetman-vpnplugin.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
 ##### other data ################################
 
-install( FILES knetworkmanager.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/knetworkmanager )
-install( FILES knetworkmanager_plugin.desktop knetworkmanager_vpnplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
+install( FILES tdenetworkmanager.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/tdenetworkmanager )
+install( FILES tdenetworkmanager_plugin.desktop tdenetworkmanager_vpnplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 
-##### knetworkmanager (tdeinit) #################
+##### tdenetman (tdeinit) #################
 
-tde_add_tdeinit_executable( knetworkmanager AUTOMOC
+tde_add_tdeinit_executable( tdenetman AUTOMOC
   SOURCES
     connection_editor.ui
-    vpnauthentication.ui main.cpp knetworkmanager.cpp knetworkmanager-tray.cpp
-    #knetworkmanager-vpn_plugin.cpp
-    knetworkmanager-cellular_device_tray.cpp knetworkmanager-device_tray.cpp
-    knetworkmanager-wired_device_tray.cpp knetworkmanager-wireless_device_tray.cpp
-    knetworkmanager-wireless_menuitem.cpp knetworkmanager-menuitem.cpp
-    knetworkmanager-menu_subhead.cpp
+    vpnauthentication.ui main.cpp tdenetman.cpp tdenetman-tray.cpp
+    #tdenetman-vpn_plugin.cpp
+    tdenetman-cellular_device_tray.cpp tdenetman-device_tray.cpp
+    tdenetman-wired_device_tray.cpp tdenetman-wireless_device_tray.cpp
+    tdenetman-wireless_menuitem.cpp tdenetman-menuitem.cpp
+    tdenetman-menu_subhead.cpp
     sha1.cpp md5.cpp
-    knetworkmanager-wireless_network.cpp knetworkmanager-wireless_manager.cpp
-    knetworkmanager-connection_editor.cpp
+    tdenetman-wireless_network.cpp tdenetman-wireless_manager.cpp
+    tdenetman-connection_editor.cpp
     devicetraycomponent.cpp traycomponent.cpp
-    #knetworkmanager-plugin.cpp knetworkmanager-vpnplugin.cpp
-    #knetworkmanager-pluginmanager.cpp knetworkmanager-vpnservice.cpp knetworkmanager-vpnmanager.cpp
-    #knetworkmanager-vpnauthenticationdialog.cpp
+    #tdenetman-plugin.cpp tdenetman-vpnplugin.cpp
+    #tdenetman-pluginmanager.cpp tdenetman-vpnservice.cpp tdenetman-vpnmanager.cpp
+    #tdenetman-vpnauthenticationdialog.cpp
     #vpn_tray_component.cpp
   EMBED tdenetwork-connection-configwidgets-static #tdenetwork-connection-settings-static
   LINK tdecore-shared tdeui-shared kutils-shared ${DBUS_TQT_LIBRARIES}
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;
 
diff --git a/tdenetworkmanager/src/knetworkmanager_plugin.desktop b/tdenetworkmanager/src/knetworkmanager_plugin.desktop
deleted file mode 100644
index ec85a19..0000000
--- a/tdenetworkmanager/src/knetworkmanager_plugin.desktop
+++ /dev/null
@@ -1,31 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=ServiceType
-X-TDE-ServiceType=KNetworkManager/Plugin
-X-TDE-Derived=KPluginInfo
-Name=KNetworkManager Plugin
-Name[et]=KNetworkManageri plugin
-Name[ja]=KNetworkManager プラグイン
-Name[sr]=Прикључак KNetworkManager-а
-Name[sr@Latn]=Прикључак KNetworkManager-а
-Name[sv]=Nätverkshantering insticksprogram
-Comment=KNetworkManager Plugin
-Comment[bg]=Приставка за KNetworkManager
-Comment[bn]=কে-নেটওয়ার্ক-ম্যানেজার প্লাগিন
-Comment[br]=Lugent KNetworkManager
-Comment[ca]=Connector del KNetworkManager
-Comment[da]=Netværkshåndtering-plugin
-Comment[de]=KNetworkManager-Modul
-Comment[el]=Πρόσθετο του KNetworkManager
-Comment[es]=Complemento de KNetworkManager
-Comment[et]=KNetworkManageri plugin
-Comment[it]=Plugin di KNetworkManager
-Comment[ja]=KNetworkManager プラグイン
-Comment[nl]=KNetworkManager-plugin
-Comment[pt]='Plugin' do KNetworkManager
-Comment[sr]=Прикључак KNetworkManager-а
-Comment[sr@Latn]=Priključak KNetworkManager-a
-Comment[sv]=Nätverkshantering insticksprogram
-Comment[tr]=KNetworkManager Eklentisi
-Comment[xx]=xxKNetworkManager Pluginxx
-
diff --git a/tdenetworkmanager/src/knetworkmanager_vpnplugin.desktop b/tdenetworkmanager/src/knetworkmanager_vpnplugin.desktop
deleted file mode 100644
index 4cf28dc..0000000
--- a/tdenetworkmanager/src/knetworkmanager_vpnplugin.desktop
+++ /dev/null
@@ -1,33 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=ServiceType
-X-TDE-ServiceType=KNetworkManager/VPNPlugin
-X-TDE-Derived=KNetworkManager/Plugin
-Name=KNetworkManager VPN Plugin
-Name[et]=KNetworkManageri VPN-plugin
-Name[ja]=KNetworkManager VPN プラグイン
-Name[sr]=Прикључак KNetworkManager-а за VPN
-Name[sr@Latn]=Прикључак KNetworkManager-а за VPN
-Name[sv]=Nätverkshantering VPN-insticksprogram
-Comment=KNetworkManager VPN Plugin
-Comment[bg]=VPN приставка за KNetworkManager
-Comment[bn]=কে-নেটওয়ার্ক-ম্যানেজার ভিপিএন প্লাগিন
-Comment[br]=Lugent VPN evit KNetworkManager
-Comment[ca]=Connector VPN del KNetworkManager
-Comment[da]=KNetworkManager VPN-plugin
-Comment[de]=KNetworkManager-VPN-Modul
-Comment[el]=Πρόσθετο VPN του KNetworkManager
-Comment[es]=Complemento de VPN de KNetworkManager
-Comment[et]=KNetworkManageri VPN-plugin
-Comment[it]=Plugin VPN di KNetworkManager
-Comment[ja]=KNetworkManager VPN プラグイン
-Comment[nl]=KNetworkManager VPN-plugin
-Comment[pt]='Plugin' de VPN do KNetworkManager
-Comment[sr]=Прикључак KNetworkManager-а за VPN
-Comment[sr@Latn]=Priključak KNetworkManager-a za VPN
-Comment[sv]=Nätverkshantering VPN-insticksprogram
-Comment[tr]=KNetworkManager VPN Eklentisi
-Comment[xx]=xxKNetworkManager VPN Pluginxx
-
-[PropertyDef::X-NetworkManager-Services]
-Type=TQString
diff --git a/tdenetworkmanager/src/main.cpp b/tdenetworkmanager/src/main.cpp
index fd11c11..db41130 100644
--- a/tdenetworkmanager/src/main.cpp
+++ b/tdenetworkmanager/src/main.cpp
@@ -32,7 +32,7 @@
 #include <tqtimer.h>
 
 // KNM includes
-#include "knetworkmanager.h"
+#include "tdenetman.h"
 
 
 static const char* knm_version = I18N_NOOP(KNETWORKMANAGER_VERSION_STRING);
diff --git a/tdenetworkmanager/src/settings.kcfgc b/tdenetworkmanager/src/settings.kcfgc
index 35e7882..a7ab93a 100644
--- a/tdenetworkmanager/src/settings.kcfgc
+++ b/tdenetworkmanager/src/settings.kcfgc
@@ -1,5 +1,5 @@
 # Code generation options for kconfig_compiler
-File=knetworkmanager.kcfg
+File=tdenetworkmanager.kcfg
 ClassName=Settings
 Singleton=true
 Mutators=true
diff --git a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting.cpp b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting.cpp
index 50d7423..e4337a9 100644
--- a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting.cpp
+++ b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting.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.
  *
@@ -34,10 +34,10 @@
 #include <tqdbusdata.h>
 #include <tqdbusdatamap.h>
 
-/* knetworkmanager headers */
-#include "knetworkmanager.h"
-#include "knetworkmanager-connection_setting.h"
-#include "knetworkmanager-connection.h"
+/* tdenetman headers */
+#include "tdenetman.h"
+#include "tdenetman-connection_setting.h"
+#include "tdenetman-connection.h"
 
 using namespace ConnectionSettings;
 
@@ -103,4 +103,4 @@ ConnectionSetting::emitValidityChanged()
 	emit validityChanged();
 }
 
-#include "knetworkmanager-connection_setting.moc"
+#include "tdenetman-connection_setting.moc"
diff --git a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting.h b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting.h
index f189117..08b3ba7 100644
--- a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting.h
+++ b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting.h - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting.h - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
diff --git a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_8021x.cpp b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_8021x.cpp
index 4904f01..21beba8 100644
--- a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_8021x.cpp
+++ b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_8021x.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting_8021x.cpp - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting_8021x.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -34,12 +34,12 @@
 #include <tqdbusdata.h>
 #include <tqdbusdatamap.h>
 
-/* knetworkmanager headers */
-#include "knetworkmanager.h"
-#include "knetworkmanager-connection_setting_8021x.h"
-#include "knetworkmanager-accesspoint.h"
-#include "knetworkmanager-connection_setting_wireless.h"
-#include "knetworkmanager-connection.h"
+/* tdenetman headers */
+#include "tdenetman.h"
+#include "tdenetman-connection_setting_8021x.h"
+#include "tdenetman-accesspoint.h"
+#include "tdenetman-connection_setting_wireless.h"
+#include "tdenetman-connection.h"
 #include "sha1.h"
 #include "md5.h"
 
diff --git a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_8021x.h b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_8021x.h
index a5c593e..a86a3c7 100644
--- a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_8021x.h
+++ b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_8021x.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting_8021x.h - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting_8021x.h - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -33,7 +33,7 @@
 
 #include <tqdbusdata.h>
 
-#include "knetworkmanager-connection_setting.h"
+#include "tdenetman-connection_setting.h"
 #include "qbidirectionalmap.h"
 /* NM */
 #include <nm-setting-8021x.h>
diff --git a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_cdma.cpp b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_cdma.cpp
index 854590c..5e8886e 100644
--- a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_cdma.cpp
+++ b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_cdma.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting_serial.cpp - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting_serial.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -34,10 +34,10 @@
 #include <tqdbusdata.h>
 #include <tqdbusdatamap.h>
 
-/* knetworkmanager headers */
-#include "knetworkmanager.h"
-#include "knetworkmanager-connection.h"
-#include "knetworkmanager-connection_setting_cdma.h"
+/* tdenetman headers */
+#include "tdenetman.h"
+#include "tdenetman-connection.h"
+#include "tdenetman-connection_setting_cdma.h"
 
 using namespace ConnectionSettings;
 
diff --git a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_cdma.h b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_cdma.h
index c0825b3..a145988 100644
--- a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_cdma.h
+++ b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_cdma.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting_cdma.h - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting_cdma.h - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -33,7 +33,7 @@
 
 #include <tqdbusdata.h>
 
-#include "knetworkmanager-connection_setting.h"
+#include "tdenetman-connection_setting.h"
 
 /* NM headers */
 #include <nm-setting-cdma.h>
diff --git a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_gsm.cpp b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_gsm.cpp
index cd38c3f..b0714e0 100644
--- a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_gsm.cpp
+++ b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_gsm.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting_gsm.cpp - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting_gsm.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -34,10 +34,10 @@
 #include <tqdbusdata.h>
 #include <tqdbusdatamap.h>
 
-/* knetworkmanager headers */
-#include "knetworkmanager.h"
-#include "knetworkmanager-connection.h"
-#include "knetworkmanager-connection_setting_gsm.h"
+/* tdenetman headers */
+#include "tdenetman.h"
+#include "tdenetman-connection.h"
+#include "tdenetman-connection_setting_gsm.h"
 
 /* network-manager headers */
 #include <NetworkManager.h>
diff --git a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_gsm.h b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_gsm.h
index ac912ae..9ca5e07 100644
--- a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_gsm.h
+++ b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_gsm.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting_gsm.h - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting_gsm.h - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -33,7 +33,7 @@
 
 #include <tqdbusdata.h>
 
-#include "knetworkmanager-connection_setting.h"
+#include "tdenetman-connection_setting.h"
 
 /* NM headers */
 #include <nm-setting-gsm.h>
diff --git a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_info.cpp b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_info.cpp
index 225d002..a433bf5 100644
--- a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_info.cpp
+++ b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_info.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.
  *
@@ -34,10 +34,10 @@
 #include <tqdbusdata.h>
 #include <tqdbusdatamap.h>
 
-/* knetworkmanager headers */
-#include "knetworkmanager.h"
-#include "knetworkmanager-connection_setting_info.h"
-#include "knetworkmanager-accesspoint.h"
+/* tdenetman headers */
+#include "tdenetman.h"
+#include "tdenetman-connection_setting_info.h"
+#include "tdenetman-accesspoint.h"
 
 
 using namespace ConnectionSettings;
diff --git a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_info.h b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_info.h
index 705387b..facf9c7 100644
--- a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_info.h
+++ b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_info.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.
  *
@@ -33,7 +33,7 @@
 #include <tqdatetime.h>
 
 #include <tqdbusdata.h>
-#include "knetworkmanager-connection_setting.h"
+#include "tdenetman-connection_setting.h"
 
 /* NM headers */
 #include <nm-setting-connection.h>
diff --git a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_ipv4.cpp b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_ipv4.cpp
index 15f8978..263f65e 100644
--- a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_ipv4.cpp
+++ b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_ipv4.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.
  *
@@ -34,9 +34,9 @@
 #include <tqdbusdata.h>
 #include <tqdbusdatamap.h>
 
-/* knetworkmanager headers */
-#include "knetworkmanager.h"
-#include "knetworkmanager-connection_setting_ipv4.h"
+/* tdenetman headers */
+#include "tdenetman.h"
+#include "tdenetman-connection_setting_ipv4.h"
 
 
 using namespace ConnectionSettings;
diff --git a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_ipv4.h b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_ipv4.h
index 7788769..506631d 100644
--- a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_ipv4.h
+++ b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_ipv4.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.
  *
@@ -33,7 +33,7 @@
 
 #include <tqdbusdata.h>
 
-#include "knetworkmanager-connection_setting.h"
+#include "tdenetman-connection_setting.h"
 
 /* NM headers */
 #include <nm-setting-ip4-config.h>
diff --git a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_ppp.cpp b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_ppp.cpp
index 257a012..513a3ca 100644
--- a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_ppp.cpp
+++ b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_ppp.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting_ppp.cpp - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting_ppp.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -37,10 +37,10 @@
 #include <tqdbusdata.h>
 #include <tqdbusdatamap.h>
 
-/* knetworkmanager headers */
-#include "knetworkmanager.h"
-#include "knetworkmanager-connection.h"
-#include "knetworkmanager-connection_setting_ppp.h"
+/* tdenetman headers */
+#include "tdenetman.h"
+#include "tdenetman-connection.h"
+#include "tdenetman-connection_setting_ppp.h"
 
 using namespace ConnectionSettings;
 
diff --git a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_ppp.h b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_ppp.h
index 9f72e42..ddb966a 100644
--- a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_ppp.h
+++ b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_ppp.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting_ppp.h - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting_ppp.h - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -33,7 +33,7 @@
 
 #include <tqdbusdata.h>
 
-#include "knetworkmanager-connection_setting.h"
+#include "tdenetman-connection_setting.h"
 
 namespace ConnectionSettings
 {
diff --git a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_serial.cpp b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_serial.cpp
index 4861e7b..d7245a9 100644
--- a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_serial.cpp
+++ b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_serial.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting_serial.cpp - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting_serial.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -34,10 +34,10 @@
 #include <tqdbusdata.h>
 #include <tqdbusdatamap.h>
 
-/* knetworkmanager headers */
-#include "knetworkmanager.h"
-#include "knetworkmanager-connection.h"
-#include "knetworkmanager-connection_setting_serial.h"
+/* tdenetman headers */
+#include "tdenetman.h"
+#include "tdenetman-connection.h"
+#include "tdenetman-connection_setting_serial.h"
 
 using namespace ConnectionSettings;
 
diff --git a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_serial.h b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_serial.h
index 40099a7..956e3c2 100644
--- a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_serial.h
+++ b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_serial.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting_serial.h - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting_serial.h - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -33,7 +33,7 @@
 
 #include <tqdbusdata.h>
 
-#include "knetworkmanager-connection_setting.h"
+#include "tdenetman-connection_setting.h"
 
 /* NM headers */
 #include <nm-setting-ppp.h>
diff --git a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_vpn.cpp b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_vpn.cpp
index 22e8b20..4d45f2b 100644
--- a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_vpn.cpp
+++ b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_vpn.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting_vpn.cpp - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting_vpn.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -34,9 +34,9 @@
 #include <tqdbusdata.h>
 #include <tqdbusdatamap.h>
 
-/* knetworkmanager headers */
-#include "knetworkmanager.h"
-#include "knetworkmanager-connection_setting_vpn.h"
+/* tdenetman headers */
+#include "tdenetman.h"
+#include "tdenetman-connection_setting_vpn.h"
 
 using namespace ConnectionSettings;
 
diff --git a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_vpn.h b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_vpn.h
index 6850fc2..e1c1a7a 100644
--- a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_vpn.h
+++ b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_vpn.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_setting_vpn.h - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting_vpn.h - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -33,7 +33,7 @@
 #include <tqdatetime.h>
 
 #include <tqdbusdata.h>
-#include "knetworkmanager-connection_setting.h"
+#include "tdenetman-connection_setting.h"
 
 /* NM headers */
 #include <nm-setting-vpn.h>
diff --git a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wired.cpp b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wired.cpp
index 03aa61f..068592c 100644
--- a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wired.cpp
+++ b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wired.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.
  *
@@ -37,10 +37,10 @@
 /* NM headers */
 #include <nm-setting-wired.h>
 
-/* knetworkmanager headers */
-#include "knetworkmanager.h"
-#include "knetworkmanager-connection_setting_wired.h"
-#include "knetworkmanager-accesspoint.h"
+/* tdenetman headers */
+#include "tdenetman.h"
+#include "tdenetman-connection_setting_wired.h"
+#include "tdenetman-accesspoint.h"
 
 
 using namespace ConnectionSettings;
diff --git a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wired.h b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wired.h
index 9da930e..ba430f0 100644
--- a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wired.h
+++ b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wired.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,7 +32,7 @@
 #include <tqobject.h>
 
 #include <tqdbusdata.h>
-#include "knetworkmanager-connection_setting.h"
+#include "tdenetman-connection_setting.h"
 #include <nm-setting-wired.h>
 
 namespace ConnectionSettings
diff --git a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wireless.cpp b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wireless.cpp
index 2e1db8e..1076994 100644
--- a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wireless.cpp
+++ b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wireless.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.
  *
@@ -35,11 +35,11 @@
 #include <tqdbusdata.h>
 #include <tqdbusdatamap.h>
 
-/* knetworkmanager headers */
-#include "knetworkmanager.h"
-#include "knetworkmanager-connection_setting_wireless.h"
-#include "knetworkmanager-connection_setting_wireless_security.h"
-#include "knetworkmanager-accesspoint.h"
+/* tdenetman headers */
+#include "tdenetman.h"
+#include "tdenetman-connection_setting_wireless.h"
+#include "tdenetman-connection_setting_wireless_security.h"
+#include "tdenetman-accesspoint.h"
 
 // the bssid should look like XX:XX:XX:XX:XX:XX where X is a hexadecimal digit
 #define MAC_ADDRESS_PATTERN "[0-9A-Fa-f]{2}:[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2}"
diff --git a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wireless.h b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wireless.h
index acdec94..83acae2 100644
--- a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wireless.h
+++ b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wireless.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,7 +32,7 @@
 #include <tqobject.h>
 
 #include <tqdbusdata.h>
-#include "knetworkmanager-connection_setting.h"
+#include "tdenetman-connection_setting.h"
 #include "qbidirectionalmap.h"
 /* NM headers */
 #include <nm-setting-wireless.h>
diff --git a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wireless_security.cpp b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wireless_security.cpp
index a01f8f6..7b72a83 100644
--- a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wireless_security.cpp
+++ b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wireless_security.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
  *
- * knetworkmanager-connection_setting_wireless_security.cpp - A NetworkManager frontend for KDE
+ * tdenetman-connection_setting_wireless_security.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -34,12 +34,12 @@
 #include <tqdbusdata.h>
 #include <tqdbusdatamap.h>
 
-/* knetworkmanager headers */
-#include "knetworkmanager.h"
-#include "knetworkmanager-connection_setting_wireless_security.h"
-#include "knetworkmanager-accesspoint.h"
-#include "knetworkmanager-connection_setting_wireless.h"
-#include "knetworkmanager-connection.h"
+/* tdenetman headers */
+#include "tdenetman.h"
+#include "tdenetman-connection_setting_wireless_security.h"
+#include "tdenetman-accesspoint.h"
+#include "tdenetman-connection_setting_wireless.h"
+#include "tdenetman-connection.h"
 #include "sha1.h"
 #include "md5.h"
 
diff --git a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wireless_security.h b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wireless_security.h
index 187fd37..34db7b0 100644
--- a/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wireless_security.h
+++ b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wireless_security.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.
  *
@@ -33,7 +33,7 @@
 
 #include <tqdbusdata.h>
 
-#include "knetworkmanager-connection_setting.h"
+#include "tdenetman-connection_setting.h"
 #include "qbidirectionalmap.h"
 /* NM */
 #include <nm-setting-wireless-security.h>
diff --git a/tdenetworkmanager/src/knetworkmanager-cellular_device_tray.cpp b/tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp
index d3d23d5..cdfa153 100644
--- a/tdenetworkmanager/src/knetworkmanager-cellular_device_tray.cpp
+++ b/tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-cellular_device_tray.cpp - A NetworkManager frontend for KDE
+ * tdenetman-cellular_device_tray.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -31,11 +31,11 @@
 #include <kiconloader.h>
 
 // KNM includes
-#include "knetworkmanager-cellular_device_tray.h"
-#include "knetworkmanager-menuitem.h"
-#include "knetworkmanager-menu_subhead.h"
+#include "tdenetman-cellular_device_tray.h"
+#include "tdenetman-menuitem.h"
+#include "tdenetman-menu_subhead.h"
 
-#include "knetworkmanager-connection_settings_dialog.h"
+#include "tdenetman-connection_settings_dialog.h"
 
 using namespace ConnectionSettings;
 
@@ -127,4 +127,4 @@ CellularDeviceTray::~CellularDeviceTray ()
 }
 
 
-#include "knetworkmanager-cellular_device_tray.moc"
+#include "tdenetman-cellular_device_tray.moc"
diff --git a/tdenetworkmanager/src/knetworkmanager-cellular_device_tray.h b/tdenetworkmanager/src/tdenetman-cellular_device_tray.h
index 323a559..f6fdf89 100644
--- a/tdenetworkmanager/src/knetworkmanager-cellular_device_tray.h
+++ b/tdenetworkmanager/src/tdenetman-cellular_device_tray.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager.h - A NetworkManager frontend for KDE 
+ * tdenetman.h - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -28,7 +28,7 @@
 #define KNETWORKMANAGER_CELLULAR_DEVICE_TRAY_H
 
 // KNM includes
-#include "knetworkmanager.h"
+#include "tdenetman.h"
 #include "devicetraycomponent.h"
 
 // predefs
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_editor.cpp b/tdenetworkmanager/src/tdenetman-connection_editor.cpp
index 6d2368f..5c3ea1a 100644
--- a/tdenetworkmanager/src/knetworkmanager-connection_editor.cpp
+++ b/tdenetworkmanager/src/tdenetman-connection_editor.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_editor.cpp - A NetworkManager frontend for KDE
+ * tdenetman-connection_editor.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -42,9 +42,8 @@
 #include <kcombobox.h>
 
 // knm headers
-#include "knetworkmanager-connection_setting_info.h"
-#include "knetworkmanager-connection_editor.h"
-#include "knetworkmanager-connection_settings_dialog.h"
+#include "tdenetman-connection_editor.h"
+#include "tdenetman-connection_settings_dialog.h"
 
 using namespace ConnectionSettings;
 
@@ -240,4 +239,4 @@ void ConnectionEditorImpl::fillConnectionList()
 	}
 }
 
-#include "knetworkmanager-connection_editor.moc"
+#include "tdenetman-connection_editor.moc"
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_editor.h b/tdenetworkmanager/src/tdenetman-connection_editor.h
index 83ec029..8026b8d 100644
--- a/tdenetworkmanager/src/knetworkmanager-connection_editor.h
+++ b/tdenetworkmanager/src/tdenetman-connection_editor.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-connection_editor.h - A NetworkManager frontend for KDE
+ * tdenetman-connection_editor.h - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -35,9 +35,6 @@
 #include <tdehardwaredevices.h>
 #include <tdenetworkconnections.h>
 
-// knm headers
-#include "knetworkmanager-connection_setting.h"
-
 class TQWidget;
 class Device;
 
diff --git a/tdenetworkmanager/src/knetworkmanager-device_tray.cpp b/tdenetworkmanager/src/tdenetman-device_tray.cpp
index 493582a..d9bedc0 100644
--- a/tdenetworkmanager/src/knetworkmanager-device_tray.cpp
+++ b/tdenetworkmanager/src/tdenetman-device_tray.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-device_tray.cpp - A NetworkManager frontend for KDE
+ * tdenetman-device_tray.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -56,10 +56,9 @@ class WirelessDialog;
 #include <tdenetworkconnections.h>
 
 // KNM includes
-#include "knetworkmanager-device_tray.h"
-#include "knetworkmanager-menu_subhead.h"
-#include "knetworkmanager-connection_settings_dialog.h"
-#include "knetworkmanager-connection_setting_info.h"
+#include "tdenetman-device_tray.h"
+#include "tdenetman-menu_subhead.h"
+#include "tdenetman-connection_settings_dialog.h"
 
 using namespace ConnectionSettings;
 
@@ -221,7 +220,7 @@ void DeviceTray::contextMenuAboutToShow (KPopupMenu* menu)
 	menu->clear();
 
 	// insert title
-	menu->insertTitle (SmallIcon ("knetworkmanager",  TQIconSet::Automatic), "KNetworkManager", -1, -1);
+	menu->insertTitle (SmallIcon ("tdenetman",  TQIconSet::Automatic), "KNetworkManager", -1, -1);
 
 	// let the specific device_tray add its items
 	addMenuItems(menu);
@@ -377,4 +376,4 @@ DeviceTray::~DeviceTray ()
 }
 
 
-#include "knetworkmanager-device_tray.moc"
+#include "tdenetman-device_tray.moc"
diff --git a/tdenetworkmanager/src/knetworkmanager-device_tray.h b/tdenetworkmanager/src/tdenetman-device_tray.h
index 2ee1c87..82f7732 100644
--- a/tdenetworkmanager/src/knetworkmanager-device_tray.h
+++ b/tdenetworkmanager/src/tdenetman-device_tray.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-device_tray.h - A NetworkManager frontend for KDE
+ * tdenetman-device_tray.h - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -45,7 +45,7 @@
 #include <tdehardwaredevices.h>
 #include <tdenetworkconnections.h>
 
-#include "knetworkmanager.h"
+#include "tdenetman.h"
 
 class DeviceTrayPrivate;
 
diff --git a/tdenetworkmanager/src/knetworkmanager-menu_subhead.cpp b/tdenetworkmanager/src/tdenetman-menu_subhead.cpp
index 5a69cd5..3821b80 100644
--- a/tdenetworkmanager/src/knetworkmanager-menu_subhead.cpp
+++ b/tdenetworkmanager/src/tdenetman-menu_subhead.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-tray.cpp - A NetworkManager frontend for KDE
+ * tdenetman-tray.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -48,7 +48,7 @@ class WirelessDialog;
 #include <kconfig.h>
 #include <kmessagebox.h>
 
-#include "knetworkmanager-menu_subhead.h"
+#include "tdenetman-menu_subhead.h"
 
 Subhead::Subhead (TQWidget* parent, const char* name, const TQString & caption, const TQPixmap icon)
        : TQWidget (parent, name)
diff --git a/tdenetworkmanager/src/knetworkmanager-menu_subhead.h b/tdenetworkmanager/src/tdenetman-menu_subhead.h
index 8891fc4..a142d3e 100644
--- a/tdenetworkmanager/src/knetworkmanager-menu_subhead.h
+++ b/tdenetworkmanager/src/tdenetman-menu_subhead.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager.h - A NetworkManager frontend for KDE 
+ * tdenetman.h - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -44,7 +44,7 @@
 #include <tqprogressbar.h>
 #include <tqguardedptr.h>
 
-#include "knetworkmanager.h"
+#include "tdenetman.h"
 
 class Subhead : public TQWidget
 {
diff --git a/tdenetworkmanager/src/knetworkmanager-menuitem.cpp b/tdenetworkmanager/src/tdenetman-menuitem.cpp
index 927f1ae..e59102f 100644
--- a/tdenetworkmanager/src/knetworkmanager-menuitem.cpp
+++ b/tdenetworkmanager/src/tdenetman-menuitem.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-menuitem.cpp - A NetworkManager frontend for KDE
+ * tdenetman-menuitem.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006, 2008 Novell, Inc.
  *
@@ -25,7 +25,7 @@
  *
  **************************************************************************/
 
-#include "knetworkmanager-menuitem.h"
+#include "tdenetman-menuitem.h"
 
 #include <tqevent.h>
 #include <tqguardedptr.h>
@@ -120,4 +120,4 @@ NetworkMenuItem::~NetworkMenuItem ()
 
 
 
-#include "knetworkmanager-menuitem.moc"
+#include "tdenetman-menuitem.moc"
diff --git a/tdenetworkmanager/src/knetworkmanager-menuitem.h b/tdenetworkmanager/src/tdenetman-menuitem.h
index 86552dc..be1584e 100644
--- a/tdenetworkmanager/src/knetworkmanager-menuitem.h
+++ b/tdenetworkmanager/src/tdenetman-menuitem.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-menuitem.h - A NetworkManager frontend for KDE 
+ * tdenetman-menuitem.h - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2005, 2006, 2008 Novell, Inc.
  *
diff --git a/tdenetworkmanager/src/knetworkmanager-nm_vpn_proxy.cpp b/tdenetworkmanager/src/tdenetman-nm_vpn_proxy.cpp
index 737f4ef..756f0cc 100644
--- a/tdenetworkmanager/src/knetworkmanager-nm_vpn_proxy.cpp
+++ b/tdenetworkmanager/src/tdenetman-nm_vpn_proxy.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-device.cpp - A NetworkManager frontend for KDE 
+ * tdenetman-device.cpp - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -39,12 +39,12 @@
 #include <NetworkManagerVPN.h>
 
 // KNM includes
-#include "knetworkmanager.h"
-#include "knetworkmanager-nm_vpn_proxy.h"
-#include "knetworkmanager-device.h"
-#include "knetworkmanager-devicestore.h"
-//#include "knetworkmanager-connection.h"
-#include "knetworkmanager-connection_store.h"
+#include "tdenetman.h"
+#include "tdenetman-nm_vpn_proxy.h"
+#include "tdenetman-device.h"
+#include "tdenetman-devicestore.h"
+//#include "tdenetman-connection.h"
+#include "tdenetman-connection_store.h"
 #include "dbus/vpnconnectionproxy.h"
 
 class NMVPNProxyPrivate
@@ -78,4 +78,4 @@ NMVPNProxy* NMVPNProxy::getInstance()
 }
 
 
-#include "knetworkmanager-nm_vpn_proxy.moc"
+#include "tdenetman-nm_vpn_proxy.moc"
diff --git a/tdenetworkmanager/src/knetworkmanager-nm_vpn_proxy.h b/tdenetworkmanager/src/tdenetman-nm_vpn_proxy.h
index af5f8ec..b7d5ca7 100644
--- a/tdenetworkmanager/src/knetworkmanager-nm_vpn_proxy.h
+++ b/tdenetworkmanager/src/tdenetman-nm_vpn_proxy.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-nm_proxy.h - A NetworkManager frontend for KDE 
+ * tdenetman-nm_proxy.h - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
diff --git a/tdenetworkmanager/src/knetworkmanager-plugin.cpp b/tdenetworkmanager/src/tdenetman-plugin.cpp
index cb1d2b7..017db8d 100644
--- a/tdenetworkmanager/src/knetworkmanager-plugin.cpp
+++ b/tdenetworkmanager/src/tdenetman-plugin.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-plugin.cpp - A NetworkManager frontend for KDE 
+ * tdenetman-plugin.cpp - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2006 Novell, Inc.
  *
@@ -22,7 +22,7 @@
  *
  **************************************************************************/
 
-#include "knetworkmanager-plugin.h"
+#include "tdenetman-plugin.h"
 
 Plugin::Plugin(TQObject* parent, const char* name, const TQStringList& )
 	: TQObject(parent, name)
@@ -35,4 +35,4 @@ Plugin::~Plugin()
 
 }
 
-#include "knetworkmanager-plugin.moc"
+#include "tdenetman-plugin.moc"
diff --git a/tdenetworkmanager/src/knetworkmanager-plugin.h b/tdenetworkmanager/src/tdenetman-plugin.h
index 3a500ac..7bd2e99 100644
--- a/tdenetworkmanager/src/knetworkmanager-plugin.h
+++ b/tdenetworkmanager/src/tdenetman-plugin.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-plugin.h - A NetworkManager frontend for KDE 
+ * tdenetman-plugin.h - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2006 Novell, Inc.
  *
diff --git a/tdenetworkmanager/src/knetworkmanager-pluginmanager.cpp b/tdenetworkmanager/src/tdenetman-pluginmanager.cpp
index 7654ccd..3111385 100644
--- a/tdenetworkmanager/src/knetworkmanager-pluginmanager.cpp
+++ b/tdenetworkmanager/src/tdenetman-pluginmanager.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-pluginmanager.cpp - A NetworkManager frontend for KDE 
+ * tdenetman-pluginmanager.cpp - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2006 Novell, Inc.
  *
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-#include "knetworkmanager-pluginmanager.h"
+#include "tdenetman-pluginmanager.h"
 
 PluginManager* PluginManager::_instance;
 
@@ -181,4 +181,4 @@ KPluginInfo * PluginManager::infoForPluginID( const TQString& pluginID ) const
 	return 0L;
 }
 
-#include "knetworkmanager-pluginmanager.moc"
+#include "tdenetman-pluginmanager.moc"
diff --git a/tdenetworkmanager/src/knetworkmanager-pluginmanager.h b/tdenetworkmanager/src/tdenetman-pluginmanager.h
index efe6c63..d36ce10 100644
--- a/tdenetworkmanager/src/knetworkmanager-pluginmanager.h
+++ b/tdenetworkmanager/src/tdenetman-pluginmanager.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-pluginmanager.h - A NetworkManager frontend for KDE 
+ * tdenetman-pluginmanager.h - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2006 Novell, Inc.
  *
@@ -29,8 +29,8 @@
 #include <tqmap.h>
 #include <tqvaluelist.h>
 
-#include "knetworkmanager-plugin.h"
-#include "knetworkmanager.h"
+#include "tdenetman-plugin.h"
+#include "tdenetman.h"
 
 class KPluginInfo;
 
diff --git a/tdenetworkmanager/src/knetworkmanager-tray.cpp b/tdenetworkmanager/src/tdenetman-tray.cpp
index 7a818cc..36407e8 100644
--- a/tdenetworkmanager/src/knetworkmanager-tray.cpp
+++ b/tdenetworkmanager/src/tdenetman-tray.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-tray.cpp - A NetworkManager frontend for KDE
+ * tdenetman-tray.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -57,15 +57,15 @@
 #include <tqdialog.h>
 
 #include "devicetraycomponent.h"
-#include "knetworkmanager-tray.h"
+#include "tdenetman-tray.h"
 
-#include "knetworkmanager-connection_settings_dialog.h"
-#include "knetworkmanager-connection_editor.h"
-#include "knetworkmanager-menu_subhead.h"
+#include "tdenetman-connection_settings_dialog.h"
+#include "tdenetman-connection_editor.h"
+#include "tdenetman-menu_subhead.h"
 
-#include "knetworkmanager-wired_device_tray.h"
-#include "knetworkmanager-wireless_device_tray.h"
-#include "knetworkmanager-cellular_device_tray.h"
+#include "tdenetman-wired_device_tray.h"
+#include "tdenetman-wireless_device_tray.h"
+#include "tdenetman-cellular_device_tray.h"
 
 #include <stdio.h>
 
@@ -203,7 +203,7 @@ void Tray::contextMenuAboutToShow (KPopupMenu* menu)
 		}
 
 		// Submenu title
-		Subhead* subhead = new Subhead (menu, "subhead", TQString("Connection Management"), SmallIcon("knetworkmanager_disabled", TQIconSet::Automatic));
+		Subhead* subhead = new Subhead (menu, "subhead", TQString("Connection Management"), SmallIcon("tdenetworkmanager_disabled", TQIconSet::Automatic));
 		menu->insertItem (subhead, -1, -1);
 
 		// New connection
@@ -338,10 +338,10 @@ Tray::slotStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlag
 		|| (nm_state & TDENetworkGlobalManagerFlags::EstablishingLink)
 		|| (nm_state & TDENetworkGlobalManagerFlags::Disconnected)
 		|| (nm_state & TDENetworkGlobalManagerFlags::BackendUnavailable)) {
-		setPixmap (loadIcon ("knetworkmanager_disabled"));
+		setPixmap (loadIcon ("tdenetworkmanager_disabled"));
 	}
 	else if (nm_state & TDENetworkGlobalManagerFlags::Connected) {
-		setPixmap (loadIcon ("knetworkmanager"));
+		setPixmap (loadIcon ("tdenetworkmanager"));
 	}
 
 	printf("NM state: %d\n\r", nm_state);
@@ -632,10 +632,10 @@ void Tray::updateTrayIcon(TDENetworkConnectionStatus::TDENetworkConnectionStatus
 		else if (!dtc->pixmapForState(state).isNull())
 			setPixmap(dtc->pixmapForState(state));
 		else
-			setPixmap(loadIcon("knetworkmanager"));
+			setPixmap(loadIcon("tdenetworkmanager"));
 	}
 	else {
-		setPixmap(loadIcon("knetworkmanager"));
+		setPixmap(loadIcon("tdenetworkmanager"));
 	}
 
 	nm_device_state_global = state;
@@ -694,7 +694,7 @@ Tray::Tray () : KSystemTray ()
 
 	connect(&d->signalMapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(slotDeactivateConnection(int)));
 
-	setPixmap (loadIcon ("knetworkmanager"));
+	setPixmap (loadIcon ("tdenetworkmanager"));
 	setMouseTracking (true);
 
 	// Actions used for plugging into the menu
@@ -762,5 +762,5 @@ Tray::~Tray ()
 	delete d;
 }
 
-#include "knetworkmanager-tray.moc"
+#include "tdenetman-tray.moc"
 
diff --git a/tdenetworkmanager/src/knetworkmanager-tray.h b/tdenetworkmanager/src/tdenetman-tray.h
index 6f39948..6f49012 100644
--- a/tdenetworkmanager/src/knetworkmanager-tray.h
+++ b/tdenetworkmanager/src/tdenetman-tray.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager.h - A NetworkManager frontend for KDE 
+ * tdenetman.h - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -49,7 +49,7 @@
 #include <tqprogressbar.h>
 #include <tqguardedptr.h>
 
-#include "knetworkmanager.h"
+#include "tdenetman.h"
 
 namespace ConnectionSettings
 {
diff --git a/tdenetworkmanager/src/knetworkmanager-vpn_plugin.cpp b/tdenetworkmanager/src/tdenetman-vpn_plugin.cpp
index f56b221..e2ab272 100644
--- a/tdenetworkmanager/src/knetworkmanager-vpn_plugin.cpp
+++ b/tdenetworkmanager/src/tdenetman-vpn_plugin.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-vpn_plugin.cpp - A NetworkManager frontend for KDE 
+ * tdenetman-vpn_plugin.cpp - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -39,12 +39,12 @@
 #include <NetworkManagerVPN.h>
 
 // KNM includes
-#include "knetworkmanager.h"
-#include "knetworkmanager-tray.h"
-#include "knetworkmanager-vpn_plugin.h"
+#include "tdenetman.h"
+#include "tdenetman-tray.h"
+#include "tdenetman-vpn_plugin.h"
 #include "dbus/vpnpluginproxy.h"
-#include "knetworkmanager-hal_device_proxy.h"
-#include "knetworkmanager-nm_proxy.h"
+#include "tdenetman-hal_device_proxy.h"
+#include "tdenetman-nm_proxy.h"
 
 #if !defined(NM_CHECK_VERSION)
 #define NM_CHECK_VERSION(x,y,z) 0
@@ -129,4 +129,4 @@ VPNDBUSPlugin::~VPNDBUSPlugin ()
 }
 
 
-#include "knetworkmanager-vpn_plugin.moc"
+#include "tdenetman-vpn_plugin.moc"
diff --git a/tdenetworkmanager/src/knetworkmanager-vpn_plugin.h b/tdenetworkmanager/src/tdenetman-vpn_plugin.h
index 88c63e0..784de6d 100644
--- a/tdenetworkmanager/src/knetworkmanager-vpn_plugin.h
+++ b/tdenetworkmanager/src/tdenetman-vpn_plugin.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-wired_device.h - A NetworkManager frontend for KDE 
+ * tdenetman-wired_device.h - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -30,7 +30,7 @@
 #include <stdint.h>
 
 // KNM includes
-#include "knetworkmanager.h"
+#include "tdenetman.h"
 
 class KNetworkManager;
 
diff --git a/tdenetworkmanager/src/knetworkmanager-vpnauthenticationdialog.cpp b/tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.cpp
index ffeb933..e29d744 100644
--- a/tdenetworkmanager/src/knetworkmanager-vpnauthenticationdialog.cpp
+++ b/tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-vpnauthenticationdialog.cpp - A NetworkManager frontend for KDE 
+ * tdenetman-vpnauthenticationdialog.cpp - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2006 Novell, Inc.
  *
@@ -41,13 +41,13 @@
 #include <tqdbusobjectpath.h>
 #include <tqdbuserror.h>
 
-#include "knetworkmanager-vpnservice.h"
-#include "knetworkmanager-vpnmanager.h"
-#include "knetworkmanager-vpnauthenticationdialog.h"
-#include "knetworkmanager-vpn_connection.h"
-#include "knetworkmanager-nm_proxy.h"
-#include "knetworkmanager-connection_setting_vpn.h"
-#include "knetworkmanager-connection_setting_info.h"
+#include "tdenetman-vpnservice.h"
+#include "tdenetman-vpnmanager.h"
+#include "tdenetman-vpnauthenticationdialog.h"
+#include "tdenetman-vpn_connection.h"
+#include "tdenetman-nm_proxy.h"
+#include "tdenetman-connection_setting_vpn.h"
+#include "tdenetman-connection_setting_info.h"
 
 extern TQT_DBusObjectPath vpn_attempt_this_conn;
 
@@ -176,4 +176,4 @@ void VPNAuthenticationDialog::cancel()
 	TQDialog::done(1);
 }
 
-#include "knetworkmanager-vpnauthenticationdialog.moc"
+#include "tdenetman-vpnauthenticationdialog.moc"
diff --git a/tdenetworkmanager/src/knetworkmanager-vpnauthenticationdialog.h b/tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.h
index 8c43e7d..ee48410 100644
--- a/tdenetworkmanager/src/knetworkmanager-vpnauthenticationdialog.h
+++ b/tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-authenticationdialog.h - A NetworkManager frontend for KDE 
+ * tdenetman-authenticationdialog.h - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2006 Novell, Inc.
  *
@@ -30,10 +30,10 @@
 #include <kprocess.h>
 #include <kconfig.h>
 
-#include "knetworkmanager.h"
+#include "tdenetman.h"
 #include "vpnauthentication.h"
-#include "knetworkmanager-vpnplugin.h"
-#include "knetworkmanager-vpnmanager.h"
+#include "tdenetman-vpnplugin.h"
+#include "tdenetman-vpnmanager.h"
 
 class KNetworkManager;
 class ManageConnectionsDialog;
diff --git a/tdenetworkmanager/src/knetworkmanager-vpnmanager.cpp b/tdenetworkmanager/src/tdenetman-vpnmanager.cpp
index 5b7e64e..62a0b8f 100644
--- a/tdenetworkmanager/src/knetworkmanager-vpnmanager.cpp
+++ b/tdenetworkmanager/src/tdenetman-vpnmanager.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-vpnmanager.cpp - A NetworkManager frontend for KDE 
+ * tdenetman-vpnmanager.cpp - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2006 Novell, Inc.
  *
@@ -30,9 +30,9 @@
 #include <kdebug.h>
 #include <kconfig.h>
 
-#include "knetworkmanager-vpnmanager.h"
-#include "knetworkmanager-vpnservice.h"
-#include "knetworkmanager-vpnplugin.h"
+#include "tdenetman-vpnmanager.h"
+#include "tdenetman-vpnservice.h"
+#include "tdenetman-vpnplugin.h"
 
 /*
  *  class VPNManager
@@ -104,4 +104,4 @@ VPNManager::getVPNService(TQString service_type)
 
 }
 
-#include "knetworkmanager-vpnmanager.moc"
+#include "tdenetman-vpnmanager.moc"
diff --git a/tdenetworkmanager/src/knetworkmanager-vpnmanager.h b/tdenetworkmanager/src/tdenetman-vpnmanager.h
index 769d2c3..3030c07 100644
--- a/tdenetworkmanager/src/knetworkmanager-vpnmanager.h
+++ b/tdenetworkmanager/src/tdenetman-vpnmanager.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-vpnmanager.h - A NetworkManager frontend for KDE 
+ * tdenetman-vpnmanager.h - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2006 Novell, Inc.
  *
@@ -32,8 +32,8 @@
 #include <tqobject.h>
 #include <tqguardedptr.h>
 
-#include "knetworkmanager.h"
-#include "knetworkmanager-vpnplugin.h"
+#include "tdenetman.h"
+#include "tdenetman-vpnplugin.h"
 
 class KNetworkManager;
 class VPNService;
diff --git a/tdenetworkmanager/src/knetworkmanager-vpnplugin.cpp b/tdenetworkmanager/src/tdenetman-vpnplugin.cpp
index 02ef8fe..dbeeb18 100644
--- a/tdenetworkmanager/src/knetworkmanager-vpnplugin.cpp
+++ b/tdenetworkmanager/src/tdenetman-vpnplugin.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-vpnplugin.cpp - A NetworkManager frontend for KDE 
+ * tdenetman-vpnplugin.cpp - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2006 Novell, Inc.
  *
@@ -24,7 +24,7 @@
 
 #include <tqwidget.h>
 
-#include "knetworkmanager-vpnplugin.h"
+#include "tdenetman-vpnplugin.h"
 
 /***********************
 *	class VPNConfigWidget
@@ -125,4 +125,4 @@ VPNAuthenticationWidget* VPNPlugin::CreateAuthenticationWidget(TQWidget*)
 	return NULL;
 }
 
-#include "knetworkmanager-vpnplugin.moc"
+#include "tdenetman-vpnplugin.moc"
diff --git a/tdenetworkmanager/src/knetworkmanager-vpnplugin.h b/tdenetworkmanager/src/tdenetman-vpnplugin.h
index 3b8b625..10f5d25 100644
--- a/tdenetworkmanager/src/knetworkmanager-vpnplugin.h
+++ b/tdenetworkmanager/src/tdenetman-vpnplugin.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-vpnplugin.h - A NetworkManager frontend for KDE 
+ * tdenetman-vpnplugin.h - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2006 Novell, Inc.
  *
@@ -29,7 +29,7 @@
 #include <tqmap.h>
 #include <tqdbusdata.h>
 #include <tqdbusvariant.h>
-#include "knetworkmanager-plugin.h"
+#include "tdenetman-plugin.h"
 
 #define KNETWORKMANAGER_VPNPLUGIN "KNetworkManager/VPNPlugin"
 
diff --git a/tdenetworkmanager/src/knetworkmanager-vpnservice.cpp b/tdenetworkmanager/src/tdenetman-vpnservice.cpp
index 84daa0c..978a183 100644
--- a/tdenetworkmanager/src/knetworkmanager-vpnservice.cpp
+++ b/tdenetworkmanager/src/tdenetman-vpnservice.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-vpnservice.cpp - A NetworkManager frontend for KDE 
+ * tdenetman-vpnservice.cpp - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2006 Novell, Inc.
  *
@@ -36,9 +36,9 @@
 #include <kconfig.h>
 #include <kplugininfo.h>
 
-#include "knetworkmanager-pluginmanager.h"
-#include "knetworkmanager-vpnservice.h"
-#include "knetworkmanager-vpnplugin.h"
+#include "tdenetman-pluginmanager.h"
+#include "tdenetman-vpnservice.h"
+#include "tdenetman-vpnplugin.h"
 
 /*
  *  class VPNService
@@ -120,4 +120,4 @@ TQString VPNService::getName() const
 	return _name;
 }
 
-#include "knetworkmanager-vpnservice.moc"
+#include "tdenetman-vpnservice.moc"
diff --git a/tdenetworkmanager/src/knetworkmanager-vpnservice.h b/tdenetworkmanager/src/tdenetman-vpnservice.h
index 51a03f6..baf87a5 100644
--- a/tdenetworkmanager/src/knetworkmanager-vpnservice.h
+++ b/tdenetworkmanager/src/tdenetman-vpnservice.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-vpnservice.h - A NetworkManager frontend for KDE 
+ * tdenetman-vpnservice.h - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2006 Novell, Inc.
  *
@@ -32,8 +32,8 @@
 #include <tqobject.h>
 #include <tqguardedptr.h>
 
-#include "knetworkmanager.h"
-#include "knetworkmanager-vpnplugin.h"
+#include "tdenetman.h"
+#include "tdenetman-vpnplugin.h"
 
 class KNetworkManager;
 class VPNService;
diff --git a/tdenetworkmanager/src/knetworkmanager-wired_device_tray.cpp b/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp
index c399a7a..68a6069 100644
--- a/tdenetworkmanager/src/knetworkmanager-wired_device_tray.cpp
+++ b/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-wired_device_tray.cpp - A NetworkManager frontend for KDE
+ * tdenetman-wired_device_tray.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -45,12 +45,11 @@
 
 
 // KNM includes
-#include "knetworkmanager-wired_device_tray.h"
-#include "knetworkmanager-menuitem.h"
-#include "knetworkmanager-menu_subhead.h"
+#include "tdenetman-wired_device_tray.h"
+#include "tdenetman-menuitem.h"
+#include "tdenetman-menu_subhead.h"
 
-#include "knetworkmanager-connection_setting_wired.h"
-#include "knetworkmanager-connection_settings_dialog.h"
+#include "tdenetman-connection_settings_dialog.h"
 
 using namespace ConnectionSettings;
 
@@ -147,4 +146,4 @@ WiredDeviceTray::~WiredDeviceTray ()
 	delete d;
 }
 
-#include "knetworkmanager-wired_device_tray.moc"
+#include "tdenetman-wired_device_tray.moc"
diff --git a/tdenetworkmanager/src/knetworkmanager-wired_device_tray.h b/tdenetworkmanager/src/tdenetman-wired_device_tray.h
index b2a2f7d..1ec550e 100644
--- a/tdenetworkmanager/src/knetworkmanager-wired_device_tray.h
+++ b/tdenetworkmanager/src/tdenetman-wired_device_tray.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager.h - A NetworkManager frontend for KDE 
+ * tdenetman.h - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -30,7 +30,7 @@
 // KNM includes
 #include "devicetraycomponent.h"
 
-#include "knetworkmanager.h"
+#include "tdenetman.h"
 
 // predefs
 class WiredDevice;
diff --git a/tdenetworkmanager/src/knetworkmanager-wireless_device_tray.cpp b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
index 996ea1e..d1b209e 100644
--- a/tdenetworkmanager/src/knetworkmanager-wireless_device_tray.cpp
+++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-wireless_device_tray.cpp - A NetworkManager frontend for KDE
+ * tdenetman-wireless_device_tray.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -43,12 +43,12 @@
 #include <knotifyclient.h>
 
 // KNM includes
-#include "knetworkmanager-wireless_device_tray.h"
-#include "knetworkmanager-wireless_menuitem.h"
-#include "knetworkmanager-wireless_network.h"
-#include "knetworkmanager-menu_subhead.h"
-#include "knetworkmanager-wireless_manager.h"
-#include "knetworkmanager-connection_settings_dialog.h"
+#include "tdenetman-wireless_device_tray.h"
+#include "tdenetman-wireless_menuitem.h"
+#include "tdenetman-wireless_network.h"
+#include "tdenetman-menu_subhead.h"
+#include "tdenetman-wireless_manager.h"
+#include "tdenetman-connection_settings_dialog.h"
 
 using namespace ConnectionSettings;
 
@@ -414,4 +414,4 @@ WirelessDeviceTray::~WirelessDeviceTray ()
 }
 
 
-#include "knetworkmanager-wireless_device_tray.moc"
+#include "tdenetman-wireless_device_tray.moc"
diff --git a/tdenetworkmanager/src/knetworkmanager-wireless_device_tray.h b/tdenetworkmanager/src/tdenetman-wireless_device_tray.h
index a987b77..9fb386e 100644
--- a/tdenetworkmanager/src/knetworkmanager-wireless_device_tray.h
+++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager.h - A NetworkManager frontend for KDE 
+ * tdenetman.h - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -28,9 +28,9 @@
 #define KNETWORKMANAGER_WIRELESS_DEVICE_TRAY_H
 
 // KNM includes
-#include "knetworkmanager.h"
+#include "tdenetman.h"
 #include "devicetraycomponent.h"
-#include "knetworkmanager-wireless_network.h"
+#include "tdenetman-wireless_network.h"
 
 // predefinitions
 class WirelessDevice;
diff --git a/tdenetworkmanager/src/knetworkmanager-wireless_manager.cpp b/tdenetworkmanager/src/tdenetman-wireless_manager.cpp
index baec85f..3f823b2 100644
--- a/tdenetworkmanager/src/knetworkmanager-wireless_manager.cpp
+++ b/tdenetworkmanager/src/tdenetman-wireless_manager.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-wireless_manager.cpp - A NetworkManager frontend for KDE
+ * tdenetman-wireless_manager.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -26,7 +26,7 @@
 #include <time.h>
 
 // KNM includes
-#include "knetworkmanager-wireless_manager.h"
+#include "tdenetman-wireless_manager.h"
 
 TQValueList<WirelessNetwork> WirelessManager::getWirelessNetworks(TDENetworkDevice* dev, TQ_UINT32 match)
 {
diff --git a/tdenetworkmanager/src/knetworkmanager-wireless_manager.h b/tdenetworkmanager/src/tdenetman-wireless_manager.h
index 75d9f4a..59c3cae 100644
--- a/tdenetworkmanager/src/knetworkmanager-wireless_manager.h
+++ b/tdenetworkmanager/src/tdenetman-wireless_manager.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-wireless_manager.h - A NetworkManager frontend for KDE 
+ * tdenetman-wireless_manager.h - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -30,9 +30,9 @@
 #include <tqmap.h>
 
 // KNM includes
-#include "knetworkmanager.h"
-#include "knetworkmanager-device_tray.h"
-#include "knetworkmanager-wireless_network.h"
+#include "tdenetman.h"
+#include "tdenetman-device_tray.h"
+#include "tdenetman-wireless_network.h"
 
 namespace ConnectionSettings
 {
diff --git a/tdenetworkmanager/src/knetworkmanager-wireless_menuitem.cpp b/tdenetworkmanager/src/tdenetman-wireless_menuitem.cpp
index dd7fc81..de37cfb 100644
--- a/tdenetworkmanager/src/knetworkmanager-wireless_menuitem.cpp
+++ b/tdenetworkmanager/src/tdenetman-wireless_menuitem.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-tray.cpp - A NetworkManager frontend for KDE
+ * tdenetman-tray.cpp - A NetworkManager frontend for KDE
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -46,9 +46,8 @@
 #include <kconfig.h>
 #include <kmessagebox.h>
 
-#include "knetworkmanager-wireless_menuitem.h"
-#include "knetworkmanager-wireless_network.h"
-#include "knetworkmanager-connection_setting_info.h"
+#include "tdenetman-wireless_menuitem.h"
+#include "tdenetman-wireless_network.h"
 
 using namespace ConnectionSettings;
 
@@ -225,4 +224,4 @@ WirelessNetworkItem::~WirelessNetworkItem ()
 
 
 
-#include "knetworkmanager-wireless_menuitem.moc"
+#include "tdenetman-wireless_menuitem.moc"
diff --git a/tdenetworkmanager/src/knetworkmanager-wireless_menuitem.h b/tdenetworkmanager/src/tdenetman-wireless_menuitem.h
index 960258e..0be3726 100644
--- a/tdenetworkmanager/src/knetworkmanager-wireless_menuitem.h
+++ b/tdenetworkmanager/src/tdenetman-wireless_menuitem.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager.h - A NetworkManager frontend for KDE 
+ * tdenetman.h - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -25,7 +25,7 @@
 #ifndef KNETWORKMANAGER_WIRELESSMENUITEM_H
 #define KNETWORKMANAGER_WIRELESSMENUITEM_H
 
-#include "knetworkmanager-menuitem.h"
+#include "tdenetman-menuitem.h"
 
 #include <tqmap.h>
 #include <tqtimer.h>
@@ -44,7 +44,7 @@
 #include <tqprogressbar.h>
 #include <tqguardedptr.h>
 
-#include "knetworkmanager-wireless_network.h"
+#include "tdenetman-wireless_network.h"
 
 class WirelessNetworkItem : public NetworkMenuItem, public TQCustomMenuItem
 {
diff --git a/tdenetworkmanager/src/knetworkmanager-wireless_network.cpp b/tdenetworkmanager/src/tdenetman-wireless_network.cpp
index b8328ee..bd9dbff 100644
--- a/tdenetworkmanager/src/knetworkmanager-wireless_network.cpp
+++ b/tdenetworkmanager/src/tdenetman-wireless_network.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-wireless_network.cpp - A NetworkManager frontend for KDE 
+ * tdenetman-wireless_network.cpp - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -23,8 +23,8 @@
  **************************************************************************/
 
 // KNM includes
-#include "knetworkmanager.h"
-#include "knetworkmanager-wireless_network.h"
+#include "tdenetman.h"
+#include "tdenetman-wireless_network.h"
 
 // TDE includes
 #include <kdebug.h>
diff --git a/tdenetworkmanager/src/knetworkmanager-wireless_network.h b/tdenetworkmanager/src/tdenetman-wireless_network.h
index 979eddc..0970df1 100644
--- a/tdenetworkmanager/src/knetworkmanager-wireless_network.h
+++ b/tdenetworkmanager/src/tdenetman-wireless_network.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-wireless_network.h - A NetworkManager frontend for KDE 
+ * tdenetman-wireless_network.h - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -25,7 +25,7 @@
 #ifndef KNETWORKMANAGER_WIRELESS_NETWORK_H
 #define KNETWORKMANAGER_WIRELESS_NETWORK_H
 
-#include "knetworkmanager.h"
+#include "tdenetman.h"
 
 #include <stdint.h>
 
diff --git a/tdenetworkmanager/src/knetworkmanager.cpp b/tdenetworkmanager/src/tdenetman.cpp
index 5a3d281..adc3cf2 100644
--- a/tdenetworkmanager/src/knetworkmanager.cpp
+++ b/tdenetworkmanager/src/tdenetman.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager.cpp - A NetworkManager frontend for KDE 
+ * tdenetman.cpp - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -29,8 +29,8 @@
 #include <tdenetworkconnections.h>
 
 // KNM includes
-#include "knetworkmanager.h"
-#include "knetworkmanager-tray.h"
+#include "tdenetman.h"
+#include "tdenetman-tray.h"
 
 #include <stdio.h>
 
@@ -90,5 +90,5 @@ KNetworkManager::~KNetworkManager()
 	delete d;
 }
 
-#include "knetworkmanager.moc"
+#include "tdenetman.moc"
 
diff --git a/tdenetworkmanager/src/knetworkmanager.h b/tdenetworkmanager/src/tdenetman.h
index cb48772..76dcb93 100644
--- a/tdenetworkmanager/src/knetworkmanager.h
+++ b/tdenetworkmanager/src/tdenetman.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager.h - A NetworkManager frontend for KDE 
+ * tdenetman.h - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2005 Novell, Inc.
  *
diff --git a/tdenetworkmanager/src/knetworkmanager.la.cpp b/tdenetworkmanager/src/tdenetman.la.cpp
index 3d480c4..3d480c4 100644
--- a/tdenetworkmanager/src/knetworkmanager.la.cpp
+++ b/tdenetworkmanager/src/tdenetman.la.cpp
diff --git a/tdenetworkmanager/src/knetworkmanager_dummy.cpp b/tdenetworkmanager/src/tdenetman_dummy.cpp
index efd89d8..efd89d8 100644
--- a/tdenetworkmanager/src/knetworkmanager_dummy.cpp
+++ b/tdenetworkmanager/src/tdenetman_dummy.cpp
diff --git a/tdenetworkmanager/src/knetworkmanager.desktop b/tdenetworkmanager/src/tdenetworkmanager.desktop
index fc9b45f..c313d6f 100644
--- a/tdenetworkmanager/src/knetworkmanager.desktop
+++ b/tdenetworkmanager/src/tdenetworkmanager.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=KNetworkManager
+Name=TDENetworkManager
 Name[bn]=কে-নেটওয়ার্ক-ম্যানেজার
-Name[sv]=Knetworkmanager
+Name[sv]=TDEnetworkmanager
 GenericName=Network Manager
 GenericName[bn]=নেটওয়ার্ক ম্যানেজার
 GenericName[br]=Merour rouedad
@@ -19,8 +19,8 @@ GenericName[sr]=Управник мреже
 GenericName[sr@Latn]=Upravnik mreže
 GenericName[sv]=Nätverksverktyg
 GenericName[tr]=Ağ Yöneticisi
-Exec=knetworkmanager
-Icon=knetworkmanager
+Exec=tdenetworkmanager
+Icon=tdenetworkmanager
 Type=Application
 Comment=A TDE frontend for NetworkManager
 Comment[bg]=Интерфейс за NetworkManager (TDE)
@@ -43,5 +43,5 @@ X-TDE-autostart-after=panel
 X-TDE-StartupNotify=false
 X-TDE-UniqueApplet=true
 X-DCOP-ServiceType=Unique
-X-TDE-autostart-condition=knetworkmanagerrc:General:Autostart:true
+X-TDE-autostart-condition=tdenetworkmanagerrc:General:Autostart:true
 Categories=Qt;TDE;Network;Applet;
diff --git a/tdenetworkmanager/src/tdenetworkmanager_plugin.desktop b/tdenetworkmanager/src/tdenetworkmanager_plugin.desktop
new file mode 100644
index 0000000..d215c1f
--- /dev/null
+++ b/tdenetworkmanager/src/tdenetworkmanager_plugin.desktop
@@ -0,0 +1,31 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=ServiceType
+X-TDE-ServiceType=TDENetworkManager/Plugin
+X-TDE-Derived=KPluginInfo
+Name=TDENetworkManager Plugin
+Name[et]=TDENetworkManageri plugin
+Name[ja]=TDENetworkManager プラグイン
+Name[sr]=Прикључак TDENetworkManager-а
+Name[sr@Latn]=Прикључак TDENetworkManager-а
+Name[sv]=Nätverkshantering insticksprogram
+Comment=TDENetworkManager Plugin
+Comment[bg]=Приставка за TDENetworkManager
+Comment[bn]=কে-নেটওয়ার্ক-ম্যানেজার প্লাগিন
+Comment[br]=Lugent TDENetworkManager
+Comment[ca]=Connector del TDENetworkManager
+Comment[da]=Netværkshåndtering-plugin
+Comment[de]=TDENetworkManager-Modul
+Comment[el]=Πρόσθετο του TDENetworkManager
+Comment[es]=Complemento de TDENetworkManager
+Comment[et]=TDENetworkManageri plugin
+Comment[it]=Plugin di TDENetworkManager
+Comment[ja]=TDENetworkManager プラグイン
+Comment[nl]=TDENetworkManager-plugin
+Comment[pt]='Plugin' do TDENetworkManager
+Comment[sr]=Прикључак TDENetworkManager-а
+Comment[sr@Latn]=Priključak TDENetworkManager-a
+Comment[sv]=Nätverkshantering insticksprogram
+Comment[tr]=TDENetworkManager Eklentisi
+Comment[xx]=xxTDENetworkManager Pluginxx
+
diff --git a/tdenetworkmanager/src/tdenetworkmanager_vpnplugin.desktop b/tdenetworkmanager/src/tdenetworkmanager_vpnplugin.desktop
new file mode 100644
index 0000000..9c7f5b3
--- /dev/null
+++ b/tdenetworkmanager/src/tdenetworkmanager_vpnplugin.desktop
@@ -0,0 +1,33 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=ServiceType
+X-TDE-ServiceType=TDENetworkManager/VPNPlugin
+X-TDE-Derived=TDENetworkManager/Plugin
+Name=TDENetworkManager VPN Plugin
+Name[et]=TDENetworkManageri VPN-plugin
+Name[ja]=TDENetworkManager VPN プラグイン
+Name[sr]=Прикључак TDENetworkManager-а за VPN
+Name[sr@Latn]=Прикључак TDENetworkManager-а за VPN
+Name[sv]=Nätverkshantering VPN-insticksprogram
+Comment=TDENetworkManager VPN Plugin
+Comment[bg]=VPN приставка за TDENetworkManager
+Comment[bn]=কে-নেটওয়ার্ক-ম্যানেজার ভিপিএন প্লাগিন
+Comment[br]=Lugent VPN evit TDENetworkManager
+Comment[ca]=Connector VPN del TDENetworkManager
+Comment[da]=TDENetworkManager VPN-plugin
+Comment[de]=TDENetworkManager-VPN-Modul
+Comment[el]=Πρόσθετο VPN του TDENetworkManager
+Comment[es]=Complemento de VPN de TDENetworkManager
+Comment[et]=TDENetworkManageri VPN-plugin
+Comment[it]=Plugin VPN di TDENetworkManager
+Comment[ja]=TDENetworkManager VPN プラグイン
+Comment[nl]=TDENetworkManager VPN-plugin
+Comment[pt]='Plugin' de VPN do TDENetworkManager
+Comment[sr]=Прикључак TDENetworkManager-а за VPN
+Comment[sr@Latn]=Priključak TDENetworkManager-a za VPN
+Comment[sv]=Nätverkshantering VPN-insticksprogram
+Comment[tr]=TDENetworkManager VPN Eklentisi
+Comment[xx]=xxTDENetworkManager VPN Pluginxx
+
+[PropertyDef::X-NetworkManager-Services]
+Type=TQString
diff --git a/tdenetworkmanager/src/vpn_tray_component.cpp b/tdenetworkmanager/src/vpn_tray_component.cpp
index 68ad8a1..f4f3534 100644
--- a/tdenetworkmanager/src/vpn_tray_component.cpp
+++ b/tdenetworkmanager/src/vpn_tray_component.cpp
@@ -33,15 +33,15 @@
 
 // KNM includes
 #include "vpn_tray_component.h"
-#include "knetworkmanager-menuitem.h"
-#include "knetworkmanager-menu_subhead.h"
-#include "knetworkmanager-connection_store.h"
-#include "knetworkmanager-vpn_connection.h"
-#include "knetworkmanager-nm_proxy.h"
-
-#include "knetworkmanager-connection_setting_info.h"
-#include "knetworkmanager-connection_setting_vpn.h"
-#include "knetworkmanager-connection_settings_dialog.h"
+#include "tdenetman-menuitem.h"
+#include "tdenetman-menu_subhead.h"
+#include "tdenetman-connection_store.h"
+#include "tdenetman-vpn_connection.h"
+#include "tdenetman-nm_proxy.h"
+
+#include "tdenetman-connection_setting_info.h"
+#include "tdenetman-connection_setting_vpn.h"
+#include "tdenetman-connection_settings_dialog.h"
 #include <stdio.h>
 
 using namespace ConnectionSettings;
diff --git a/tdenetworkmanager/src/vpn_tray_component.h b/tdenetworkmanager/src/vpn_tray_component.h
index 2af5b55..a42ae83 100644
--- a/tdenetworkmanager/src/vpn_tray_component.h
+++ b/tdenetworkmanager/src/vpn_tray_component.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager.h - A NetworkManager frontend for KDE 
+ * tdenetman.h - A NetworkManager frontend for KDE 
  *
  * Copyright (C) 2005, 2006 Novell, Inc.
  *
@@ -28,7 +28,7 @@
 // KNM includes
 #include "traycomponent.h"
 
-#include "knetworkmanager.h"
+#include "tdenetman.h"
 
 class VPNTrayComponent : public TrayComponent
 {
diff --git a/tdenetworkmanager/knetworkmanager.conf b/tdenetworkmanager/tdenetworkmanager.conf
index 82a596f..82a596f 100644
--- a/tdenetworkmanager/knetworkmanager.conf
+++ b/tdenetworkmanager/tdenetworkmanager.conf