Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

133 files changed, 1723 insertions, 1723 deletions

diff --git a/tdecore/AUTHORS b/tdecore/AUTHORS
index 07b7d44ef..03def3f46 100644
--- a/tdecore/AUTHORS
+++ b/tdecore/AUTHORS
@@ -1,5 +1,5 @@
 Matthias Kalle Dalheimer <kalle@kde.org>:
-classes KConfig, KTextStream, KColorSet, TDEApplication
+classes TDEConfig, KTextStream, KColorSet, TDEApplication
 automake, autoconf, maintenance
 
 Richard Moore <moorer@cs.man.ac.uk>:
@@ -12,7 +12,7 @@ Steffen Hansen <stefh@dit.ou.dk>:
 KURL class
 
 Torben Weis <weis@stud.uni-frankfurt.de>
-DnD stuff, KSocket and KServerSocket classes, KPixmap
+DnD stuff, TDESocket and TDEServerSocket classes, KPixmap
 
 Alexander Sanda <alex@darkstar.ping.at>
 Read and write numerical config entries, KPanner, KTabControl,
diff --git a/tdecore/DESIGN.kconfig b/tdecore/DESIGN.kconfig
index 4ced76726..c4c68b28e 100644
--- a/tdecore/DESIGN.kconfig
+++ b/tdecore/DESIGN.kconfig
@@ -70,7 +70,7 @@ When an entry is read with readEntry(key, defaultValue), non-existing
 entries will return "defaultValue" while hasKey(key) will return "false"
 for such entries.
 
-Currently all entries are stored in memory. When KConfig is "sync()'ed"
+Currently all entries are stored in memory. When TDEConfig is "sync()'ed"
 it reads the file that it is about to overwrite (for the second time), it 
 then merges in the entries it has in memory and writes the result back to 
 the file. It does NOT update its map of entries in memory with the entries
@@ -99,12 +99,12 @@ KDE3.0 Changes
 
 ------------------------------------------------------------------------------
 
-KConfig XT
+TDEConfig XT
 ==========
 
-My buzzword picker offered KConfig XT ("eXtended Technology") and KConfig NG 
+My buzzword picker offered TDEConfig XT ("eXtended Technology") and TDEConfig NG 
 ("Next Generation").  Since the planned changes are ment to be evolutionary 
-rather than revolutionary, KConfig NG was dropped.
+rather than revolutionary, TDEConfig NG was dropped.
 
 Goals
 =====
@@ -130,12 +130,12 @@ Type information can be provide by preceding every entry with a formalized
 comment.
 
 Work to be done:
-* KConfig needs to be extended to provide access to the default values provided 
-by the default config files. KConfig already stores this information internally.
+* TDEConfig needs to be extended to provide access to the default values provided 
+by the default config files. TDEConfig already stores this information internally.
 (DONE)
 * A formal comment structure needs to be designed that can convey type-information.
 Preferably in such a way that it is easily parsable by both machine and user.
-* KConfig needs to be extended, or another class created, that is able to parse
+* TDEConfig needs to be extended, or another class created, that is able to parse
 the formalized comments.
 * A tool needs to be developed that can assist developers with the generation
 and verification of default configuration files including type-information.
@@ -170,34 +170,34 @@ Host=wantelbos.zogje.fr
 
 Class overview
 
-                       KConfigBase
+                       TDEConfigBase
                             |
                             v
- KConfigBackend  <-----> KConfig <------> KConfigSkeleton           /--< myapp.kcfg
+ TDEConfigBackend  <-----> TDEConfig <------> TDEConfigSkeleton           /--< myapp.kcfg
        |                    |                    |                 /
        v                    v                    |*---------------<
-KConfigINIBackend      KSimpleConfig             |kconfig_compiler \
+TDEConfigINIBackend      KSimpleConfig             |kconfig_compiler \
                                                  |                  \--< myconfig.kcfg-codegen
                                                  v                                                    
-                                             MyConfig <-----KConfigDialogManager----> MyConfigWidget *---< myconfigwidget.ui
+                                             MyConfig <-----TDEConfigDialogManager----> MyConfigWidget *---< myconfigwidget.ui
                                                                                                       uic
 
-KConfigBase: defines API for generic config class
+TDEConfigBase: defines API for generic config class
 
-KConfig: functional generic config class that supports merging of cascaded
+TDEConfig: functional generic config class that supports merging of cascaded
          configuration files
 
 KSimpleConfig: functional generic config class without support for cascading
                configuration files.
 
-KConfigBackend: defines API for config backend, t.i. the actual handling
+TDEConfigBackend: defines API for config backend, t.i. the actual handling
                 of the storage method and storage format.
 
-KConfigINIBackend: the standard (and only one so far) class that implements
+TDEConfigINIBackend: the standard (and only one so far) class that implements
                    the config backend using the file-based .INI format
                    for configuration files
 
-KConfigSkeleton: base class for deriving classes that store application
+TDEConfigSkeleton: base class for deriving classes that store application
                  specific options providing type-safety and single-point
                  defaults.
 
@@ -215,9 +215,9 @@ myconfig.kcfg-codegen: Implementation specific code generation instructions
                        just an example name, the application developer
                        choses the actual name.
 
-KConfigDialogManager: Class that links widgets in a dialog up with their
+TDEConfigDialogManager: Class that links widgets in a dialog up with their
                       corresponding confguration options in a configuration
-                      object derived from KConfigSkeleton.
+                      object derived from TDEConfigSkeleton.
 
 MyConfigWidget: Dialog generated from a .ui description file. Widget names
                 in the dialog that start with "kcfg_" refer to configuration
diff --git a/tdecore/KCONFIG_DESIGN b/tdecore/KCONFIG_DESIGN
index dfd9aa151..d0fa141ff 100644
--- a/tdecore/KCONFIG_DESIGN
+++ b/tdecore/KCONFIG_DESIGN
@@ -1,9 +1,9 @@
 
-              The basic design on KConfig for KDE 2.0 and KDE 3.0:
+              The basic design on TDEConfig for KDE 2.0 and KDE 3.0:
               ----------------------------------------
 
-KConfig is a hierarchy of classes for loading and saving configuration
-data in KDE.  KConfigBase is an abstract data type (ADT) with pure
+TDEConfig is a hierarchy of classes for loading and saving configuration
+data in KDE.  TDEConfigBase is an abstract data type (ADT) with pure
 virtual functions which describes the API for accessing configuration
 data.  It cannot be instantiated directly; only subclasses which
 actually implement the API may be created.  The reason for this design
@@ -15,34 +15,34 @@ achieve shared memory config values.  The possibilities are endless,
 and with this design we insure that future designs will not break
 compatibility.
 
-This means that most classes that currently take pointers to KConfig
-objects should be changed to take pointers to KConfigBase objects.
+This means that most classes that currently take pointers to TDEConfig
+objects should be changed to take pointers to TDEConfigBase objects.
 The virtual functions and c++ polymorphism will make sure that the
 correct function in the actual, instantiated object are called, but
-this lets the user/programmer change the type of KConfig that has been
+this lets the user/programmer change the type of TDEConfig that has been
 implemented at runtime without changing other code.
 
-Similarly, there is a abstract data type KConfigBackEnd.  All
+Similarly, there is a abstract data type TDEConfigBackEnd.  All
 reading/writing of the physical, on-disk configuration should be done
-through a subclass of KConfigBackEnd.  The only class that is
-currently implemented right now is KConfigINIBackEnd, which
+through a subclass of TDEConfigBackEnd.  The only class that is
+currently implemented right now is TDEConfigINIBackEnd, which
 reads/writes the standard windows INI-style configuration files that
 KDE has used since KDE 1.x days.  However, it is conceivable that one
 might program an XML backend, or even a database/registry style
 backend.  Again, this abstract data type approach provides flexibility
-for the future.  Currently KConfig and KSimpleConfig hardcode that
-they are using a KConfigINIBackEnd in the constructor.  If more back
+for the future.  Currently TDEConfig and KSimpleConfig hardcode that
+they are using a TDEConfigINIBackEnd in the constructor.  If more back
 ends are implemented, this will have to be changed to use a factory
 method of some sort to create the backend; all they maintain is a
-pointer to a KConfigBackEnd, so the actual type of backend does not
+pointer to a TDEConfigBackEnd, so the actual type of backend does not
 matter.
 
-If you are interested in using KConfig, you need simply to look at the
-public members of KConfigBase.  They will provide you with everything
+If you are interested in using TDEConfig, you need simply to look at the
+public members of TDEConfigBase.  They will provide you with everything
 you need to do to look up data, change and write data, etc.  If you
-are interested in implementing a new KConfig format, look at KConfig
+are interested in implementing a new TDEConfig format, look at TDEConfig
 for ideas.  Likewise if you want to implement a backend, look at
-KConfigINIBackEnd for inspiration.  The KDoc-style API documentation
+TDEConfigINIBackEnd for inspiration.  The KDoc-style API documentation
 should be complete.  If there is anything confusing, please either fix
 it in CVS yourself or mail me with your questions, and we will make
 sure things get clarified.
diff --git a/tdecore/README.kiosk b/tdecore/README.kiosk
index d6d380707..635c61f95 100644
--- a/tdecore/README.kiosk
+++ b/tdecore/README.kiosk
@@ -64,7 +64,7 @@ that haven't explicitly changed the affected settings to something else.
 Starting with KDE3, configuration entries can be marked "immutable". When a
 configuration entry is immutable it means that configuration files that are
 read later will not be able to override its value. Immutable entries cannot
-be changed via KConfig and if the entry is present under $TDEHOME it will 
+be changed via TDEConfig and if the entry is present under $TDEHOME it will 
 be ignored.
 
 Entries can be marked immutable on 4 different levels:
diff --git a/tdecore/kaccel.cpp b/tdecore/kaccel.cpp
index 41660e59a..7291f3f56 100644
--- a/tdecore/kaccel.cpp
+++ b/tdecore/kaccel.cpp
@@ -527,13 +527,13 @@ const TQString& KAccel::configGroup() const
 void KAccel::setConfigGroup( const TQString& s )
 	{ d->setConfigGroup( s ); }
 
-bool KAccel::readSettings( KConfigBase* pConfig )
+bool KAccel::readSettings( TDEConfigBase* pConfig )
 {
 	d->readSettings( pConfig );
 	return true;
 }
 
-bool KAccel::writeSettings( KConfigBase* pConfig ) const
+bool KAccel::writeSettings( TDEConfigBase* pConfig ) const
 	{ d->writeSettings( pConfig ); return true; }
 
 void KAccel::emitKeycodeChanged()
diff --git a/tdecore/kaccel.h b/tdecore/kaccel.h
index a54c6bd2e..491fa39ce 100644
--- a/tdecore/kaccel.h
+++ b/tdecore/kaccel.h
@@ -29,7 +29,7 @@ class TQPopupMenu; // for obsolete insertItem() methods below
 class TQWidget;
 class KAccelAction;
 class KAccelActions;
-class KConfigBase;
+class TDEConfigBase;
 
 class KAccelPrivate;
 /**
@@ -267,14 +267,14 @@ class TDECORE_EXPORT KAccel : public TQAccel
 	/**
 	 * Returns the configuration group of the settings.
 	 * @return the configuration group
-	 * @see KConfig
+	 * @see TDEConfig
 	 */
 	const TQString& configGroup() const;
 
 	/**
 	 * Returns the configuration group of the settings.
 	 * @param name the new configuration group
-	 * @see KConfig
+	 * @see TDEConfig
 	 */
 	void setConfigGroup( const TQString &name );
 
@@ -289,7 +289,7 @@ class TDECORE_EXPORT KAccel : public TQAccel
 	 *         configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool readSettings( KConfigBase* pConfig = 0 );
+	bool readSettings( TDEConfigBase* pConfig = 0 );
 	/**
 	 * Write the current shortcuts to @p pConfig,
 	 * or (if @p pConfig is zero) to the application's
@@ -298,7 +298,7 @@ class TDECORE_EXPORT KAccel : public TQAccel
 	 *         configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeSettings( KConfigBase* pConfig = 0 ) const;
+	bool writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	/**
 	 * Emits the keycodeChanged() signal.
diff --git a/tdecore/kaccelaction.cpp b/tdecore/kaccelaction.cpp
index 0dc320a84..e8696cc26 100644
--- a/tdecore/kaccelaction.cpp
+++ b/tdecore/kaccelaction.cpp
@@ -203,7 +203,7 @@ bool KAccelAction::useFourModifierKeys()
 {
 	if( KAccelAction::g_bUseFourModifierKeys == -1 ) {
 		// Read in whether to use 4 modifier keys
-		KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
+		TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
 		bool b = TDEGlobal::config()->readBoolEntry( "Use Four Modifier Keys",  false );
 		KAccelAction::g_bUseFourModifierKeys = b && KKeyNative::keyboardHasWinKey();
 	}
@@ -219,7 +219,7 @@ void KAccelAction::useFourModifierKeys( bool b )
 		if( b && !KKeyNative::keyboardHasWinKey() )
 			kdDebug(125) << "Tried to use four modifier keys on a keyboard layout without a Meta key.\n";
 	}
-	KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
+	TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
 	TDEGlobal::config()->writeEntry( "Use Four Modifier Keys", KAccelAction::g_bUseFourModifierKeys, true, true);
 
 	kdDebug(125) << "bUseFourModifierKeys = " << KAccelAction::g_bUseFourModifierKeys << endl;
@@ -294,7 +294,7 @@ bool KAccelActions::init( const KAccelActions& actions )
 	return true;
 }
 
-bool KAccelActions::init( KConfigBase& config, const TQString& sGroup )
+bool KAccelActions::init( TDEConfigBase& config, const TQString& sGroup )
 {
 	kdDebug(125) << "KAccelActions::init( " << sGroup << " )" << endl;
 	TQMap<TQString, TQString> mapEntry = config.entryMap( sGroup );
@@ -483,7 +483,7 @@ bool KAccelActions::remove( const TQString& sAction )
 	return true;
 }
 
-bool KAccelActions::readActions( const TQString& sConfigGroup, KConfigBase* pConfig )
+bool KAccelActions::readActions( const TQString& sConfigGroup, TDEConfigBase* pConfig )
 {
 	KAccelShortcutList accelList(*this, false);
 	return accelList.readSettings( sConfigGroup, pConfig );
@@ -502,13 +502,13 @@ bool KAccelActions::readActions( const TQString& sConfigGroup, KConfigBase* pCon
 				1) KKeySequence = Alt+F2
 	-> "Something=Meta+X,Asterisk;Alt+F2"
 */
-bool KAccelActions::writeActions( const TQString &sGroup, KConfigBase* pConfig,
+bool KAccelActions::writeActions( const TQString &sGroup, TDEConfigBase* pConfig,
 			bool bWriteAll, bool bGlobal ) const
 {
 	kdDebug(125) << "KAccelActions::writeActions( " << sGroup << ", " << pConfig << ", " << bWriteAll << ", " << bGlobal << " )" << endl;
 	if( !pConfig )
 		pConfig = TDEGlobal::config();
-	KConfigGroupSaver cs( pConfig, sGroup );
+	TDEConfigGroupSaver cs( pConfig, sGroup );
 
 	for( uint i = 0; i < m_nSize; i++ ) {
 		if( m_prgActions[i] == 0 ) {
diff --git a/tdecore/kaccelaction.h b/tdecore/kaccelaction.h
index 4c7ac1840..9cca25d4a 100644
--- a/tdecore/kaccelaction.h
+++ b/tdecore/kaccelaction.h
@@ -30,8 +30,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /**
  * @internal
@@ -400,7 +400,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param sGroup the group in the configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	/**
 	 * Updates the shortcuts of all actions in this object
@@ -521,7 +521,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the actions to the given configuration file.
@@ -532,7 +532,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	/**
diff --git a/tdecore/kaccelbase.cpp b/tdecore/kaccelbase.cpp
index cb21146d2..729de1c42 100644
--- a/tdecore/kaccelbase.cpp
+++ b/tdecore/kaccelbase.cpp
@@ -564,14 +564,14 @@ bool KAccelBase::setShortcut( const TQString& sAction, const KShortcut& cut )
 		return false;
 }
 
-void KAccelBase::readSettings( KConfigBase* pConfig )
+void KAccelBase::readSettings( TDEConfigBase* pConfig )
 {
 	m_rgActions.readActions( m_sConfigGroup, pConfig );
 	if( m_bAutoUpdate )
 		updateConnections();
 }
 
-void KAccelBase::writeSettings( KConfigBase* pConfig ) const
+void KAccelBase::writeSettings( TDEConfigBase* pConfig ) const
 {
 	m_rgActions.writeActions( m_sConfigGroup, pConfig, m_bConfigIsGlobal, m_bConfigIsGlobal );
 }
diff --git a/tdecore/kaccelbase.h b/tdecore/kaccelbase.h
index 03cad863a..132a6aa5c 100644
--- a/tdecore/kaccelbase.h
+++ b/tdecore/kaccelbase.h
@@ -205,14 +205,14 @@ class TDECORE_EXPORT KAccelBase
 	 * The group in which the configuration is stored can be
 	 * set with setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp
index dfc3bb612..2950d6170 100644
--- a/tdecore/kapplication.cpp
+++ b/tdecore/kapplication.cpp
@@ -914,7 +914,7 @@ void TDEApplication::init(bool GUIenabled)
   // Trigger creation of locale.
   (void) TDEGlobal::locale();
 
-  KConfig* config = TDEGlobal::config();
+  TDEConfig* config = TDEGlobal::config();
   d->actionRestrictions = config->hasGroup("KDE Action Restrictions" ) && !kde_kiosk_exception;
   // For brain-dead configurations where the user's local config file is not writable.
   // * We use kdialog to warn the user, so we better not generate warnings from
@@ -923,7 +923,7 @@ void TDEApplication::init(bool GUIenabled)
   TQCString readOnly = getenv("TDE_HOME_READONLY");
   if (readOnly.isEmpty() && (tqstrcmp(name(), "kdialog") != 0))
   {
-    KConfigGroupSaver saver(config, "KDE Action Restrictions");
+    TDEConfigGroupSaver saver(config, "KDE Action Restrictions");
     if (config->readBoolEntry("warn_unwritable_config",true))
        config->checkConfigFilesWritable(true);
   }
@@ -1107,13 +1107,13 @@ void TDEApplication::disableAutoDcopRegistration()
   autoDcopRegistration = false;
 }
 
-KConfig* TDEApplication::sessionConfig()
+TDEConfig* TDEApplication::sessionConfig()
 {
     if (pSessionConfig)
         return pSessionConfig;
 
     // create an instance specific config object
-    pSessionConfig = new KConfig( sessionConfigName(), false, false);
+    pSessionConfig = new TDEConfig( sessionConfigName(), false, false);
     return pSessionConfig;
 }
 
@@ -2276,7 +2276,7 @@ void TDEApplication::applyGUIStyle()
 {
     if ( !useStyles ) return;
 
-    KConfigGroup pConfig (TDEGlobal::config(), "General");
+    TDEConfigGroup pConfig (TDEGlobal::config(), "General");
     TQString defaultStyle = KStyle::defaultStyle();
     TQString styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
 
@@ -2339,12 +2339,12 @@ TQString TDEApplication::makeStdCaption( const TQString &userCaption,
 
 TQPalette TDEApplication::createApplicationPalette()
 {
-    KConfig *config = TDEGlobal::config();
-    KConfigGroupSaver saver( config, "General" );
+    TDEConfig *config = TDEGlobal::config();
+    TDEConfigGroupSaver saver( config, "General" );
     return createApplicationPalette( config, TDEGlobalSettings::contrast() );
 }
 
-TQPalette TDEApplication::createApplicationPalette( KConfig *config, int contrast_ )
+TQPalette TDEApplication::createApplicationPalette( TDEConfig *config, int contrast_ )
 {
     TQColor trinity4Background( 239, 239, 239 );
     TQColor trinity4Blue( 103,141,178 );
@@ -2440,8 +2440,8 @@ void TDEApplication::kdisplaySetPalette()
 #ifdef Q_WS_MACX
     //Can I have this on other platforms, please!? --Sam
     {
-        KConfig *config = TDEGlobal::config();
-        KConfigGroupSaver saver( config, "General" );
+        TDEConfig *config = TDEGlobal::config();
+        TDEConfigGroupSaver saver( config, "General" );
         bool do_not_set_palette = FALSE;
         if(config->readBoolEntry("nopaletteChange", &do_not_set_palette))
             return;
@@ -2484,8 +2484,8 @@ void TDEApplication::kdisplaySetStyle()
 
 void TDEApplication::propagateSettings(SettingsCategory arg)
 {
-    KConfigBase* config = TDEGlobal::config();
-    KConfigGroupSaver saver( config, "KDE" );
+    TDEConfigBase* config = TDEGlobal::config();
+    TDEConfigGroupSaver saver( config, "KDE" );
 
 #ifdef QT_HAVE_MAX_IMAGE_SIZE
     TQSize maxImageSize(4096, 4096);
@@ -2532,7 +2532,7 @@ void TDEApplication::installKDEPropertyMap()
     installed = true;
     /**
      * If you are adding a widget that was missing please
-     * make sure to also add it to KConfigDialogManager's retrieveSettings()
+     * make sure to also add it to TDEConfigDialogManager's retrieveSettings()
      * function.
      * Thanks.
      */
@@ -2785,7 +2785,7 @@ void TDEApplication::invokeMailer(const TQString &_to, const TQString &_cc, cons
                                 const TQString & /*messageFile TODO*/, const TQStringList &attachURLs,
                                 const TQCString& startup_id )
 {
-   KConfig config("emaildefaults");
+   TDEConfig config("emaildefaults");
 
    config.setGroup("Defaults");
    TQString group = config.readEntry("Profile","Default");
@@ -2821,7 +2821,7 @@ void TDEApplication::invokeMailer(const TQString &_to, const TQString &_cc, cons
 
    if (config.readBoolEntry("TerminalClient", false))
    {
-     KConfigGroup confGroup( TDEGlobal::config(), "General" );
+     TDEConfigGroup confGroup( TDEGlobal::config(), "General" );
      TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", "konsole");
      command = preferredTerminal + " -e " + command;
    }
@@ -3351,8 +3351,8 @@ bool TDEApplication::authorize(const TQString &genericAction)
    if (!d->actionRestrictions)
       return true;
 
-   KConfig *config = TDEGlobal::config();
-   KConfigGroupSaver saver( config, "KDE Action Restrictions" );
+   TDEConfig *config = TDEGlobal::config();
+   TDEConfigGroupSaver saver( config, "KDE Action Restrictions" );
    return config->readBoolEntry(genericAction, true);
 }
 
@@ -3370,15 +3370,15 @@ bool TDEApplication::authorizeControlModule(const TQString &menuId)
 {
    if (menuId.isEmpty() || kde_kiosk_exception)
       return true;
-   KConfig *config = TDEGlobal::config();
-   KConfigGroupSaver saver( config, "TDE Control Module Restrictions" );
+   TDEConfig *config = TDEGlobal::config();
+   TDEConfigGroupSaver saver( config, "TDE Control Module Restrictions" );
    return config->readBoolEntry(menuId, true);
 }
 
 TQStringList TDEApplication::authorizeControlModules(const TQStringList &menuIds)
 {
-   KConfig *config = TDEGlobal::config();
-   KConfigGroupSaver saver( config, "TDE Control Module Restrictions" );
+   TDEConfig *config = TDEGlobal::config();
+   TDEConfigGroupSaver saver( config, "TDE Control Module Restrictions" );
    TQStringList result;
    for(TQStringList::ConstIterator it = menuIds.begin();
        it != menuIds.end(); ++it)
@@ -3426,8 +3426,8 @@ void TDEApplication::initUrlActionRestrictions()
   d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule
   ("redirect", TQString::null, TQString::null, TQString::null, "=", TQString::null, TQString::null, true));
 
-  KConfig *config = TDEGlobal::config();
-  KConfigGroupSaver saver( config, "KDE URL Restrictions" );
+  TDEConfig *config = TDEGlobal::config();
+  TDEConfigGroupSaver saver( config, "KDE URL Restrictions" );
   int count = config->readNumEntry("rule_count");
   TQString keyFormat = TQString("rule_%1");
   for(int i = 1; i <= count; i++)
diff --git a/tdecore/kapplication.h b/tdecore/kapplication.h
index f472e3351..c1b8a4ecc 100644
--- a/tdecore/kapplication.h
+++ b/tdecore/kapplication.h
@@ -25,7 +25,7 @@
 #include "tdeversion.h"
 #include "tdelibs_export.h"
 
-class KConfig;
+class TDEConfig;
 class KCharsets;
 class DCOPClient;
 class DCOPObject;
@@ -63,7 +63,7 @@ class TDEApplicationPrivate;
 *
 * @li It controls the event queue (see TQApplication ).
 * @li It provides the application with KDE resources such as
-* accelerators, common menu entries, a KConfig object. session
+* accelerators, common menu entries, a TDEConfig object. session
 * management events, help invocation etc.
 * @li Installs a signal handler for the SIGCHLD signal in order to
 * avoid zombie children. If you want to catch this signal yourself or
@@ -283,10 +283,10 @@ public:
    * Returns the application session config object.
    *
    * @return A pointer to the application's instance specific
-   * KConfig object.
-   * @see KConfig
+   * TDEConfig object.
+   * @see TDEConfig
    */
-  KConfig* sessionConfig();
+  TDEConfig* sessionConfig();
 
   /**
    * Is the application restored from the session manager?
@@ -1296,7 +1296,7 @@ private slots:
 
 private:
   TQString sessionConfigName() const;
-  KConfig* pSessionConfig; //instance specific application config object
+  TDEConfig* pSessionConfig; //instance specific application config object
   static DCOPClient *s_DCOPClient; // app specific application communication client
   static bool s_dcopClientNeedsPostInit;
   TQString aCaption; // the name for the window title
@@ -1380,7 +1380,7 @@ public:
    * @internal
    * Raw access for use by TDM.
    */
-  static TQPalette createApplicationPalette( KConfig *config, int contrast );
+  static TQPalette createApplicationPalette( TDEConfig *config, int contrast );
 
   /**
    * Installs a handler for the SIGPIPE signal. It is thrown when you write to
@@ -1494,7 +1494,7 @@ signals:
      manipulate the UI in that slot, it is blocked by the session
      manager.
 
-     Use the sessionConfig() KConfig object to store all your
+     Use the sessionConfig() TDEConfig object to store all your
      instance specific data.
 
      Do not do any closing at this point! The user may still select
diff --git a/tdecore/kcharsets.cpp b/tdecore/kcharsets.cpp
index a732bf266..4c8a405cb 100644
--- a/tdecore/kcharsets.cpp
+++ b/tdecore/kcharsets.cpp
@@ -572,7 +572,7 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const
 
     TQString dir;
     {
-    KConfigGroupSaver cfgsav( TDEGlobal::config(), "i18n" );
+    TDEConfigGroupSaver cfgsav( TDEGlobal::config(), "i18n" );
     dir = TDEGlobal::config()->readPathEntry("i18ndir", TQString::fromLatin1("/usr/share/i18n/charmaps"));
     }
 
diff --git a/tdecore/kcheckaccelerators.cpp b/tdecore/kcheckaccelerators.cpp
index c245f9435..69cd06dee 100644
--- a/tdecore/kcheckaccelerators.cpp
+++ b/tdecore/kcheckaccelerators.cpp
@@ -80,7 +80,7 @@ KCheckAccelerators::KCheckAccelerators( TQObject* parent )
     : TQObject( parent, "kapp_accel_filter" ), key(0), block( false ), drklash(0)
 {
     parent->installEventFilter( this );
-    KConfigGroupSaver saver( TDEGlobal::config(), "Development" );
+    TDEConfigGroupSaver saver( TDEGlobal::config(), "Development" );
     TQString sKey = TDEGlobal::config()->readEntry( "CheckAccelerators" ).stripWhiteSpace();
     if( !sKey.isEmpty() ) {
       KShortcut cuts( sKey );
diff --git a/tdecore/kclipboard.cpp b/tdecore/kclipboard.cpp
index e6d763b79..f7812a713 100644
--- a/tdecore/kclipboard.cpp
+++ b/tdecore/kclipboard.cpp
@@ -107,7 +107,7 @@ TDEClipboardSynchronizer::TDEClipboardSynchronizer( TQObject *parent, const char
 {
     s_self = this;
 
-    KConfigGroup config( TDEGlobal::config(), "General" );
+    TDEConfigGroup config( TDEGlobal::config(), "General" );
     s_sync = config.readBoolEntry( "SynchronizeClipboardAndSelection", s_sync);
     s_reverse_sync = config.readBoolEntry( "ClipboardSetSelection",
                                                 s_reverse_sync );
diff --git a/tdecore/kconfig.cpp b/tdecore/kconfig.cpp
index b8ac9d2a1..26459cdde 100644
--- a/tdecore/kconfig.cpp
+++ b/tdecore/kconfig.cpp
@@ -41,9 +41,9 @@
 #include "kstaticdeleter.h"
 #include <tqtimer.h>
 
-KConfig::KConfig( const TQString& fileName,
+TDEConfig::TDEConfig( const TQString& fileName,
                  bool bReadOnly, bool bUseKderc, const char *resType )
-  : KConfigBase(), bGroupImmutable(false), bFileImmutable(false),
+  : TDEConfigBase(), bGroupImmutable(false), bFileImmutable(false),
     bForceGlobal(false)
 {
   // set the object's read-only status.
@@ -52,7 +52,7 @@ KConfig::KConfig( const TQString& fileName,
   // for right now we will hardcode that we are using the INI
   // back end driver.  In the future this should be converted over to
   // a object factory of some sorts.
-  KConfigINIBackEnd *aBackEnd = new KConfigINIBackEnd(this,
+  TDEConfigINIBackEnd *aBackEnd = new TDEConfigINIBackEnd(this,
 						      fileName,
                                                       resType,
 						      bUseKderc);
@@ -75,7 +75,7 @@ KConfig::KConfig( const TQString& fileName,
       reparseConfiguration();
 }
 
-KConfig::KConfig(KConfigBackEnd *aBackEnd, bool bReadOnly)
+TDEConfig::TDEConfig(TDEConfigBackEnd *aBackEnd, bool bReadOnly)
     : bGroupImmutable(false), bFileImmutable(false),
     bForceGlobal(false)
 {
@@ -84,19 +84,19 @@ KConfig::KConfig(KConfigBackEnd *aBackEnd, bool bReadOnly)
   reparseConfiguration();
 }
 
-KConfig::~KConfig()
+TDEConfig::~TDEConfig()
 {
   sync();
 
   delete backEnd;
 }
 
-void KConfig::rollback(bool bDeep)
+void TDEConfig::rollback(bool bDeep)
 {
-  KConfigBase::rollback(bDeep);
+  TDEConfigBase::rollback(bDeep);
 
   if (!bDeep)
-    return; // object's bDeep flag is set in KConfigBase method
+    return; // object's bDeep flag is set in TDEConfigBase method
 
   // clear any dirty flags that entries might have set
   for (KEntryMapIterator aIt = aEntryMap.begin();
@@ -104,7 +104,7 @@ void KConfig::rollback(bool bDeep)
     (*aIt).bDirty = false;
 }
 
-TQStringList KConfig::groupList() const
+TQStringList TDEConfig::groupList() const
 {
   TQStringList retList;
 
@@ -138,7 +138,7 @@ TQStringList KConfig::groupList() const
   return retList;
 }
 
-TQMap<TQString, TQString> KConfig::entryMap(const TQString &pGroup) const
+TQMap<TQString, TQString> TDEConfig::entryMap(const TQString &pGroup) const
 {
   TQCString pGroup_utf = pGroup.utf8();
   KEntryKey groupKey( pGroup_utf, 0 );
@@ -158,7 +158,7 @@ TQMap<TQString, TQString> KConfig::entryMap(const TQString &pGroup) const
   return tmpMap;
 }
 
-void KConfig::reparseConfiguration()
+void TDEConfig::reparseConfiguration()
 {
   // Don't lose pending changes
   if (!isReadOnly() && backEnd && bDirty)
@@ -175,7 +175,7 @@ void KConfig::reparseConfiguration()
   bFileImmutable = bReadOnly;
 }
 
-KEntryMap KConfig::internalEntryMap(const TQString &pGroup) const
+KEntryMap TDEConfig::internalEntryMap(const TQString &pGroup) const
 {
   TQCString pGroup_utf = pGroup.utf8();
   KEntry aEntry;
@@ -199,7 +199,7 @@ KEntryMap KConfig::internalEntryMap(const TQString &pGroup) const
   return tmpEntryMap;
 }
 
-void KConfig::putData(const KEntryKey &_key, const KEntry &_data, bool _checkGroup)
+void TDEConfig::putData(const KEntryKey &_key, const KEntry &_data, bool _checkGroup)
 {
   if (bFileImmutable && !_key.bDefault)
     return;
@@ -235,7 +235,7 @@ void KConfig::putData(const KEntryKey &_key, const KEntry &_data, bool _checkGro
   }
 }
 
-KEntry KConfig::lookupData(const KEntryKey &_key) const
+KEntry TDEConfig::lookupData(const KEntryKey &_key) const
 {
   KEntryMapConstIterator aIt = aEntryMap.find(_key);
   if (aIt != aEntryMap.end())
@@ -251,7 +251,7 @@ KEntry KConfig::lookupData(const KEntryKey &_key) const
   }
 }
 
-bool KConfig::internalHasGroup(const TQCString &group) const
+bool TDEConfig::internalHasGroup(const TQCString &group) const
 {
   KEntryKey groupKey( group, 0);
 
@@ -272,19 +272,19 @@ bool KConfig::internalHasGroup(const TQCString &group) const
   return false;
 }
 
-void KConfig::setFileWriteMode(int mode)
+void TDEConfig::setFileWriteMode(int mode)
 {
   backEnd->setFileWriteMode(mode);
 }
 
-KLockFile::Ptr KConfig::lockFile(bool bGlobal)
+KLockFile::Ptr TDEConfig::lockFile(bool bGlobal)
 {
-  KConfigINIBackEnd *aBackEnd = dynamic_cast<KConfigINIBackEnd*>(backEnd);
+  TDEConfigINIBackEnd *aBackEnd = dynamic_cast<TDEConfigINIBackEnd*>(backEnd);
   if (!aBackEnd) return 0;
   return aBackEnd->lockFile(bGlobal);
 }
 
-void KConfig::checkUpdate(const TQString &id, const TQString &updateFile)
+void TDEConfig::checkUpdate(const TQString &id, const TQString &updateFile)
 {
   TQString oldGroup = group();
   setGroup("$Version");
@@ -300,10 +300,10 @@ void KConfig::checkUpdate(const TQString &id, const TQString &updateFile)
   setGroup(oldGroup);
 }
 
-KConfig* KConfig::copyTo(const TQString &file, KConfig *config) const
+TDEConfig* TDEConfig::copyTo(const TQString &file, TDEConfig *config) const
 {
   if (!config)
-     config = new KConfig(TQString::null, false, false);
+     config = new TDEConfig(TQString::null, false, false);
   config->backEnd->changeFileName(file, "config", false);
   config->setReadOnly(false);
   config->bFileImmutable = false;
@@ -325,8 +325,8 @@ KConfig* KConfig::copyTo(const TQString &file, KConfig *config) const
   return config;
 }
 
-void KConfig::virtual_hook( int id, void* data )
-{ KConfigBase::virtual_hook( id, data ); }
+void TDEConfig::virtual_hook( int id, void* data )
+{ TDEConfigBase::virtual_hook( id, data ); }
 
 static KStaticDeleter< TQValueList<KSharedConfig*> > sd;
 TQValueList<KSharedConfig*> *KSharedConfig::s_list = 0;
@@ -348,7 +348,7 @@ KSharedConfig::Ptr KSharedConfig::openConfig(const TQString& fileName, bool read
 }
 
 KSharedConfig::KSharedConfig( const TQString& fileName, bool readonly, bool usekdeglobals)
- : KConfig(fileName, readonly, usekdeglobals)
+ : TDEConfig(fileName, readonly, usekdeglobals)
 {
   if (!s_list)
   {
diff --git a/tdecore/kconfig.h b/tdecore/kconfig.h
index 63e7be591..c5084c109 100644
--- a/tdecore/kconfig.h
+++ b/tdecore/kconfig.h
@@ -29,7 +29,7 @@ class TQTimer;
 #include "kconfigbase.h"
 #include "klockfile.h"
 
-class KConfigPrivate;
+class TDEConfigPrivate;
 
 /**
 * Access KDE Configuration entries.
@@ -37,17 +37,17 @@ class KConfigPrivate;
 * This class implements KDE's default configuration system.
 *
 * @author Kalle Dalheimer <kalle@kde.org>, Preston Brown <pbrown@kde.org>
-* @see TDEGlobal::config(), KConfigBase, KSimpleConfig
+* @see TDEGlobal::config(), TDEConfigBase, KSimpleConfig
 * @short KDE Configuration Management class
 */
-class TDECORE_EXPORT KConfig : public KConfigBase
+class TDECORE_EXPORT TDEConfig : public TDEConfigBase
 {
   Q_OBJECT
 
 public:
 
   /**
-   * Constructs a KConfig object.
+   * Constructs a TDEConfig object.
    *
    * @param fileName A file to parse in addition to the
    *        system-wide file(s).  If it is not provided, only global
@@ -59,18 +59,18 @@ public:
    * @param bUseKDEGlobals Toggle reading the global KDE configuration file.
    * @param resType the place to look in (config, data, etc) See KStandardDirs.
    */
-  KConfig( const TQString& fileName = TQString::null,
+  TDEConfig( const TQString& fileName = TQString::null,
           bool bReadOnly = false, bool bUseKDEGlobals = true, const char *resType="config");
 
-  KConfig(KConfigBackEnd *backEnd, bool bReadOnly = false);
+  TDEConfig(TDEConfigBackEnd *backEnd, bool bReadOnly = false);
 
   /**
-   * Destructs the KConfig object.
+   * Destructs the TDEConfig object.
    *
    * Writes back any dirty configuration entries, and destroys
    * dynamically created objects.
    */
-  virtual ~KConfig();
+  virtual ~TDEConfig();
 
   /**
    * Clears all entries out of the @p dirtyEntryMap, so the
@@ -82,7 +82,7 @@ public:
    *        false, but the dirty entries remain in the dirty entry
    *        map.
    *
-   * @see KConfigBase::rollback
+   * @see TDEConfigBase::rollback
    */
   virtual void rollback(bool bDeep = true);
 
@@ -162,15 +162,15 @@ public:
    * @param config optional config object to reuse
    * @since 3.2
    */
-  KConfig* copyTo(const TQString &file, KConfig *config=0) const;
+  TDEConfig* copyTo(const TQString &file, TDEConfig *config=0) const;
 
   /**
    * Returns a lock file object for the configuration file or 0 if
    * the backend does not support locking.
    * @param bGlobal if true, return the lock file for the global config file
    *
-   * NOTE: KConfig::sync() requires a lock on both the normal and global
-   * config file. When calling KConfig::sync() while having a lock on the
+   * NOTE: TDEConfig::sync() requires a lock on both the normal and global
+   * config file. When calling TDEConfig::sync() while having a lock on the
    * global config file, the normal config file MUST be locked AS WELL and the 
    * normal config file MUST be locked BEFORE the global config file!
    * Otherwise there is a risk of deadlock.
@@ -247,12 +247,12 @@ private:
    * @internal
    * copy-construction and assignment are not allowed
    */
-  KConfig( const KConfig& );
+  TDEConfig( const TDEConfig& );
   /**
    * @internal
    * copy-construction and assignment are not allowed
    */
-  KConfig& operator= ( const KConfig& rConfig );
+  TDEConfig& operator= ( const TDEConfig& rConfig );
 
 private:
   bool bGroupImmutable : 1; // Current group is immutable.
@@ -261,16 +261,16 @@ private:
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  KConfigPrivate *d;
+  TDEConfigPrivate *d;
 };
 
 /**
- * KConfig variant using shared memory
+ * TDEConfig variant using shared memory
  *
  * KSharedConfig provides a reference counted, shared memory variant
- * of KConfig.
+ * of TDEConfig.
  */
-class TDECORE_EXPORT KSharedConfig : public KConfig, public KShared
+class TDECORE_EXPORT KSharedConfig : public TDEConfig, public KShared
 {
   friend class TQValueList<KSharedConfig*>;
 public:
diff --git a/tdecore/kconfig_compiler/README.dox b/tdecore/kconfig_compiler/README.dox
index 36d9f988b..76dbc04c2 100644
--- a/tdecore/kconfig_compiler/README.dox
+++ b/tdecore/kconfig_compiler/README.dox
@@ -4,7 +4,7 @@
 kconfig_compiler generates C++ source code from an XML file containing 
 information about configuration options (.kcfg) and a file that provides 
 the code generation options (.kcfgc) The generated class is based on 
-KConfigSkeleton and provides an API for the application to access its
+TDEConfigSkeleton and provides an API for the application to access its
 configuration data.
 
 <h2>XML description of the configuration options</h2>
@@ -96,9 +96,9 @@ The following options are read from the kcfgc file:
 <tr>
   <td><b>Inherits</b></td>
   <td>string</td>
-  <td>KConfigSkeleton</td>
+  <td>TDEConfigSkeleton</td>
   <td>Class the generated class inherits from. This class must inherit
-  KConfigSkeleton.</td>
+  TDEConfigSkeleton.</td>
 </tr>
 <tr>
   <td><b>Visibility</b></td>
@@ -144,7 +144,7 @@ The following options are read from the kcfgc file:
   <td><b>ItemAccessors</b></td>
   <td>bool</td>
   <td>false</td>
-  <td>Generate accessor functions for the KConfigSkeletonItem objects
+  <td>Generate accessor functions for the TDEConfigSkeletonItem objects
   corresponding to the configuration options. If <b>SetUserTexts</b> is set,
   <b>ItemAccessors</b> also has to be set.</td>
 </tr>
diff --git a/tdecore/kconfig_compiler/example/autoexample.cpp b/tdecore/kconfig_compiler/example/autoexample.cpp
index ec71dea71..53e02f68d 100644
--- a/tdecore/kconfig_compiler/example/autoexample.cpp
+++ b/tdecore/kconfig_compiler/example/autoexample.cpp
@@ -48,7 +48,7 @@ int main( int argc, char **argv )
   ExamplePrefsBase configSkeleton( "dummy1", "dummy2" );
   configSkeleton.readConfig();
 
-  KConfigDialog *dialog = new KConfigDialog( 0, "settings", &configSkeleton );
+  TDEConfigDialog *dialog = new TDEConfigDialog( 0, "settings", &configSkeleton );
   
   GeneralBase *general = new GeneralBase( 0 );
   dialog->addPage( general, i18n("General"), "General", "" );
diff --git a/tdecore/kconfig_compiler/example/exampleprefs_base.kcfgc b/tdecore/kconfig_compiler/example/exampleprefs_base.kcfgc
index 829ec2e29..a9ac98dc7 100644
--- a/tdecore/kconfig_compiler/example/exampleprefs_base.kcfgc
+++ b/tdecore/kconfig_compiler/example/exampleprefs_base.kcfgc
@@ -3,7 +3,7 @@ ClassName=ExamplePrefsBase
 #
 # Singleton=false
 #
-# Inherits=KConfigSkeleton
+# Inherits=TDEConfigSkeleton
 #
 # IncludeFiles=libtdepim/kpimprefs.h
 #
diff --git a/tdecore/kconfig_compiler/kcfg.xsd b/tdecore/kconfig_compiler/kcfg.xsd
index 97f716d62..9eb18a068 100644
--- a/tdecore/kconfig_compiler/kcfg.xsd
+++ b/tdecore/kconfig_compiler/kcfg.xsd
@@ -29,7 +29,7 @@
     <xsd:annotation>
         <xsd:documentation>
             
-            A Schema for KDE's KConfigXT XML format. It is similar to the DTD
+            A Schema for KDE's TDEConfigXT XML format. It is similar to the DTD
             found at:
             
             http://www.kde.org/standards/kcfg/1.0/kcfg.dtd    
diff --git a/tdecore/kconfig_compiler/kconfig_compiler.cpp b/tdecore/kconfig_compiler/kconfig_compiler.cpp
index 51175c528..b8839f677 100644
--- a/tdecore/kconfig_compiler/kconfig_compiler.cpp
+++ b/tdecore/kconfig_compiler/kconfig_compiler.cpp
@@ -706,7 +706,7 @@ static TQString itemDeclaration(const CfgEntry *e)
 
   TQString fCap = e->name();
   fCap[0] = fCap[0].upper();
-  return "  KConfigSkeleton::Item"+itemType( e->type() ) +
+  return "  TDEConfigSkeleton::Item"+itemType( e->type() ) +
          "  *item" + fCap +
          ( (!e->param().isEmpty())?(TQString("[%1]").arg(e->paramMax()+1)) : TQString()) +
          ";\n";
@@ -754,7 +754,7 @@ static TQString itemPath(const CfgEntry *e)
 TQString newItem( const TQString &type, const TQString &name, const TQString &key,
                  const TQString &defaultValue, const TQString &param = TQString())
 {
-  TQString t = "new KConfigSkeleton::Item" + itemType( type ) +
+  TQString t = "new TDEConfigSkeleton::Item" + itemType( type ) +
               "( currentGroup(), " + key + ", " + varPath( name ) + param;
   if ( type == "Enum" ) t += ", values" + name;
   if ( !defaultValue.isEmpty() ) {
@@ -953,7 +953,7 @@ TQString indent(TQString text, int spaces)
 int main( int argc, char **argv )
 {
   TDEAboutData aboutData( "kconfig_compiler", I18N_NOOP("TDE .kcfg compiler"), "0.3",
-    I18N_NOOP("KConfig Compiler") , TDEAboutData::License_LGPL );
+    I18N_NOOP("TDEConfig Compiler") , TDEAboutData::License_LGPL );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
   aboutData.addAuthor( "Waldo Bastian", 0, "bastian@kde.org" );
   aboutData.addAuthor( "Zack Rusin", 0, "zack@kde.org" );
@@ -1093,7 +1093,7 @@ int main( int argc, char **argv )
     }
   }
 
-  if ( inherits.isEmpty() ) inherits = "KConfigSkeleton";
+  if ( inherits.isEmpty() ) inherits = "TDEConfigSkeleton";
 
   if ( className.isEmpty() ) {
     kdError() << "Class name missing" << endl;
@@ -1330,7 +1330,7 @@ int main( int argc, char **argv )
     h << "    static" << endl;
     h << "    void writeConfig()" << endl;
     h << "    {" << endl;
-    h << "      static_cast<KConfigSkeleton*>(self())->writeConfig();" << endl;
+    h << "      static_cast<TDEConfigSkeleton*>(self())->writeConfig();" << endl;
     h << "    }" << endl;
   }
 
@@ -1455,7 +1455,7 @@ int main( int argc, char **argv )
     }
     cpp << endl << "    // items" << endl;
     for( e = entries.first(); e; e = entries.next() ) {
-      cpp << "    KConfigSkeleton::Item" << itemType( e->type() ) << " *" << itemVar( e );
+      cpp << "    TDEConfigSkeleton::Item" << itemType( e->type() ) << " *" << itemVar( e );
       if (!e->param().isEmpty() ) cpp << TQString("[%1]").arg( e->paramMax()+1 );
         cpp << ";" << endl;
     }
@@ -1553,13 +1553,13 @@ int main( int argc, char **argv )
       cpp << e->code() << endl;
     }
     if ( e->type() == "Enum" ) {
-      cpp << "  TQValueList<KConfigSkeleton::ItemEnum::Choice> values"
+      cpp << "  TQValueList<TDEConfigSkeleton::ItemEnum::Choice> values"
           << e->name() << ";" << endl;
       TQValueList<CfgEntry::Choice> choices = e->choices();
       TQValueList<CfgEntry::Choice>::ConstIterator it;
       for( it = choices.begin(); it != choices.end(); ++it ) {
         cpp << "  {" << endl;
-        cpp << "    KConfigSkeleton::ItemEnum::Choice choice;" << endl;
+        cpp << "    TDEConfigSkeleton::ItemEnum::Choice choice;" << endl;
         cpp << "    choice.name = TQString::fromLatin1( \"" << (*it).name << "\" );" << endl;
         if ( setUserTexts ) {
           if ( !(*it).label.isEmpty() )
@@ -1670,7 +1670,7 @@ int main( int argc, char **argv )
       if ( itemAccessors )
       {
         cpp << endl;
-        cpp << "KConfigSkeleton::Item" << itemType( e->type() ) << " *"
+        cpp << "TDEConfigSkeleton::Item" << itemType( e->type() ) << " *"
           << getFunction( n, className ) << "Item(";
         if (!e->param().isEmpty()) {
           cpp << " " << cppType(e->paramType()) << " i ";
diff --git a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp b/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp
index 2f8e7eee3..143838908 100644
--- a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp
+++ b/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp
@@ -1,5 +1,5 @@
 /*
-    Tests for KConfig Compiler
+    Tests for TDEConfig Compiler
 
     Copyright (c) 2005      by Duncan Mac-Vicar       <duncan@kde.org>
 
@@ -21,8 +21,8 @@
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE( kunittest_kconfigcompiler_test, "KConfigXT")
-KUNITTEST_MODULE_REGISTER_TESTER( KConfigCompiler_Test )
+KUNITTEST_MODULE( kunittest_kconfigcompiler_test, "TDEConfigXT")
+KUNITTEST_MODULE_REGISTER_TESTER( TDEConfigCompiler_Test )
 
 typedef const char * CompilerTestSet[];
 
@@ -50,12 +50,12 @@ static CompilerTestSet willFailCases =
 };
 
 
-void KConfigCompiler_Test::allTests()
+void TDEConfigCompiler_Test::allTests()
 {
 	testExpectedOutput();
 }
 
-void KConfigCompiler_Test::testExpectedOutput()
+void TDEConfigCompiler_Test::testExpectedOutput()
 {
 	uint i = 0;
 	// Known to pass test cases
@@ -74,7 +74,7 @@ void KConfigCompiler_Test::testExpectedOutput()
 	}
 }
 
-void KConfigCompiler_Test::performCompare(const TQString &fileName, bool fail)
+void TDEConfigCompiler_Test::performCompare(const TQString &fileName, bool fail)
 {
 	TQFile file(fileName);
 	TQFile fileRef(TQString::fromLatin1(SRCDIR) + TQString::fromLatin1("/") + fileName + TQString::fromLatin1(".ref"));
diff --git a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.h b/tdecore/kconfig_compiler/tests/kconfigcompiler_test.h
index 36b33cd47..1eba78b97 100644
--- a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.h
+++ b/tdecore/kconfig_compiler/tests/kconfigcompiler_test.h
@@ -1,5 +1,5 @@
 /*
-    Tests for KConfig Compiler
+    Tests for TDEConfig Compiler
 
     Copyright (c) 2005      by Duncan Mac-Vicar       <duncan@kde.org>
 
@@ -21,7 +21,7 @@
 class TQString;
 
 // change to SlotTester when it works
-class KConfigCompiler_Test : public KUnitTest::Tester
+class TDEConfigCompiler_Test : public KUnitTest::Tester
 {
 public:
 	void allTests();
diff --git a/tdecore/kconfig_compiler/tests/myprefs.h b/tdecore/kconfig_compiler/tests/myprefs.h
index ebef89c08..020dc6bfa 100644
--- a/tdecore/kconfig_compiler/tests/myprefs.h
+++ b/tdecore/kconfig_compiler/tests/myprefs.h
@@ -1,7 +1,7 @@
 #include <kconfigskeleton.h>
 
-class MyPrefs : public KConfigSkeleton
+class MyPrefs : public TDEConfigSkeleton
 {
   public:
-    MyPrefs( const TQString &a ) : KConfigSkeleton( a ) {}
+    MyPrefs( const TQString &a ) : TDEConfigSkeleton( a ) {}
 };
diff --git a/tdecore/kconfig_compiler/tests/test1.cpp.ref b/tdecore/kconfig_compiler/tests/test1.cpp.ref
index b3050921e..d0b6b76f1 100644
--- a/tdecore/kconfig_compiler/tests/test1.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test1.cpp.ref
@@ -4,65 +4,65 @@
 #include "test1.h"
 
 Test1::Test1(  const TQString & transport, const TQString & folder )
-  : KConfigSkeleton( TQString::fromLatin1( "examplerc" ) )
+  : TDEConfigSkeleton( TQString::fromLatin1( "examplerc" ) )
   , mParamtransport(transport)
   , mParamfolder(folder)
 {
   setCurrentGroup( TQString::fromLatin1( "General-%1" ).arg( mParamfolder ) );
 
-  KConfigSkeleton::ItemBool  *itemOneOption;
-  itemOneOption = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "OneOption" ), mOneOption, true );
+  TDEConfigSkeleton::ItemBool  *itemOneOption;
+  itemOneOption = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "OneOption" ), mOneOption, true );
   addItem( itemOneOption, TQString::fromLatin1( "OneOption" ) );
-  KConfigSkeleton::ItemInt  *itemAnotherOption;
-  itemAnotherOption = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption, 5 );
+  TDEConfigSkeleton::ItemInt  *itemAnotherOption;
+  itemAnotherOption = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption, 5 );
   addItem( itemAnotherOption, TQString::fromLatin1( "AnotherOption" ) );
-  TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesListOption;
+  TQValueList<TDEConfigSkeleton::ItemEnum::Choice> valuesListOption;
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "One" );
     valuesListOption.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "Two" );
     valuesListOption.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "Three" );
     valuesListOption.append( choice );
   }
-  KConfigSkeleton::ItemEnum  *itemListOption;
-  itemListOption = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "ListOption" ), mListOption, valuesListOption, EnumListOption::One );
+  TDEConfigSkeleton::ItemEnum  *itemListOption;
+  itemListOption = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "ListOption" ), mListOption, valuesListOption, EnumListOption::One );
   addItem( itemListOption, TQString::fromLatin1( "ListOption" ) );
 
   setCurrentGroup( TQString::fromLatin1( "MyOptions" ) );
 
-  KConfigSkeleton::ItemString  *itemMyString;
-  itemMyString = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "MyString" ), mMyString, TQString::fromLatin1( "Default String" ) );
+  TDEConfigSkeleton::ItemString  *itemMyString;
+  itemMyString = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "MyString" ), mMyString, TQString::fromLatin1( "Default String" ) );
   addItem( itemMyString, TQString::fromLatin1( "MyString" ) );
-  KConfigSkeleton::ItemPath  *itemMyPath;
-  itemMyPath = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "MyPath" ), mMyPath, TQDir::homeDirPath()+TQString::fromLatin1(".hidden_file") );
+  TDEConfigSkeleton::ItemPath  *itemMyPath;
+  itemMyPath = new TDEConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "MyPath" ), mMyPath, TQDir::homeDirPath()+TQString::fromLatin1(".hidden_file") );
   addItem( itemMyPath, TQString::fromLatin1( "MyPath" ) );
-  KConfigSkeleton::ItemInt  *itemAnotherOption2;
-  itemAnotherOption2 = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption2, 10 );
+  TDEConfigSkeleton::ItemInt  *itemAnotherOption2;
+  itemAnotherOption2 = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption2, 10 );
   addItem( itemAnotherOption2, TQString::fromLatin1( "AnotherOption2" ) );
   TQStringList defaultMyStringList;
   defaultMyStringList.append( TQString::fromUtf8( "up" ) );
   defaultMyStringList.append( TQString::fromUtf8( "down" ) );
 
-  KConfigSkeleton::ItemStringList  *itemMyStringList;
-  itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
+  TDEConfigSkeleton::ItemStringList  *itemMyStringList;
+  itemMyStringList = new TDEConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
   addItem( itemMyStringList, TQString::fromLatin1( "MyStringList" ) );
   TQStringList defaultMyStringListHidden;
   defaultMyStringListHidden.append( TQString::fromUtf8( "up" ) );
   defaultMyStringListHidden.append( TQString::fromUtf8( "down" ) );
 
-  KConfigSkeleton::ItemStringList  *itemMyStringListHidden;
-  itemMyStringListHidden = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringListHidden" ), mMyStringListHidden, defaultMyStringListHidden );
+  TDEConfigSkeleton::ItemStringList  *itemMyStringListHidden;
+  itemMyStringListHidden = new TDEConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringListHidden" ), mMyStringListHidden, defaultMyStringListHidden );
   addItem( itemMyStringListHidden, TQString::fromLatin1( "MyStringListHidden" ) );
-  KConfigSkeleton::ItemInt  *itemMyNumber;
-  itemMyNumber = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "List-%1-%2" ).arg( mParamtransport ).arg( mParamfolder ), mMyNumber, 1 );
+  TDEConfigSkeleton::ItemInt  *itemMyNumber;
+  itemMyNumber = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "List-%1-%2" ).arg( mParamtransport ).arg( mParamfolder ), mMyNumber, 1 );
   addItem( itemMyNumber, TQString::fromLatin1( "MyNumber" ) );
 }
 
diff --git a/tdecore/kconfig_compiler/tests/test1.h.ref b/tdecore/kconfig_compiler/tests/test1.h.ref
index cc2d99c69..584dcb7ff 100644
--- a/tdecore/kconfig_compiler/tests/test1.h.ref
+++ b/tdecore/kconfig_compiler/tests/test1.h.ref
@@ -7,7 +7,7 @@
 #include <kdebug.h>
 
 #include <tqdir.h>
-class Test1 : public KConfigSkeleton
+class Test1 : public TDEConfigSkeleton
 {
   public:
     class EnumListOption
diff --git a/tdecore/kconfig_compiler/tests/test1.kcfgc b/tdecore/kconfig_compiler/tests/test1.kcfgc
index 3b74d7c51..ecab7b851 100644
--- a/tdecore/kconfig_compiler/tests/test1.kcfgc
+++ b/tdecore/kconfig_compiler/tests/test1.kcfgc
@@ -3,7 +3,7 @@ ClassName=Test1
 #
 # Singleton=false
 #
-# Inherits=KConfigSkeleton
+# Inherits=TDEConfigSkeleton
 #
 # IncludeFiles=libtdepim/kpimprefs.h
 #
diff --git a/tdecore/kconfig_compiler/tests/test2.cpp.ref b/tdecore/kconfig_compiler/tests/test2.cpp.ref
index 2d56f7545..fe7b8af80 100644
--- a/tdecore/kconfig_compiler/tests/test2.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test2.cpp.ref
@@ -10,59 +10,59 @@ Test2::Test2(  )
 {
   setCurrentGroup( TQString::fromLatin1( "General" ) );
 
-  mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false );
+  mAutoSaveItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false );
   mAutoSaveItem->setLabel( i18n("Enable automatic saving of calendar") );
   mAutoSaveItem->setWhatsThis( i18n("WhatsThis text for AutoSave option") );
   addItem( mAutoSaveItem, TQString::fromLatin1( "AutoSave" ) );
-  mAutoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), mAutoSaveInterval, 10 );
+  mAutoSaveIntervalItem = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), mAutoSaveInterval, 10 );
   mAutoSaveIntervalItem->setLabel( i18n("Auto Save Interval") );
   addItem( mAutoSaveIntervalItem, TQString::fromLatin1( "AutoSaveInterval" ) );
-  mConfirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), mConfirm, true );
+  mConfirmItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), mConfirm, true );
   mConfirmItem->setLabel( i18n("Confirm deletes") );
   addItem( mConfirmItem, TQString::fromLatin1( "Confirm" ) );
-  mArchiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), mArchiveFile );
+  mArchiveFileItem = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), mArchiveFile );
   mArchiveFileItem->setLabel( i18n("Archive File") );
   addItem( mArchiveFileItem, TQString::fromLatin1( "ArchiveFile" ) );
-  TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesDestination;
+  TQValueList<TDEConfigSkeleton::ItemEnum::Choice> valuesDestination;
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "standardDestination" );
     valuesDestination.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "askDestination" );
     valuesDestination.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "argl1" );
     choice.label = i18n("Argl1 Label");
     valuesDestination.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "argl2" );
     choice.whatsThis = i18n("Argl2 Whatsthis");
     valuesDestination.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "argl3" );
     choice.label = i18n("Argl3 Label");
     choice.whatsThis = i18n("Argl3 Whatsthis");
     valuesDestination.append( choice );
   }
-  mDestinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), mDestination, valuesDestination, standardDestination );
+  mDestinationItem = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), mDestination, valuesDestination, standardDestination );
   mDestinationItem->setLabel( i18n("New Events/Todos Should") );
   addItem( mDestinationItem, TQString::fromLatin1( "Destination" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Views" ) );
 
-  mHourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), mHourSize, 10 );
+  mHourSizeItem = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), mHourSize, 10 );
   mHourSizeItem->setLabel( i18n("Hour Size") );
   addItem( mHourSizeItem, TQString::fromLatin1( "HourSize" ) );
-  mSelectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), mSelectionStartsEditor, false );
+  mSelectionStartsEditorItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), mSelectionStartsEditor, false );
   mSelectionStartsEditorItem->setLabel( i18n("Time range selection in agenda view starts event editor") );
   addItem( mSelectionStartsEditorItem, TQString::fromLatin1( "SelectionStartsEditor" ) );
 
@@ -72,22 +72,22 @@ Test2::Test2(  )
   defaultSelectedPlugins.append( TQString::fromUtf8( "holidays" ) );
   defaultSelectedPlugins.append( TQString::fromUtf8( "webexport" ) );
 
-  mSelectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins );
+  mSelectedPluginsItem = new TDEConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins );
   mSelectedPluginsItem->setLabel( i18n("SelectedPlugins") );
   addItem( mSelectedPluginsItem, TQString::fromLatin1( "SelectedPlugins" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Colors" ) );
 
-  mHighlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), mHighlightColor, TQColor( 100, 100, 255 ) );
+  mHighlightColorItem = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), mHighlightColor, TQColor( 100, 100, 255 ) );
   mHighlightColorItem->setLabel( i18n("Highlight color") );
   addItem( mHighlightColorItem, TQString::fromLatin1( "HighlightColor" ) );
-  mAgendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), mAgendaBgColor, TQColor( 255, 255, 255 ) );
+  mAgendaBgColorItem = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), mAgendaBgColor, TQColor( 255, 255, 255 ) );
   mAgendaBgColorItem->setLabel( i18n("Agenda view background color") );
   addItem( mAgendaBgColorItem, TQString::fromLatin1( "AgendaBgColor" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Fonts" ) );
 
-  mTimeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), mTimeBarFont );
+  mTimeBarFontItem = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), mTimeBarFont );
   mTimeBarFontItem->setLabel( i18n("Time bar") );
   addItem( mTimeBarFontItem, TQString::fromLatin1( "TimeBarFont" ) );
 }
diff --git a/tdecore/kconfig_compiler/tests/test3.cpp.ref b/tdecore/kconfig_compiler/tests/test3.cpp.ref
index 11fe6b38f..3bd0eb8c9 100644
--- a/tdecore/kconfig_compiler/tests/test3.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test3.cpp.ref
@@ -6,20 +6,20 @@
 using namespace TestNameSpace;
 
 Test3::Test3(  )
-  : KConfigSkeleton( TQString::fromLatin1( "test3rc" ) )
+  : TDEConfigSkeleton( TQString::fromLatin1( "test3rc" ) )
 {
   setCurrentGroup( TQString::fromLatin1( "General" ) );
 
-  mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false );
+  mAutoSaveItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false );
   addItem( mAutoSaveItem, TQString::fromLatin1( "AutoSave" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Blah" ) );
 
-  mBlubbItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Blubb" ), mBlubb, 10 );
+  mBlubbItem = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Blubb" ), mBlubb, 10 );
   addItem( mBlubbItem, TQString::fromLatin1( "Blubb" ) );
-  mBlahBlahItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "BlahBlah" ), mBlahBlah, TQString::fromLatin1( "a string" ) );
+  mBlahBlahItem = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "BlahBlah" ), mBlahBlah, TQString::fromLatin1( "a string" ) );
   addItem( mBlahBlahItem, TQString::fromLatin1( "BlahBlah" ) );
-  mMyPasswordItem = new KConfigSkeleton::ItemPassword( currentGroup(), TQString::fromLatin1( "MyPassword" ), mMyPassword );
+  mMyPasswordItem = new TDEConfigSkeleton::ItemPassword( currentGroup(), TQString::fromLatin1( "MyPassword" ), mMyPassword );
   addItem( mMyPasswordItem, TQString::fromLatin1( "MyPassword" ) );
 }
 
diff --git a/tdecore/kconfig_compiler/tests/test3.h.ref b/tdecore/kconfig_compiler/tests/test3.h.ref
index 75b1b0929..4c35a138a 100644
--- a/tdecore/kconfig_compiler/tests/test3.h.ref
+++ b/tdecore/kconfig_compiler/tests/test3.h.ref
@@ -8,7 +8,7 @@
 
 namespace TestNameSpace {
 
-class Test3 : public KConfigSkeleton
+class Test3 : public TDEConfigSkeleton
 {
   public:
 
diff --git a/tdecore/kconfig_compiler/tests/test4.cpp.ref b/tdecore/kconfig_compiler/tests/test4.cpp.ref
index 6918a8c8a..c6b29bec2 100644
--- a/tdecore/kconfig_compiler/tests/test4.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test4.cpp.ref
@@ -21,54 +21,54 @@ Test4 *Test4::self()
 const char* const Test4::EnumButton::enumToString[] = { "right", "mid", "left" };
 
 Test4::Test4(  )
-  : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
+  : TDEConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
 {
   mSelf = this;
   setCurrentGroup( TQString::fromLatin1( "Foo" ) );
 
 TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black };
-  KConfigSkeleton::ItemColor  *itemColor[4];
-  itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] );
+  TDEConfigSkeleton::ItemColor  *itemColor[4];
+  itemColor[0] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] );
   addItem( itemColor[0], TQString::fromLatin1( "Color0" ) );
-  itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] );
+  itemColor[1] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] );
   addItem( itemColor[1], TQString::fromLatin1( "Color1" ) );
-  itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] );
+  itemColor[2] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] );
   addItem( itemColor[2], TQString::fromLatin1( "Color2" ) );
-  itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] );
+  itemColor[3] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] );
   addItem( itemColor[3], TQString::fromLatin1( "Color3" ) );
-  TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesMouseAction;
+  TQValueList<TDEConfigSkeleton::ItemEnum::Choice> valuesMouseAction;
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "Encrypt" );
     valuesMouseAction.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "Decrypt" );
     valuesMouseAction.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "CrashNBurn" );
     valuesMouseAction.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "PumpNDump" );
     valuesMouseAction.append( choice );
   }
-  KConfigSkeleton::ItemEnum  *itemMouseAction[3];
-  itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, EnumMouseAction::Decrypt );
+  TDEConfigSkeleton::ItemEnum  *itemMouseAction[3];
+  itemMouseAction[0] = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, EnumMouseAction::Decrypt );
   addItem( itemMouseAction[0], TQString::fromLatin1( "MouseActionright" ) );
-  itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, EnumMouseAction::Encrypt );
+  itemMouseAction[1] = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, EnumMouseAction::Encrypt );
   addItem( itemMouseAction[1], TQString::fromLatin1( "MouseActionmid" ) );
-  itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, EnumMouseAction::PumpNDump );
+  itemMouseAction[2] = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, EnumMouseAction::PumpNDump );
   addItem( itemMouseAction[2], TQString::fromLatin1( "MouseActionleft" ) );
-  KConfigSkeleton::ItemString  *itemFooBar;
-  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+  TDEConfigSkeleton::ItemString  *itemFooBar;
+  itemFooBar = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
   addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
-  KConfigSkeleton::ItemInt  *itemAge;
-  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
+  TDEConfigSkeleton::ItemInt  *itemAge;
+  itemAge = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
   itemAge->setMinValue(8);
   itemAge->setMaxValue(88);
   addItem( itemAge, TQString::fromLatin1( "Age" ) );
diff --git a/tdecore/kconfig_compiler/tests/test4.h.ref b/tdecore/kconfig_compiler/tests/test4.h.ref
index d11dd3aee..9457413a1 100644
--- a/tdecore/kconfig_compiler/tests/test4.h.ref
+++ b/tdecore/kconfig_compiler/tests/test4.h.ref
@@ -6,7 +6,7 @@
 #include <kconfigskeleton.h>
 #include <kdebug.h>
 
-class Test4 : public KConfigSkeleton
+class Test4 : public TDEConfigSkeleton
 {
   public:
     class EnumMouseAction
@@ -115,7 +115,7 @@ class Test4 : public KConfigSkeleton
     static
     void writeConfig()
     {
-      static_cast<KConfigSkeleton*>(self())->writeConfig();
+      static_cast<TDEConfigSkeleton*>(self())->writeConfig();
     }
   protected:
     Test4();
diff --git a/tdecore/kconfig_compiler/tests/test5.cpp.ref b/tdecore/kconfig_compiler/tests/test5.cpp.ref
index 8373eb3f6..9e295bc0e 100644
--- a/tdecore/kconfig_compiler/tests/test5.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test5.cpp.ref
@@ -21,54 +21,54 @@ Test5 *Test5::self()
 const char* const Test5::EnumButtonToString[] = { "right", "mid", "left" };
 
 Test5::Test5(  )
-  : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
+  : TDEConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
 {
   mSelf = this;
   setCurrentGroup( TQString::fromLatin1( "Foo" ) );
 
 TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black };
-  KConfigSkeleton::ItemColor  *itemColor[4];
-  itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] );
+  TDEConfigSkeleton::ItemColor  *itemColor[4];
+  itemColor[0] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] );
   addItem( itemColor[0], TQString::fromLatin1( "Color0" ) );
-  itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] );
+  itemColor[1] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] );
   addItem( itemColor[1], TQString::fromLatin1( "Color1" ) );
-  itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] );
+  itemColor[2] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] );
   addItem( itemColor[2], TQString::fromLatin1( "Color2" ) );
-  itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] );
+  itemColor[3] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] );
   addItem( itemColor[3], TQString::fromLatin1( "Color3" ) );
-  TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesMouseAction;
+  TQValueList<TDEConfigSkeleton::ItemEnum::Choice> valuesMouseAction;
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "Encrypt" );
     valuesMouseAction.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "Decrypt" );
     valuesMouseAction.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "CrashNBurn" );
     valuesMouseAction.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "PumpNDump" );
     valuesMouseAction.append( choice );
   }
-  KConfigSkeleton::ItemEnum  *itemMouseAction[3];
-  itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, Decrypt );
+  TDEConfigSkeleton::ItemEnum  *itemMouseAction[3];
+  itemMouseAction[0] = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, Decrypt );
   addItem( itemMouseAction[0], TQString::fromLatin1( "MouseActionright" ) );
-  itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, Encrypt );
+  itemMouseAction[1] = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, Encrypt );
   addItem( itemMouseAction[1], TQString::fromLatin1( "MouseActionmid" ) );
-  itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, PumpNDump );
+  itemMouseAction[2] = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, PumpNDump );
   addItem( itemMouseAction[2], TQString::fromLatin1( "MouseActionleft" ) );
-  KConfigSkeleton::ItemString  *itemFooBar;
-  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+  TDEConfigSkeleton::ItemString  *itemFooBar;
+  itemFooBar = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
   addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
-  KConfigSkeleton::ItemInt  *itemAge;
-  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
+  TDEConfigSkeleton::ItemInt  *itemAge;
+  itemAge = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
   itemAge->setMinValue(8);
   itemAge->setMaxValue(88);
   addItem( itemAge, TQString::fromLatin1( "Age" ) );
diff --git a/tdecore/kconfig_compiler/tests/test5.h.ref b/tdecore/kconfig_compiler/tests/test5.h.ref
index efb9b448a..274da4761 100644
--- a/tdecore/kconfig_compiler/tests/test5.h.ref
+++ b/tdecore/kconfig_compiler/tests/test5.h.ref
@@ -6,7 +6,7 @@
 #include <kconfigskeleton.h>
 #include <kdebug.h>
 
-class Test5 : public KConfigSkeleton
+class Test5 : public TDEConfigSkeleton
 {
   public:
     enum { Encrypt, Decrypt, CrashNBurn, PumpNDump };
@@ -107,7 +107,7 @@ class Test5 : public KConfigSkeleton
     static
     void writeConfig()
     {
-      static_cast<KConfigSkeleton*>(self())->writeConfig();
+      static_cast<TDEConfigSkeleton*>(self())->writeConfig();
     }
   protected:
     Test5();
diff --git a/tdecore/kconfig_compiler/tests/test6.cpp.ref b/tdecore/kconfig_compiler/tests/test6.cpp.ref
index 51b96d4c4..fc19613a9 100644
--- a/tdecore/kconfig_compiler/tests/test6.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test6.cpp.ref
@@ -4,22 +4,22 @@
 #include "test6.h"
 
 Test6::Test6(  const TQString & Number )
-  : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
+  : TDEConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
   , mParamNumber(Number)
 {
   setCurrentGroup( TQString::fromLatin1( "Foo" ) );
 
-  KConfigSkeleton::ItemColor  *itemColor;
-  itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
+  TDEConfigSkeleton::ItemColor  *itemColor;
+  itemColor = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
   addItem( itemColor, TQString::fromLatin1( "Color" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Bar%1" ).arg( mParamNumber ) );
 
-  KConfigSkeleton::ItemString  *itemFooBar;
-  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+  TDEConfigSkeleton::ItemString  *itemFooBar;
+  itemFooBar = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
   addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
-  KConfigSkeleton::ItemInt  *itemAge;
-  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
+  TDEConfigSkeleton::ItemInt  *itemAge;
+  itemAge = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
   itemAge->setMinValue(8);
   itemAge->setMaxValue(88);
   addItem( itemAge, TQString::fromLatin1( "Age" ) );
diff --git a/tdecore/kconfig_compiler/tests/test6.h.ref b/tdecore/kconfig_compiler/tests/test6.h.ref
index 6743d6064..eee776b5a 100644
--- a/tdecore/kconfig_compiler/tests/test6.h.ref
+++ b/tdecore/kconfig_compiler/tests/test6.h.ref
@@ -6,7 +6,7 @@
 #include <kconfigskeleton.h>
 #include <kdebug.h>
 
-class Test6 : public KConfigSkeleton
+class Test6 : public TDEConfigSkeleton
 {
   public:
 
diff --git a/tdecore/kconfig_compiler/tests/test7.cpp.ref b/tdecore/kconfig_compiler/tests/test7.cpp.ref
index 91a22e036..81f7de10e 100644
--- a/tdecore/kconfig_compiler/tests/test7.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test7.cpp.ref
@@ -4,22 +4,22 @@
 #include "test7.h"
 
 Test7::Test7(  int Number )
-  : KConfigSkeleton( TQString::fromLatin1( "test7rc" ) )
+  : TDEConfigSkeleton( TQString::fromLatin1( "test7rc" ) )
   , mParamNumber(Number)
 {
   setCurrentGroup( TQString::fromLatin1( "Foo" ) );
 
-  KConfigSkeleton::ItemColor  *itemColor;
-  itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
+  TDEConfigSkeleton::ItemColor  *itemColor;
+  itemColor = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
   addItem( itemColor, TQString::fromLatin1( "Color" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Bar%1" ).arg( mParamNumber ) );
 
-  KConfigSkeleton::ItemString  *itemFooBar;
-  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+  TDEConfigSkeleton::ItemString  *itemFooBar;
+  itemFooBar = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
   addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
-  KConfigSkeleton::ItemInt  *itemAge;
-  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
+  TDEConfigSkeleton::ItemInt  *itemAge;
+  itemAge = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
   itemAge->setMinValue(8);
   itemAge->setMaxValue(88);
   addItem( itemAge, TQString::fromLatin1( "Age" ) );
diff --git a/tdecore/kconfig_compiler/tests/test7.h.ref b/tdecore/kconfig_compiler/tests/test7.h.ref
index 8f8808da1..fb6dd6c77 100644
--- a/tdecore/kconfig_compiler/tests/test7.h.ref
+++ b/tdecore/kconfig_compiler/tests/test7.h.ref
@@ -6,7 +6,7 @@
 #include <kconfigskeleton.h>
 #include <kdebug.h>
 
-class Test7 : public KConfigSkeleton
+class Test7 : public TDEConfigSkeleton
 {
   public:
 
diff --git a/tdecore/kconfig_compiler/tests/test8a.cpp.ref b/tdecore/kconfig_compiler/tests/test8a.cpp.ref
index 413e75c9c..c0267452d 100644
--- a/tdecore/kconfig_compiler/tests/test8a.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test8a.cpp.ref
@@ -4,15 +4,15 @@
 #include "test8a.h"
 
 Test8a::Test8a(  KSharedConfig::Ptr config  )
-  : KConfigSkeleton( config )
+  : TDEConfigSkeleton( config )
 {
   setCurrentGroup( TQString::fromLatin1( "Group" ) );
 
-  KConfigSkeleton::ItemFont  *itemFont;
-  itemFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Font" ), mFont, TDEGlobalSettings::generalFont() );
+  TDEConfigSkeleton::ItemFont  *itemFont;
+  itemFont = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Font" ), mFont, TDEGlobalSettings::generalFont() );
   addItem( itemFont, TQString::fromLatin1( "Font" ) );
-  KConfigSkeleton::ItemFont  *itemTitleFont;
-  itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TitleFont" ), mTitleFont, TDEGlobalSettings::windowTitleFont() );
+  TDEConfigSkeleton::ItemFont  *itemTitleFont;
+  itemTitleFont = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TitleFont" ), mTitleFont, TDEGlobalSettings::windowTitleFont() );
   addItem( itemTitleFont, TQString::fromLatin1( "TitleFont" ) );
 }
 
diff --git a/tdecore/kconfig_compiler/tests/test8a.h.ref b/tdecore/kconfig_compiler/tests/test8a.h.ref
index 0ab182a04..747c6dd58 100644
--- a/tdecore/kconfig_compiler/tests/test8a.h.ref
+++ b/tdecore/kconfig_compiler/tests/test8a.h.ref
@@ -7,7 +7,7 @@
 #include <kconfigskeleton.h>
 #include <kdebug.h>
 
-class Test8a : public KConfigSkeleton
+class Test8a : public TDEConfigSkeleton
 {
   public:
 
diff --git a/tdecore/kconfig_compiler/tests/test8b.cpp.ref b/tdecore/kconfig_compiler/tests/test8b.cpp.ref
index e29e3c4e7..6a0a16b48 100644
--- a/tdecore/kconfig_compiler/tests/test8b.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test8b.cpp.ref
@@ -24,17 +24,17 @@ Test8b::Test8b(  )
   mSelf = this;
   setCurrentGroup( TQString::fromLatin1( "Group8b1" ) );
 
-  KConfigSkeleton::ItemUInt  *itemSomething;
-  itemSomething = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Something" ), mSomething, 60 );
+  TDEConfigSkeleton::ItemUInt  *itemSomething;
+  itemSomething = new TDEConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Something" ), mSomething, 60 );
   addItem( itemSomething, TQString::fromLatin1( "Something" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Group8b2" ) );
 
-  KConfigSkeleton::ItemBool  *itemFooBoo;
-  itemFooBoo = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "FooBoo" ), mFooBoo, false );
+  TDEConfigSkeleton::ItemBool  *itemFooBoo;
+  itemFooBoo = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "FooBoo" ), mFooBoo, false );
   addItem( itemFooBoo, TQString::fromLatin1( "FooBoo" ) );
-  KConfigSkeleton::ItemUInt  *itemPort;
-  itemPort = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Port" ), mPort, 1000 );
+  TDEConfigSkeleton::ItemUInt  *itemPort;
+  itemPort = new TDEConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Port" ), mPort, 1000 );
   addItem( itemPort, TQString::fromLatin1( "Port" ) );
 }
 
diff --git a/tdecore/kconfig_compiler/tests/test8b.h.ref b/tdecore/kconfig_compiler/tests/test8b.h.ref
index 4ca0d5c7f..052746bfb 100644
--- a/tdecore/kconfig_compiler/tests/test8b.h.ref
+++ b/tdecore/kconfig_compiler/tests/test8b.h.ref
@@ -75,7 +75,7 @@ class Test8b : public Test8a
     static
     void writeConfig()
     {
-      static_cast<KConfigSkeleton*>(self())->writeConfig();
+      static_cast<TDEConfigSkeleton*>(self())->writeConfig();
     }
   protected:
     Test8b();
diff --git a/tdecore/kconfig_compiler/tests/test9.cpp.ref b/tdecore/kconfig_compiler/tests/test9.cpp.ref
index c5d57e4d1..f6765fb42 100644
--- a/tdecore/kconfig_compiler/tests/test9.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test9.cpp.ref
@@ -4,7 +4,7 @@
 #include "test9.h"
 
 Test9::Test9(  const TQString & transport, const TQString & folder )
-  : KConfigSkeleton( TQString::fromLatin1( "examplerc" ) )
+  : TDEConfigSkeleton( TQString::fromLatin1( "examplerc" ) )
   , mParamtransport(transport)
   , mParamfolder(folder)
 {
@@ -14,18 +14,18 @@ Test9::Test9(  const TQString & transport, const TQString & folder )
   defaultMyStringList.append( TQString::fromUtf8( "up" ) );
   defaultMyStringList.append( TQString::fromUtf8( "down" ) );
 
-  KConfigSkeleton::ItemStringList  *itemMyStringList;
-  itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
+  TDEConfigSkeleton::ItemStringList  *itemMyStringList;
+  itemMyStringList = new TDEConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
   addItem( itemMyStringList, TQString::fromLatin1( "MyStringList" ) );
   TQStringList defaultMyPathList;
   defaultMyPathList.append( TQString::fromUtf8( "/home" ) );
   defaultMyPathList.append( TQString::fromUtf8( "~" ) );
 
-  KConfigSkeleton::ItemPathList  *itemMyPathList;
-  itemMyPathList = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathList" ), mMyPathList, defaultMyPathList );
+  TDEConfigSkeleton::ItemPathList  *itemMyPathList;
+  itemMyPathList = new TDEConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathList" ), mMyPathList, defaultMyPathList );
   addItem( itemMyPathList, TQString::fromLatin1( "MyPathList" ) );
-  KConfigSkeleton::ItemPathList  *itemMyPathsList2;
-  itemMyPathsList2 = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathsList2" ), mMyPathsList2, TQStringList(TQString::fromLatin1("/usr/bin")) += TQDir::homeDirPath() );
+  TDEConfigSkeleton::ItemPathList  *itemMyPathsList2;
+  itemMyPathsList2 = new TDEConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathsList2" ), mMyPathsList2, TQStringList(TQString::fromLatin1("/usr/bin")) += TQDir::homeDirPath() );
   addItem( itemMyPathsList2, TQString::fromLatin1( "MyPathsList2" ) );
 }
 
diff --git a/tdecore/kconfig_compiler/tests/test9.h.ref b/tdecore/kconfig_compiler/tests/test9.h.ref
index 66a629b48..99d94c957 100644
--- a/tdecore/kconfig_compiler/tests/test9.h.ref
+++ b/tdecore/kconfig_compiler/tests/test9.h.ref
@@ -7,7 +7,7 @@
 #include <kdebug.h>
 
 #include <tqdir.h>
-class Test9 : public KConfigSkeleton
+class Test9 : public TDEConfigSkeleton
 {
   public:
 
diff --git a/tdecore/kconfig_compiler/tests/test9.kcfgc b/tdecore/kconfig_compiler/tests/test9.kcfgc
index 8f124fc25..0a88064b6 100644
--- a/tdecore/kconfig_compiler/tests/test9.kcfgc
+++ b/tdecore/kconfig_compiler/tests/test9.kcfgc
@@ -3,7 +3,7 @@ ClassName=Test9
 #
 # Singleton=false
 #
-# Inherits=KConfigSkeleton
+# Inherits=TDEConfigSkeleton
 #
 # IncludeFiles=libtdepim/kpimprefs.h
 #
diff --git a/tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref b/tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref
index 7b5f55f03..3aad5b689 100644
--- a/tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref
@@ -33,17 +33,17 @@ class TestDPointerPrivate
     TQFont timeBarFont;
 
     // items
-    KConfigSkeleton::ItemBool *autoSaveItem;
-    KConfigSkeleton::ItemInt *autoSaveIntervalItem;
-    KConfigSkeleton::ItemBool *confirmItem;
-    KConfigSkeleton::ItemString *archiveFileItem;
-    KConfigSkeleton::ItemEnum *destinationItem;
-    KConfigSkeleton::ItemInt *hourSizeItem;
-    KConfigSkeleton::ItemBool *selectionStartsEditorItem;
-    KConfigSkeleton::ItemStringList *selectedPluginsItem;
-    KConfigSkeleton::ItemColor *highlightColorItem;
-    KConfigSkeleton::ItemColor *agendaBgColorItem;
-    KConfigSkeleton::ItemFont *timeBarFontItem;
+    TDEConfigSkeleton::ItemBool *autoSaveItem;
+    TDEConfigSkeleton::ItemInt *autoSaveIntervalItem;
+    TDEConfigSkeleton::ItemBool *confirmItem;
+    TDEConfigSkeleton::ItemString *archiveFileItem;
+    TDEConfigSkeleton::ItemEnum *destinationItem;
+    TDEConfigSkeleton::ItemInt *hourSizeItem;
+    TDEConfigSkeleton::ItemBool *selectionStartsEditorItem;
+    TDEConfigSkeleton::ItemStringList *selectedPluginsItem;
+    TDEConfigSkeleton::ItemColor *highlightColorItem;
+    TDEConfigSkeleton::ItemColor *agendaBgColorItem;
+    TDEConfigSkeleton::ItemFont *timeBarFontItem;
 };
 
 TestDPointer *TestDPointer::mSelf = 0;
@@ -60,65 +60,65 @@ TestDPointer *TestDPointer::self()
 }
 
 TestDPointer::TestDPointer(  )
-  : KConfigSkeleton( TQString::fromLatin1( "korganizerrc" ) )
+  : TDEConfigSkeleton( TQString::fromLatin1( "korganizerrc" ) )
 {
   d = new TestDPointerPrivate;
   mSelf = this;
   setCurrentGroup( TQString::fromLatin1( "General" ) );
 
-  d->autoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), d->autoSave, false );
+  d->autoSaveItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), d->autoSave, false );
   d->autoSaveItem->setLabel( i18n("Enable automatic saving of calendar") );
   d->autoSaveItem->setWhatsThis( i18n("WhatsThis text for AutoSave option") );
   addItem( d->autoSaveItem, TQString::fromLatin1( "AutoSave" ) );
-  d->autoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), d->autoSaveInterval, 10 );
+  d->autoSaveIntervalItem = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), d->autoSaveInterval, 10 );
   d->autoSaveIntervalItem->setLabel( i18n("Auto Save Interval") );
   addItem( d->autoSaveIntervalItem, TQString::fromLatin1( "AutoSaveInterval" ) );
-  d->confirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), d->confirm, true );
+  d->confirmItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), d->confirm, true );
   d->confirmItem->setLabel( i18n("Confirm deletes") );
   addItem( d->confirmItem, TQString::fromLatin1( "Confirm" ) );
-  d->archiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), d->archiveFile );
+  d->archiveFileItem = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), d->archiveFile );
   d->archiveFileItem->setLabel( i18n("Archive File") );
   addItem( d->archiveFileItem, TQString::fromLatin1( "ArchiveFile" ) );
-  TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesDestination;
+  TQValueList<TDEConfigSkeleton::ItemEnum::Choice> valuesDestination;
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "standardDestination" );
     valuesDestination.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "askDestination" );
     valuesDestination.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "argl1" );
     choice.label = i18n("Argl1 Label");
     valuesDestination.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "argl2" );
     choice.whatsThis = i18n("Argl2 Whatsthis");
     valuesDestination.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "argl3" );
     choice.label = i18n("Argl3 Label");
     choice.whatsThis = i18n("Argl3 Whatsthis");
     valuesDestination.append( choice );
   }
-  d->destinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), d->destination, valuesDestination, EnumDestination::standardDestination );
+  d->destinationItem = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), d->destination, valuesDestination, EnumDestination::standardDestination );
   d->destinationItem->setLabel( i18n("New Events/Todos Should") );
   addItem( d->destinationItem, TQString::fromLatin1( "Destination" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Views" ) );
 
-  d->hourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), d->hourSize, 10 );
+  d->hourSizeItem = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), d->hourSize, 10 );
   d->hourSizeItem->setLabel( i18n("Hour Size") );
   addItem( d->hourSizeItem, TQString::fromLatin1( "HourSize" ) );
-  d->selectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), d->selectionStartsEditor, false );
+  d->selectionStartsEditorItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), d->selectionStartsEditor, false );
   d->selectionStartsEditorItem->setLabel( i18n("Time range selection in agenda view starts event editor") );
   addItem( d->selectionStartsEditorItem, TQString::fromLatin1( "SelectionStartsEditor" ) );
 
@@ -128,22 +128,22 @@ TestDPointer::TestDPointer(  )
   defaultSelectedPlugins.append( TQString::fromUtf8( "holidays" ) );
   defaultSelectedPlugins.append( TQString::fromUtf8( "webexport" ) );
 
-  d->selectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), d->selectedPlugins, defaultSelectedPlugins );
+  d->selectedPluginsItem = new TDEConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), d->selectedPlugins, defaultSelectedPlugins );
   d->selectedPluginsItem->setLabel( i18n("SelectedPlugins") );
   addItem( d->selectedPluginsItem, TQString::fromLatin1( "SelectedPlugins" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Colors" ) );
 
-  d->highlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), d->highlightColor, TQColor( 100, 100, 255 ) );
+  d->highlightColorItem = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), d->highlightColor, TQColor( 100, 100, 255 ) );
   d->highlightColorItem->setLabel( i18n("Highlight color") );
   addItem( d->highlightColorItem, TQString::fromLatin1( "HighlightColor" ) );
-  d->agendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), d->agendaBgColor, TQColor( 255, 255, 255 ) );
+  d->agendaBgColorItem = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), d->agendaBgColor, TQColor( 255, 255, 255 ) );
   d->agendaBgColorItem->setLabel( i18n("Agenda view background color") );
   addItem( d->agendaBgColorItem, TQString::fromLatin1( "AgendaBgColor" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Fonts" ) );
 
-  d->timeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), d->timeBarFont );
+  d->timeBarFontItem = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), d->timeBarFont );
   d->timeBarFontItem->setLabel( i18n("Time bar") );
   addItem( d->timeBarFontItem, TQString::fromLatin1( "TimeBarFont" ) );
 }
@@ -160,7 +160,7 @@ bool TestDPointer::autoSave()
 }
 
 
-KConfigSkeleton::ItemBool *TestDPointer::autoSaveItem()
+TDEConfigSkeleton::ItemBool *TestDPointer::autoSaveItem()
 {
   return d->autoSaveItem;
 }
@@ -177,7 +177,7 @@ int TestDPointer::autoSaveInterval()
 }
 
 
-KConfigSkeleton::ItemInt *TestDPointer::autoSaveIntervalItem()
+TDEConfigSkeleton::ItemInt *TestDPointer::autoSaveIntervalItem()
 {
   return d->autoSaveIntervalItem;
 }
@@ -194,7 +194,7 @@ bool TestDPointer::confirm()
 }
 
 
-KConfigSkeleton::ItemBool *TestDPointer::confirmItem()
+TDEConfigSkeleton::ItemBool *TestDPointer::confirmItem()
 {
   return d->confirmItem;
 }
@@ -211,7 +211,7 @@ TQString TestDPointer::archiveFile()
 }
 
 
-KConfigSkeleton::ItemString *TestDPointer::archiveFileItem()
+TDEConfigSkeleton::ItemString *TestDPointer::archiveFileItem()
 {
   return d->archiveFileItem;
 }
@@ -228,7 +228,7 @@ int TestDPointer::destination()
 }
 
 
-KConfigSkeleton::ItemEnum *TestDPointer::destinationItem()
+TDEConfigSkeleton::ItemEnum *TestDPointer::destinationItem()
 {
   return d->destinationItem;
 }
@@ -245,7 +245,7 @@ int TestDPointer::hourSize()
 }
 
 
-KConfigSkeleton::ItemInt *TestDPointer::hourSizeItem()
+TDEConfigSkeleton::ItemInt *TestDPointer::hourSizeItem()
 {
   return d->hourSizeItem;
 }
@@ -262,7 +262,7 @@ bool TestDPointer::selectionStartsEditor()
 }
 
 
-KConfigSkeleton::ItemBool *TestDPointer::selectionStartsEditorItem()
+TDEConfigSkeleton::ItemBool *TestDPointer::selectionStartsEditorItem()
 {
   return d->selectionStartsEditorItem;
 }
@@ -279,7 +279,7 @@ TQStringList TestDPointer::selectedPlugins()
 }
 
 
-KConfigSkeleton::ItemStringList *TestDPointer::selectedPluginsItem()
+TDEConfigSkeleton::ItemStringList *TestDPointer::selectedPluginsItem()
 {
   return d->selectedPluginsItem;
 }
@@ -296,7 +296,7 @@ TQColor TestDPointer::highlightColor()
 }
 
 
-KConfigSkeleton::ItemColor *TestDPointer::highlightColorItem()
+TDEConfigSkeleton::ItemColor *TestDPointer::highlightColorItem()
 {
   return d->highlightColorItem;
 }
@@ -313,7 +313,7 @@ TQColor TestDPointer::agendaBgColor()
 }
 
 
-KConfigSkeleton::ItemColor *TestDPointer::agendaBgColorItem()
+TDEConfigSkeleton::ItemColor *TestDPointer::agendaBgColorItem()
 {
   return d->agendaBgColorItem;
 }
@@ -330,7 +330,7 @@ TQFont TestDPointer::timeBarFont()
 }
 
 
-KConfigSkeleton::ItemFont *TestDPointer::timeBarFontItem()
+TDEConfigSkeleton::ItemFont *TestDPointer::timeBarFontItem()
 {
   return d->timeBarFontItem;
 }
diff --git a/tdecore/kconfig_compiler/tests/test_dpointer.h.ref b/tdecore/kconfig_compiler/tests/test_dpointer.h.ref
index 81f281e83..d9b7b94c1 100644
--- a/tdecore/kconfig_compiler/tests/test_dpointer.h.ref
+++ b/tdecore/kconfig_compiler/tests/test_dpointer.h.ref
@@ -8,7 +8,7 @@
 
 class TestDPointerPrivate;
 
-class TestDPointer : public KConfigSkeleton
+class TestDPointer : public TDEConfigSkeleton
 {
   public:
     class EnumDestination
@@ -210,7 +210,7 @@ class TestDPointer : public KConfigSkeleton
     static
     void writeConfig()
     {
-      static_cast<KConfigSkeleton*>(self())->writeConfig();
+      static_cast<TDEConfigSkeleton*>(self())->writeConfig();
     }
   protected:
     TestDPointer();
diff --git a/tdecore/kconfigbackend.cpp b/tdecore/kconfigbackend.cpp
index 4f217597b..178198509 100644
--- a/tdecore/kconfigbackend.cpp
+++ b/tdecore/kconfigbackend.cpp
@@ -231,7 +231,7 @@ static TQCString decodeKey(const char* key)
     return newKey;
 }
 
-class KConfigBackEnd::KConfigBackEndPrivate
+class TDEConfigBackEnd::TDEConfigBackEndPrivate
 {
 public:
    TQDateTime localLastModified;
@@ -240,7 +240,7 @@ public:
    KLockFile::Ptr globalLockFile;
 };
 
-void KConfigBackEnd::changeFileName(const TQString &_fileName,
+void TDEConfigBackEnd::changeFileName(const TQString &_fileName,
                                     const char * _resType,
                                     bool _useKDEGlobals)
 {
@@ -270,7 +270,7 @@ void KConfigBackEnd::changeFileName(const TQString &_fileName,
    d->globalLockFile = 0;
 }
 
-KLockFile::Ptr KConfigBackEnd::lockFile(bool bGlobal)
+KLockFile::Ptr TDEConfigBackEnd::lockFile(bool bGlobal)
 {
    if (bGlobal)
    {
@@ -297,35 +297,35 @@ KLockFile::Ptr KConfigBackEnd::lockFile(bool bGlobal)
    return 0;
 }
 
-KConfigBackEnd::KConfigBackEnd(KConfigBase *_config,
+TDEConfigBackEnd::TDEConfigBackEnd(TDEConfigBase *_config,
 			       const TQString &_fileName,
 			       const char * _resType,
 			       bool _useKDEGlobals)
-  : pConfig(_config), bFileImmutable(false), mConfigState(KConfigBase::NoAccess), mFileMode(-1)
+  : pConfig(_config), bFileImmutable(false), mConfigState(TDEConfigBase::NoAccess), mFileMode(-1)
 {
-   d = new KConfigBackEndPrivate;
+   d = new TDEConfigBackEndPrivate;
    changeFileName(_fileName, _resType, _useKDEGlobals);
 }
 
-KConfigBackEnd::~KConfigBackEnd()
+TDEConfigBackEnd::~TDEConfigBackEnd()
 {
    delete d;
 }
 
-void KConfigBackEnd::setFileWriteMode(int mode)
+void TDEConfigBackEnd::setFileWriteMode(int mode)
 {
   mFileMode = mode;
 }
 
-bool KConfigINIBackEnd::parseConfigFiles()
+bool TDEConfigINIBackEnd::parseConfigFiles()
 {
   // Check if we can write to the local file.
-  mConfigState = KConfigBase::ReadOnly;
+  mConfigState = TDEConfigBase::ReadOnly;
   if (!mLocalFileName.isEmpty() && !pConfig->isReadOnly())
   {
      if (checkAccess(mLocalFileName, W_OK))
      {
-        mConfigState = KConfigBase::ReadWrite;
+        mConfigState = TDEConfigBase::ReadWrite;
      }
      else
      {
@@ -337,7 +337,7 @@ bool KConfigINIBackEnd::parseConfigFiles()
 
         if (checkAccess(mLocalFileName, W_OK))
         {
-           mConfigState = KConfigBase::ReadWrite;
+           mConfigState = TDEConfigBase::ReadWrite;
         }
      }
      TQFileInfo info(mLocalFileName);
@@ -426,7 +426,7 @@ bool KConfigINIBackEnd::parseConfigFiles()
     }
   }
   if (bFileImmutable)
-     mConfigState = KConfigBase::ReadOnly;
+     mConfigState = TDEConfigBase::ReadOnly;
 
   return true;
 }
@@ -447,7 +447,7 @@ extern "C" {
 
 extern bool kde_kiosk_exception;
 
-void KConfigINIBackEnd::parseSingleConfigFile(TQFile &rFile,
+void TDEConfigINIBackEnd::parseSingleConfigFile(TQFile &rFile,
 					      KEntryMap *pWriteBackMap,
 					      bool bGlobal, bool bDefault)
 {
@@ -732,11 +732,11 @@ tqWarning("SIGBUS while reading %s", rFile.name().latin1());
    }
    // Look up translations using KLocale
    // https://launchpad.net/distros/ubuntu/+spec/langpacks-desktopfiles-kde
-   // This calls KLocale up to 10 times for each config file (and each KConfig has up to 4 files)
+   // This calls KLocale up to 10 times for each config file (and each TDEConfig has up to 4 files)
    // so I'll see how much of a performance hit it is
    // it also only acts on the last group in a file
    // Ideas: only translate most important fields, only translate "Desktop Entry" files,
-   //        do translation per KConfig not per single file
+   //        do translation per TDEConfig not per single file
    if (!pWriteBackMap) {
      TQFile file("file.txt");
      if (foundGettextDomain) {
@@ -772,7 +772,7 @@ tqWarning("SIGBUS while reading %s", rFile.name().latin1());
 #endif
 }
 
-void KConfigINIBackEnd::translateKey(KLocale& locale, TQCString currentGroup, TQCString key) {
+void TDEConfigINIBackEnd::translateKey(KLocale& locale, TQCString currentGroup, TQCString key) {
   KEntryKey entryKey = KEntryKey(currentGroup, key);
   KEntry entry = pConfig->lookupData(entryKey);
   if (TQString(entry.mValue) != "") {
@@ -788,7 +788,7 @@ void KConfigINIBackEnd::translateKey(KLocale& locale, TQCString currentGroup, TQ
   }
 }
 
-void KConfigINIBackEnd::sync(bool bMerge)
+void TDEConfigINIBackEnd::sync(bool bMerge)
 {
   // write-sync is only necessary if there are dirty entries
   if (!pConfig->isDirty())
@@ -978,7 +978,7 @@ static void writeEntries(FILE *pStream, const KEntryMap& entryMap, bool defaultG
   } // for loop
 }
 
-bool KConfigINIBackEnd::getEntryMap(KEntryMap &aTempMap, bool bGlobal,
+bool TDEConfigINIBackEnd::getEntryMap(KEntryMap &aTempMap, bool bGlobal,
                                     TQFile *mergeFile)
 {
   bool bEntriesLeft = false;
@@ -1032,7 +1032,7 @@ bool KConfigINIBackEnd::getEntryMap(KEntryMap &aTempMap, bool bGlobal,
 }
 
 /* antlarr: KDE 4.0:  make the first parameter "const TQString &" */
-bool KConfigINIBackEnd::writeConfigFile(TQString filename, bool bGlobal,
+bool TDEConfigINIBackEnd::writeConfigFile(TQString filename, bool bGlobal,
 					bool bMerge)
 {
   // is the config object read-only?
@@ -1135,7 +1135,7 @@ bool KConfigINIBackEnd::writeConfigFile(TQString filename, bool bGlobal,
   return bEntriesLeft;
 }
 
-void KConfigINIBackEnd::writeEntries(FILE *pStream, const KEntryMap &aTempMap)
+void TDEConfigINIBackEnd::writeEntries(FILE *pStream, const KEntryMap &aTempMap)
 {
   bool firstEntry = true;
 
@@ -1146,13 +1146,13 @@ void KConfigINIBackEnd::writeEntries(FILE *pStream, const KEntryMap &aTempMap)
   ::writeEntries(pStream, aTempMap, false, firstEntry, localeString);
 }
 
-void KConfigBackEnd::virtual_hook( int, void* )
+void TDEConfigBackEnd::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-void KConfigINIBackEnd::virtual_hook( int id, void* data )
-{ KConfigBackEnd::virtual_hook( id, data ); }
+void TDEConfigINIBackEnd::virtual_hook( int id, void* data )
+{ TDEConfigBackEnd::virtual_hook( id, data ); }
 
-bool KConfigBackEnd::checkConfigFilesWritable(bool warnUser)
+bool TDEConfigBackEnd::checkConfigFilesWritable(bool warnUser)
 {
   // WARNING: Do NOT use the event loop as it may not exist at this time.
   bool allWritable = true;
diff --git a/tdecore/kconfigbackend.h b/tdecore/kconfigbackend.h
index 03655ab2d..87ddfa3bb 100644
--- a/tdecore/kconfigbackend.h
+++ b/tdecore/kconfigbackend.h
@@ -29,7 +29,7 @@
 #include "tdelibs_export.h"
 
 class TQFile;
-class KConfigBackEndPrivate;
+class TDEConfigBackEndPrivate;
 
 /**
  * Abstract base class for KDE configuration file loading/saving.
@@ -45,9 +45,9 @@ class KConfigBackEndPrivate;
  *         Matthias Kalle Dalheimer <kalle@kde.org>
  * @short KDE Configuration file loading/saving abstract base class
  */
-class TDECORE_EXPORT KConfigBackEnd
+class TDECORE_EXPORT TDEConfigBackEnd
 {
-  friend class KConfig;
+  friend class TDEConfig;
   friend class KSharedConfig;
 public:
   /**
@@ -65,13 +65,13 @@ public:
    *        will be imported into the config object.  If false, only
    *        the filename specified will be dealt with.
    */
-  KConfigBackEnd(KConfigBase *_config, const TQString &_fileName,
+  TDEConfigBackEnd(TDEConfigBase *_config, const TQString &_fileName,
 		 const char * _resType, bool _useKDEGlobals);
 
   /**
    * Destructs the configuration backend.
    */
-  virtual ~KConfigBackEnd();
+  virtual ~TDEConfigBackEnd();
 
   /**
    * Parses all configuration files for a configuration object.  This
@@ -108,9 +108,9 @@ public:
   /**
    * Returns the state of the app-config object.
    *
-   * @see KConfig::getConfigState
+   * @see TDEConfig::getConfigState
    */
-  virtual KConfigBase::ConfigState getConfigState() const
+  virtual TDEConfigBase::ConfigState getConfigState() const
     { return mConfigState; }
 
   /**
@@ -162,7 +162,7 @@ private:
   KDE_DEPRECATED TQString filename() const { return mfileName; }
 
 protected:
-  KConfigBase *pConfig;
+  TDEConfigBase *pConfig;
 
   TQString mfileName;
   TQCString resType;
@@ -171,14 +171,14 @@ protected:
   TQCString localeString;
   TQString mLocalFileName;
   TQString mGlobalFileName;
-  KConfigBase::ConfigState mConfigState;
+  TDEConfigBase::ConfigState mConfigState;
   int mFileMode;
 
 protected:
   virtual void virtual_hook( int id, void* data );
 protected:
-  class KConfigBackEndPrivate;
-  KConfigBackEndPrivate *d;
+  class TDEConfigBackEndPrivate;
+  TDEConfigBackEndPrivate *d;
 };
 
 
@@ -188,7 +188,7 @@ protected:
  * @author Preston Brown <pbrown@kde.org>,
  *         Matthias Kalle Dalheimer <kalle@kde.org>
  */
-class TDECORE_EXPORT KConfigINIBackEnd : public KConfigBackEnd
+class TDECORE_EXPORT TDEConfigINIBackEnd : public TDEConfigBackEnd
 {
 
 public:
@@ -207,14 +207,14 @@ public:
    *        will be imported into the config object.  If false, only
    *        the filename specified will be dealt with.
    */
-  KConfigINIBackEnd(KConfigBase *_config, const TQString &_fileName,
+  TDEConfigINIBackEnd(TDEConfigBase *_config, const TQString &_fileName,
 		    const char * _resType, bool _useKDEGlobals = true)
-    : KConfigBackEnd(_config, _fileName, _resType, _useKDEGlobals) {}
+    : TDEConfigBackEnd(_config, _fileName, _resType, _useKDEGlobals) {}
 
   /**
    * Destructs the configuration backend.
    */
-  virtual ~KConfigINIBackEnd() {}
+  virtual ~TDEConfigINIBackEnd() {}
 
   /**
    * Parses all INI-style configuration files for a config object.
@@ -292,8 +292,8 @@ protected:
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  class KConfigINIBackEndPrivate;
-  KConfigINIBackEndPrivate *not_d;
+  class TDEConfigINIBackEndPrivate;
+  TDEConfigINIBackEndPrivate *not_d;
 };
 
 #endif
diff --git a/tdecore/kconfigbase.cpp b/tdecore/kconfigbase.cpp
index e13d07782..e65338c50 100644
--- a/tdecore/kconfigbase.cpp
+++ b/tdecore/kconfigbase.cpp
@@ -38,28 +38,28 @@
 #include "kstandarddirs.h"
 #include "kstringhandler.h"
 
-class KConfigBase::KConfigBasePrivate
+class TDEConfigBase::TDEConfigBasePrivate
 {
 public:
-     KConfigBasePrivate() : readDefaults(false) { };
+     TDEConfigBasePrivate() : readDefaults(false) { };
 
 public:
      bool readDefaults;
 };
 
-KConfigBase::KConfigBase()
+TDEConfigBase::TDEConfigBase()
   : backEnd(0L), bDirty(false), bLocaleInitialized(false),
     bReadOnly(false), bExpand(false), d(0)
 {
     setGroup(TQString::null);
 }
 
-KConfigBase::~KConfigBase()
+TDEConfigBase::~TDEConfigBase()
 {
     delete d;
 }
 
-void KConfigBase::setLocale()
+void TDEConfigBase::setLocale()
 {
   bLocaleInitialized = true;
 
@@ -71,12 +71,12 @@ void KConfigBase::setLocale()
      backEnd->setLocaleString(aLocaleString);
 }
 
-TQString KConfigBase::locale() const
+TQString TDEConfigBase::locale() const
 {
   return TQString::fromUtf8(aLocaleString);
 }
 
-void KConfigBase::setGroup( const TQString& group )
+void TDEConfigBase::setGroup( const TQString& group )
 {
   if ( group.isEmpty() )
     mGroup = "<default>";
@@ -84,12 +84,12 @@ void KConfigBase::setGroup( const TQString& group )
     mGroup = group.utf8();
 }
 
-void KConfigBase::setGroup( const char *pGroup )
+void TDEConfigBase::setGroup( const char *pGroup )
 {
   setGroup(TQCString(pGroup));
 }
 
-void KConfigBase::setGroup( const TQCString &group )
+void TDEConfigBase::setGroup( const TQCString &group )
 {
   if ( group.isEmpty() )
     mGroup = "<default>";
@@ -97,21 +97,21 @@ void KConfigBase::setGroup( const TQCString &group )
     mGroup = group;
 }
 
-TQString KConfigBase::group() const {
+TQString TDEConfigBase::group() const {
   return TQString::fromUtf8(mGroup);
 }
 
-void KConfigBase::setDesktopGroup()
+void TDEConfigBase::setDesktopGroup()
 {
   mGroup = "Desktop Entry";
 }
 
-bool KConfigBase::hasKey(const TQString &key) const
+bool TDEConfigBase::hasKey(const TQString &key) const
 {
    return hasKey(key.utf8().data());
 }
 
-bool KConfigBase::hasKey(const char *pKey) const
+bool TDEConfigBase::hasKey(const char *pKey) const
 {
   KEntryKey aEntryKey(mGroup, 0);
   aEntryKey.c_key = pKey;
@@ -131,7 +131,7 @@ bool KConfigBase::hasKey(const char *pKey) const
   return !entry.mValue.isNull();
 }
 
-bool KConfigBase::hasTranslatedKey(const char* pKey) const
+bool TDEConfigBase::hasTranslatedKey(const char* pKey) const
 {
   KEntryKey aEntryKey(mGroup, 0);
   aEntryKey.c_key = pKey;
@@ -149,27 +149,27 @@ bool KConfigBase::hasTranslatedKey(const char* pKey) const
   return false;
 }
 
-bool KConfigBase::hasGroup(const TQString &group) const
+bool TDEConfigBase::hasGroup(const TQString &group) const
 {
   return internalHasGroup( group.utf8());
 }
 
-bool KConfigBase::hasGroup(const char *_pGroup) const
+bool TDEConfigBase::hasGroup(const char *_pGroup) const
 {
   return internalHasGroup( TQCString(_pGroup));
 }
 
-bool KConfigBase::hasGroup(const TQCString &_pGroup) const
+bool TDEConfigBase::hasGroup(const TQCString &_pGroup) const
 {
   return internalHasGroup( _pGroup);
 }
 
-bool KConfigBase::isImmutable() const
+bool TDEConfigBase::isImmutable() const
 {
   return (getConfigState() != ReadWrite);
 }
 
-bool KConfigBase::groupIsImmutable(const TQString &group) const
+bool TDEConfigBase::groupIsImmutable(const TQString &group) const
 {
   if (getConfigState() != ReadWrite)
      return true;
@@ -179,7 +179,7 @@ bool KConfigBase::groupIsImmutable(const TQString &group) const
   return entry.bImmutable;
 }
 
-bool KConfigBase::entryIsImmutable(const TQString &key) const
+bool TDEConfigBase::entryIsImmutable(const TQString &key) const
 {
   if (getConfigState() != ReadWrite)
      return true;
@@ -201,14 +201,14 @@ bool KConfigBase::entryIsImmutable(const TQString &key) const
 }
 
 
-TQString KConfigBase::readEntryUntranslated( const TQString& pKey,
+TQString TDEConfigBase::readEntryUntranslated( const TQString& pKey,
                                 const TQString& aDefault ) const
 {
-   return KConfigBase::readEntryUntranslated(pKey.utf8().data(), aDefault);
+   return TDEConfigBase::readEntryUntranslated(pKey.utf8().data(), aDefault);
 }
 
 
-TQString KConfigBase::readEntryUntranslated( const char *pKey,
+TQString TDEConfigBase::readEntryUntranslated( const char *pKey,
                                 const TQString& aDefault ) const
 {
    TQCString result = readEntryUtf8(pKey);
@@ -218,22 +218,22 @@ TQString KConfigBase::readEntryUntranslated( const char *pKey,
 }
 
 
-TQString KConfigBase::readEntry( const TQString& pKey,
+TQString TDEConfigBase::readEntry( const TQString& pKey,
                                 const TQString& aDefault ) const
 {
-   return KConfigBase::readEntry(pKey.utf8().data(), aDefault);
+   return TDEConfigBase::readEntry(pKey.utf8().data(), aDefault);
 }
 
-TQString KConfigBase::readEntry( const char *pKey,
+TQString TDEConfigBase::readEntry( const char *pKey,
                                 const TQString& aDefault ) const
 {
   // we need to access _locale instead of the method locale()
   // because calling locale() will create a locale object if it
-  // doesn't exist, which requires KConfig, which will create a infinite
+  // doesn't exist, which requires TDEConfig, which will create a infinite
   // loop, and nobody likes those.
   if (!bLocaleInitialized && TDEGlobal::_locale) {
     // get around const'ness.
-    KConfigBase *that = const_cast<KConfigBase *>(this);
+    TDEConfigBase *that = const_cast<TDEConfigBase *>(this);
     that->setLocale();
   }
 
@@ -335,7 +335,7 @@ TQString KConfigBase::readEntry( const char *pKey,
   return aValue;
 }
 
-TQCString KConfigBase::readEntryUtf8( const char *pKey) const
+TQCString TDEConfigBase::readEntryUtf8( const char *pKey) const
 {
   // We don't try the localized key
   KEntryKey entryKey(mGroup, 0);
@@ -350,13 +350,13 @@ TQCString KConfigBase::readEntryUtf8( const char *pKey) const
   return aEntryData.mValue;
 }
 
-TQVariant KConfigBase::readPropertyEntry( const TQString& pKey,
+TQVariant TDEConfigBase::readPropertyEntry( const TQString& pKey,
                                           TQVariant::Type type ) const
 {
   return readPropertyEntry(pKey.utf8().data(), type);
 }
 
-TQVariant KConfigBase::readPropertyEntry( const char *pKey,
+TQVariant TDEConfigBase::readPropertyEntry( const char *pKey,
                                           TQVariant::Type type ) const
 {
   TQVariant va;
@@ -365,13 +365,13 @@ TQVariant KConfigBase::readPropertyEntry( const char *pKey,
   return readPropertyEntry(pKey, va);
 }
 
-TQVariant KConfigBase::readPropertyEntry( const TQString& pKey,
+TQVariant TDEConfigBase::readPropertyEntry( const TQString& pKey,
                                          const TQVariant &aDefault ) const
 {
   return readPropertyEntry(pKey.utf8().data(), aDefault);
 }
 
-TQVariant KConfigBase::readPropertyEntry( const char *pKey,
+TQVariant TDEConfigBase::readPropertyEntry( const char *pKey,
                                          const TQVariant &aDefault ) const
 {
   if ( !hasKey( pKey ) ) return aDefault;
@@ -474,13 +474,13 @@ TQVariant KConfigBase::readPropertyEntry( const char *pKey,
   return TQVariant();
 }
 
-int KConfigBase::readListEntry( const TQString& pKey,
+int TDEConfigBase::readListEntry( const TQString& pKey,
                                 TQStrList &list, char sep ) const
 {
   return readListEntry(pKey.utf8().data(), list, sep);
 }
 
-int KConfigBase::readListEntry( const char *pKey,
+int TDEConfigBase::readListEntry( const char *pKey,
                                 TQStrList &list, char sep ) const
 {
   if( !hasKey( pKey ) )
@@ -519,12 +519,12 @@ int KConfigBase::readListEntry( const char *pKey,
   return list.count();
 }
 
-TQStringList KConfigBase::readListEntry( const TQString& pKey, char sep ) const
+TQStringList TDEConfigBase::readListEntry( const TQString& pKey, char sep ) const
 {
   return readListEntry(pKey.utf8().data(), sep);
 }
 
-TQStringList KConfigBase::readListEntry( const char *pKey, char sep ) const
+TQStringList TDEConfigBase::readListEntry( const char *pKey, char sep ) const
 {
   static const TQString& emptyString = TDEGlobal::staticQString("");
 
@@ -565,7 +565,7 @@ TQStringList KConfigBase::readListEntry( const char *pKey, char sep ) const
   return list;
 }
 
-TQStringList KConfigBase::readListEntry( const char* pKey, const TQStringList& aDefault,
+TQStringList TDEConfigBase::readListEntry( const char* pKey, const TQStringList& aDefault,
 		char sep ) const
 {
 	if ( !hasKey( pKey ) )
@@ -574,12 +574,12 @@ TQStringList KConfigBase::readListEntry( const char* pKey, const TQStringList& a
 		return readListEntry( pKey, sep );
 }
 
-TQValueList<int> KConfigBase::readIntListEntry( const TQString& pKey ) const
+TQValueList<int> TDEConfigBase::readIntListEntry( const TQString& pKey ) const
 {
   return readIntListEntry(pKey.utf8().data());
 }
 
-TQValueList<int> KConfigBase::readIntListEntry( const char *pKey ) const
+TQValueList<int> TDEConfigBase::readIntListEntry( const char *pKey ) const
 {
   TQStringList strlist = readListEntry(pKey);
   TQValueList<int> list;
@@ -592,12 +592,12 @@ TQValueList<int> KConfigBase::readIntListEntry( const char *pKey ) const
   return list;
 }
 
-TQString KConfigBase::readPathEntry( const TQString& pKey, const TQString& pDefault ) const
+TQString TDEConfigBase::readPathEntry( const TQString& pKey, const TQString& pDefault ) const
 {
   return readPathEntry(pKey.utf8().data(), pDefault);
 }
 
-TQString KConfigBase::readPathEntry( const char *pKey, const TQString& pDefault ) const
+TQString TDEConfigBase::readPathEntry( const char *pKey, const TQString& pDefault ) const
 {
   const bool bExpandSave = bExpand;
   bExpand = true;
@@ -606,12 +606,12 @@ TQString KConfigBase::readPathEntry( const char *pKey, const TQString& pDefault
   return aValue;
 }
 
-TQStringList KConfigBase::readPathListEntry( const TQString& pKey, char sep ) const
+TQStringList TDEConfigBase::readPathListEntry( const TQString& pKey, char sep ) const
 {
   return readPathListEntry(pKey.utf8().data(), sep);
 }
 
-TQStringList KConfigBase::readPathListEntry( const char *pKey, char sep ) const
+TQStringList TDEConfigBase::readPathListEntry( const char *pKey, char sep ) const
 {
   const bool bExpandSave = bExpand;
   bExpand = true;
@@ -620,12 +620,12 @@ TQStringList KConfigBase::readPathListEntry( const char *pKey, char sep ) const
   return aValue;
 }
 
-int KConfigBase::readNumEntry( const TQString& pKey, int nDefault) const
+int TDEConfigBase::readNumEntry( const TQString& pKey, int nDefault) const
 {
   return readNumEntry(pKey.utf8().data(), nDefault);
 }
 
-int KConfigBase::readNumEntry( const char *pKey, int nDefault) const
+int TDEConfigBase::readNumEntry( const char *pKey, int nDefault) const
 {
   TQCString aValue = readEntryUtf8( pKey );
   if( aValue.isNull() )
@@ -641,12 +641,12 @@ int KConfigBase::readNumEntry( const char *pKey, int nDefault) const
 }
 
 
-unsigned int KConfigBase::readUnsignedNumEntry( const TQString& pKey, unsigned int nDefault) const
+unsigned int TDEConfigBase::readUnsignedNumEntry( const TQString& pKey, unsigned int nDefault) const
 {
   return readUnsignedNumEntry(pKey.utf8().data(), nDefault);
 }
 
-unsigned int KConfigBase::readUnsignedNumEntry( const char *pKey, unsigned int nDefault) const
+unsigned int TDEConfigBase::readUnsignedNumEntry( const char *pKey, unsigned int nDefault) const
 {
   TQCString aValue = readEntryUtf8( pKey );
   if( aValue.isNull() )
@@ -660,12 +660,12 @@ unsigned int KConfigBase::readUnsignedNumEntry( const char *pKey, unsigned int n
 }
 
 
-long KConfigBase::readLongNumEntry( const TQString& pKey, long nDefault) const
+long TDEConfigBase::readLongNumEntry( const TQString& pKey, long nDefault) const
 {
   return readLongNumEntry(pKey.utf8().data(), nDefault);
 }
 
-long KConfigBase::readLongNumEntry( const char *pKey, long nDefault) const
+long TDEConfigBase::readLongNumEntry( const char *pKey, long nDefault) const
 {
   TQCString aValue = readEntryUtf8( pKey );
   if( aValue.isNull() )
@@ -679,12 +679,12 @@ long KConfigBase::readLongNumEntry( const char *pKey, long nDefault) const
 }
 
 
-unsigned long KConfigBase::readUnsignedLongNumEntry( const TQString& pKey, unsigned long nDefault) const
+unsigned long TDEConfigBase::readUnsignedLongNumEntry( const TQString& pKey, unsigned long nDefault) const
 {
   return readUnsignedLongNumEntry(pKey.utf8().data(), nDefault);
 }
 
-unsigned long KConfigBase::readUnsignedLongNumEntry( const char *pKey, unsigned long nDefault) const
+unsigned long TDEConfigBase::readUnsignedLongNumEntry( const char *pKey, unsigned long nDefault) const
 {
   TQCString aValue = readEntryUtf8( pKey );
   if( aValue.isNull() )
@@ -697,12 +697,12 @@ unsigned long KConfigBase::readUnsignedLongNumEntry( const char *pKey, unsigned
     }
 }
 
-TQ_INT64 KConfigBase::readNum64Entry( const TQString& pKey, TQ_INT64 nDefault) const
+TQ_INT64 TDEConfigBase::readNum64Entry( const TQString& pKey, TQ_INT64 nDefault) const
 {
   return readNum64Entry(pKey.utf8().data(), nDefault);
 }
 
-TQ_INT64 KConfigBase::readNum64Entry( const char *pKey, TQ_INT64 nDefault) const
+TQ_INT64 TDEConfigBase::readNum64Entry( const char *pKey, TQ_INT64 nDefault) const
 {
   // Note that TQCString::toLongLong() is missing, we muse use a TQString instead.
   TQString aValue = readEntry( pKey );
@@ -717,12 +717,12 @@ TQ_INT64 KConfigBase::readNum64Entry( const char *pKey, TQ_INT64 nDefault) const
 }
 
 
-TQ_UINT64 KConfigBase::readUnsignedNum64Entry( const TQString& pKey, TQ_UINT64 nDefault) const
+TQ_UINT64 TDEConfigBase::readUnsignedNum64Entry( const TQString& pKey, TQ_UINT64 nDefault) const
 {
   return readUnsignedNum64Entry(pKey.utf8().data(), nDefault);
 }
 
-TQ_UINT64 KConfigBase::readUnsignedNum64Entry( const char *pKey, TQ_UINT64 nDefault) const
+TQ_UINT64 TDEConfigBase::readUnsignedNum64Entry( const char *pKey, TQ_UINT64 nDefault) const
 {
   // Note that TQCString::toULongLong() is missing, we muse use a TQString instead.
   TQString aValue = readEntry( pKey );
@@ -736,12 +736,12 @@ TQ_UINT64 KConfigBase::readUnsignedNum64Entry( const char *pKey, TQ_UINT64 nDefa
     }
 }
 
-double KConfigBase::readDoubleNumEntry( const TQString& pKey, double nDefault) const
+double TDEConfigBase::readDoubleNumEntry( const TQString& pKey, double nDefault) const
 {
   return readDoubleNumEntry(pKey.utf8().data(), nDefault);
 }
 
-double KConfigBase::readDoubleNumEntry( const char *pKey, double nDefault) const
+double TDEConfigBase::readDoubleNumEntry( const char *pKey, double nDefault) const
 {
   TQCString aValue = readEntryUtf8( pKey );
   if( aValue.isNull() )
@@ -755,12 +755,12 @@ double KConfigBase::readDoubleNumEntry( const char *pKey, double nDefault) const
 }
 
 
-bool KConfigBase::readBoolEntry( const TQString& pKey, bool bDefault ) const
+bool TDEConfigBase::readBoolEntry( const TQString& pKey, bool bDefault ) const
 {
    return readBoolEntry(pKey.utf8().data(), bDefault);
 }
 
-bool KConfigBase::readBoolEntry( const char *pKey, bool bDefault ) const
+bool TDEConfigBase::readBoolEntry( const char *pKey, bool bDefault ) const
 {
   TQCString aValue = readEntryUtf8( pKey );
 
@@ -782,12 +782,12 @@ bool KConfigBase::readBoolEntry( const char *pKey, bool bDefault ) const
     }
 }
 
-TQFont KConfigBase::readFontEntry( const TQString& pKey, const TQFont* pDefault ) const
+TQFont TDEConfigBase::readFontEntry( const TQString& pKey, const TQFont* pDefault ) const
 {
   return readFontEntry(pKey.utf8().data(), pDefault);
 }
 
-TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) const
+TQFont TDEConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) const
 {
   TQFont aRetFont;
 
@@ -879,12 +879,12 @@ TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) co
 }
 
 
-TQRect KConfigBase::readRectEntry( const TQString& pKey, const TQRect* pDefault ) const
+TQRect TDEConfigBase::readRectEntry( const TQString& pKey, const TQRect* pDefault ) const
 {
   return readRectEntry(pKey.utf8().data(), pDefault);
 }
 
-TQRect KConfigBase::readRectEntry( const char *pKey, const TQRect* pDefault ) const
+TQRect TDEConfigBase::readRectEntry( const char *pKey, const TQRect* pDefault ) const
 {
   TQCString aValue = readEntryUtf8(pKey);
 
@@ -903,13 +903,13 @@ TQRect KConfigBase::readRectEntry( const char *pKey, const TQRect* pDefault ) co
 }
 
 
-TQPoint KConfigBase::readPointEntry( const TQString& pKey,
+TQPoint TDEConfigBase::readPointEntry( const TQString& pKey,
                                     const TQPoint* pDefault ) const
 {
   return readPointEntry(pKey.utf8().data(), pDefault);
 }
 
-TQPoint KConfigBase::readPointEntry( const char *pKey,
+TQPoint TDEConfigBase::readPointEntry( const char *pKey,
                                     const TQPoint* pDefault ) const
 {
   TQCString aValue = readEntryUtf8(pKey);
@@ -928,13 +928,13 @@ TQPoint KConfigBase::readPointEntry( const char *pKey,
   return TQPoint();
 }
 
-TQSize KConfigBase::readSizeEntry( const TQString& pKey,
+TQSize TDEConfigBase::readSizeEntry( const TQString& pKey,
                                   const TQSize* pDefault ) const
 {
   return readSizeEntry(pKey.utf8().data(), pDefault);
 }
 
-TQSize KConfigBase::readSizeEntry( const char *pKey,
+TQSize TDEConfigBase::readSizeEntry( const char *pKey,
                                   const TQSize* pDefault ) const
 {
   TQCString aValue = readEntryUtf8(pKey);
@@ -954,13 +954,13 @@ TQSize KConfigBase::readSizeEntry( const char *pKey,
 }
 
 
-TQColor KConfigBase::readColorEntry( const TQString& pKey,
+TQColor TDEConfigBase::readColorEntry( const TQString& pKey,
                                     const TQColor* pDefault ) const
 {
   return readColorEntry(pKey.utf8().data(), pDefault);
 }
 
-TQColor KConfigBase::readColorEntry( const char *pKey,
+TQColor TDEConfigBase::readColorEntry( const char *pKey,
                                     const TQColor* pDefault ) const
 {
   TQColor aRetColor;
@@ -1019,14 +1019,14 @@ TQColor KConfigBase::readColorEntry( const char *pKey,
 }
 
 
-TQDateTime KConfigBase::readDateTimeEntry( const TQString& pKey,
+TQDateTime TDEConfigBase::readDateTimeEntry( const TQString& pKey,
                                           const TQDateTime* pDefault ) const
 {
   return readDateTimeEntry(pKey.utf8().data(), pDefault);
 }
 
 // ### currentDateTime() as fallback ? (Harri)
-TQDateTime KConfigBase::readDateTimeEntry( const char *pKey,
+TQDateTime TDEConfigBase::readDateTimeEntry( const char *pKey,
                                           const TQDateTime* pDefault ) const
 {
   if( !hasKey( pKey ) )
@@ -1051,7 +1051,7 @@ TQDateTime KConfigBase::readDateTimeEntry( const char *pKey,
   return TQDateTime::currentDateTime();
 }
 
-void KConfigBase::writeEntry( const TQString& pKey, const TQString& value,
+void TDEConfigBase::writeEntry( const TQString& pKey, const TQString& value,
                                  bool bPersistent,
                                  bool bGlobal,
                                  bool bNLS )
@@ -1059,7 +1059,7 @@ void KConfigBase::writeEntry( const TQString& pKey, const TQString& value,
    writeEntry(pKey.utf8().data(), value, bPersistent,  bGlobal, bNLS);
 }
 
-void KConfigBase::writeEntry( const char *pKey, const TQString& value,
+void TDEConfigBase::writeEntry( const char *pKey, const TQString& value,
                                  bool bPersistent,
                                  bool bGlobal,
                                  bool bNLS )
@@ -1067,13 +1067,13 @@ void KConfigBase::writeEntry( const char *pKey, const TQString& value,
    writeEntry(pKey, value, bPersistent,  bGlobal, bNLS, false);
 }
 
-void KConfigBase::writeEntry( const char *pKey, const TQString& value,
+void TDEConfigBase::writeEntry( const char *pKey, const TQString& value,
                                  bool bPersistent,
                                  bool bGlobal,
                                  bool bNLS,
                                  bool bExpand )
 {
-  // the KConfig object is dirty now
+  // the TDEConfig object is dirty now
   // set this before any IO takes place so that if any derivative
   // classes do caching, they won't try and flush the cache out
   // from under us before we read. A race condition is still
@@ -1100,7 +1100,7 @@ void KConfigBase::writeEntry( const char *pKey, const TQString& value,
   putData(entryKey, aEntryData, true);
 }
 
-void KConfigBase::writePathEntry( const TQString& pKey, const TQString & path,
+void TDEConfigBase::writePathEntry( const TQString& pKey, const TQString & path,
                                   bool bPersistent, bool bGlobal,
                                   bool bNLS)
 {
@@ -1171,21 +1171,21 @@ static TQString translatePath( TQString path )
    return path;
 }
 
-void KConfigBase::writePathEntry( const char *pKey, const TQString & path,
+void TDEConfigBase::writePathEntry( const char *pKey, const TQString & path,
                                   bool bPersistent, bool bGlobal,
                                   bool bNLS)
 {
    writeEntry(pKey, translatePath(path), bPersistent, bGlobal, bNLS, true);
 }
 
-void KConfigBase::writePathEntry ( const TQString& pKey, const TQStringList &list,
+void TDEConfigBase::writePathEntry ( const TQString& pKey, const TQStringList &list,
                                char sep , bool bPersistent,
                                bool bGlobal, bool bNLS )
 {
   writePathEntry(pKey.utf8().data(), list, sep, bPersistent, bGlobal, bNLS);
 }
 
-void KConfigBase::writePathEntry ( const char *pKey, const TQStringList &list,
+void TDEConfigBase::writePathEntry ( const char *pKey, const TQStringList &list,
                                char sep , bool bPersistent,
                                bool bGlobal, bool bNLS )
 {
@@ -1204,18 +1204,18 @@ void KConfigBase::writePathEntry ( const char *pKey, const TQStringList &list,
   writeEntry( pKey, new_list, sep, bPersistent, bGlobal, bNLS, true );
 }
 
-void KConfigBase::deleteEntry( const TQString& pKey,
+void TDEConfigBase::deleteEntry( const TQString& pKey,
                                  bool bNLS,
                                  bool bGlobal)
 {
    deleteEntry(pKey.utf8().data(), bNLS, bGlobal);
 }
 
-void KConfigBase::deleteEntry( const char *pKey,
+void TDEConfigBase::deleteEntry( const char *pKey,
                                  bool bNLS,
                                  bool bGlobal)
 {
-  // the KConfig object is dirty now
+  // the TDEConfig object is dirty now
   // set this before any IO takes place so that if any derivative
   // classes do caching, they won't try and flush the cache out
   // from under us before we read. A race condition is still
@@ -1237,7 +1237,7 @@ void KConfigBase::deleteEntry( const char *pKey,
   putData(entryKey, aEntryData, true);
 }
 
-bool KConfigBase::deleteGroup( const TQString& group, bool bDeep, bool bGlobal )
+bool TDEConfigBase::deleteGroup( const TQString& group, bool bDeep, bool bGlobal )
 {
   KEntryMap aEntryMap = internalEntryMap(group);
 
@@ -1268,14 +1268,14 @@ bool KConfigBase::deleteGroup( const TQString& group, bool bDeep, bool bGlobal )
   return true;
 }
 
-void KConfigBase::writeEntry ( const TQString& pKey, const TQVariant &prop,
+void TDEConfigBase::writeEntry ( const TQString& pKey, const TQVariant &prop,
                                bool bPersistent,
                                bool bGlobal, bool bNLS )
 {
   writeEntry(pKey.utf8().data(), prop, bPersistent, bGlobal, bNLS);
 }
 
-void KConfigBase::writeEntry ( const char *pKey, const TQVariant &prop,
+void TDEConfigBase::writeEntry ( const char *pKey, const TQVariant &prop,
                                bool bPersistent,
                                bool bGlobal, bool bNLS )
 {
@@ -1391,14 +1391,14 @@ void KConfigBase::writeEntry ( const char *pKey, const TQVariant &prop,
   Q_ASSERT( 0 );
 }
 
-void KConfigBase::writeEntry ( const TQString& pKey, const TQStrList &list,
+void TDEConfigBase::writeEntry ( const TQString& pKey, const TQStrList &list,
                                char sep , bool bPersistent,
                                bool bGlobal, bool bNLS )
 {
   writeEntry(pKey.utf8().data(), list, sep, bPersistent, bGlobal, bNLS);
 }
 
-void KConfigBase::writeEntry ( const char *pKey, const TQStrList &list,
+void TDEConfigBase::writeEntry ( const char *pKey, const TQStrList &list,
                                char sep , bool bPersistent,
                                bool bGlobal, bool bNLS )
 {
@@ -1431,21 +1431,21 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStrList &list,
   writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry ( const TQString& pKey, const TQStringList &list,
+void TDEConfigBase::writeEntry ( const TQString& pKey, const TQStringList &list,
                                char sep , bool bPersistent,
                                bool bGlobal, bool bNLS )
 {
   writeEntry(pKey.utf8().data(), list, sep, bPersistent, bGlobal, bNLS);
 }
 
-void KConfigBase::writeEntry ( const char *pKey, const TQStringList &list,
+void TDEConfigBase::writeEntry ( const char *pKey, const TQStringList &list,
                                char sep , bool bPersistent,
                                bool bGlobal, bool bNLS )
 {
   writeEntry(pKey, list, sep, bPersistent, bGlobal, bNLS, false);
 }
 
-void KConfigBase::writeEntry ( const char *pKey, const TQStringList &list,
+void TDEConfigBase::writeEntry ( const char *pKey, const TQStringList &list,
                                char sep, bool bPersistent,
                                bool bGlobal, bool bNLS, bool bExpand )
 {
@@ -1475,13 +1475,13 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStringList &list,
   writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS, bExpand );
 }
 
-void KConfigBase::writeEntry ( const TQString& pKey, const TQValueList<int> &list,
+void TDEConfigBase::writeEntry ( const TQString& pKey, const TQValueList<int> &list,
                                bool bPersistent, bool bGlobal, bool bNLS )
 {
   writeEntry(pKey.utf8().data(), list, bPersistent, bGlobal, bNLS);
 }
 
-void KConfigBase::writeEntry ( const char *pKey, const TQValueList<int> &list,
+void TDEConfigBase::writeEntry ( const char *pKey, const TQValueList<int> &list,
                                bool bPersistent, bool bGlobal, bool bNLS )
 {
     TQStringList strlist;
@@ -1491,14 +1491,14 @@ void KConfigBase::writeEntry ( const char *pKey, const TQValueList<int> &list,
     writeEntry(pKey, strlist, ',', bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const TQString& pKey, int nValue,
+void TDEConfigBase::writeEntry( const TQString& pKey, int nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
   writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const char *pKey, int nValue,
+void TDEConfigBase::writeEntry( const char *pKey, int nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
@@ -1506,14 +1506,14 @@ void KConfigBase::writeEntry( const char *pKey, int nValue,
 }
 
 
-void KConfigBase::writeEntry( const TQString& pKey, unsigned int nValue,
+void TDEConfigBase::writeEntry( const TQString& pKey, unsigned int nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
   writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const char *pKey, unsigned int nValue,
+void TDEConfigBase::writeEntry( const char *pKey, unsigned int nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
@@ -1521,14 +1521,14 @@ void KConfigBase::writeEntry( const char *pKey, unsigned int nValue,
 }
 
 
-void KConfigBase::writeEntry( const TQString& pKey, long nValue,
+void TDEConfigBase::writeEntry( const TQString& pKey, long nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
   writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const char *pKey, long nValue,
+void TDEConfigBase::writeEntry( const char *pKey, long nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
@@ -1536,28 +1536,28 @@ void KConfigBase::writeEntry( const char *pKey, long nValue,
 }
 
 
-void KConfigBase::writeEntry( const TQString& pKey, unsigned long nValue,
+void TDEConfigBase::writeEntry( const TQString& pKey, unsigned long nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
   writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const char *pKey, unsigned long nValue,
+void TDEConfigBase::writeEntry( const char *pKey, unsigned long nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
   writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const TQString& pKey, TQ_INT64 nValue,
+void TDEConfigBase::writeEntry( const TQString& pKey, TQ_INT64 nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
   writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const char *pKey, TQ_INT64 nValue,
+void TDEConfigBase::writeEntry( const char *pKey, TQ_INT64 nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
@@ -1565,21 +1565,21 @@ void KConfigBase::writeEntry( const char *pKey, TQ_INT64 nValue,
 }
 
 
-void KConfigBase::writeEntry( const TQString& pKey, TQ_UINT64 nValue,
+void TDEConfigBase::writeEntry( const TQString& pKey, TQ_UINT64 nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
   writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const char *pKey, TQ_UINT64 nValue,
+void TDEConfigBase::writeEntry( const char *pKey, TQ_UINT64 nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
   writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const TQString& pKey, double nValue,
+void TDEConfigBase::writeEntry( const TQString& pKey, double nValue,
                                  bool bPersistent, bool bGlobal,
                                  char format, int precision,
                                  bool bNLS )
@@ -1588,7 +1588,7 @@ void KConfigBase::writeEntry( const TQString& pKey, double nValue,
                      bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const char *pKey, double nValue,
+void TDEConfigBase::writeEntry( const char *pKey, double nValue,
                                  bool bPersistent, bool bGlobal,
                                  char format, int precision,
                                  bool bNLS )
@@ -1598,7 +1598,7 @@ void KConfigBase::writeEntry( const char *pKey, double nValue,
 }
 
 
-void KConfigBase::writeEntry( const TQString& pKey, bool bValue,
+void TDEConfigBase::writeEntry( const TQString& pKey, bool bValue,
                                  bool bPersistent,
                                  bool bGlobal,
                                  bool bNLS )
@@ -1606,7 +1606,7 @@ void KConfigBase::writeEntry( const TQString& pKey, bool bValue,
   writeEntry(pKey.utf8().data(), bValue, bPersistent, bGlobal, bNLS);
 }
 
-void KConfigBase::writeEntry( const char *pKey, bool bValue,
+void TDEConfigBase::writeEntry( const char *pKey, bool bValue,
                                  bool bPersistent,
                                  bool bGlobal,
                                  bool bNLS )
@@ -1622,14 +1622,14 @@ void KConfigBase::writeEntry( const char *pKey, bool bValue,
 }
 
 
-void KConfigBase::writeEntry( const TQString& pKey, const TQFont& rFont,
+void TDEConfigBase::writeEntry( const TQString& pKey, const TQFont& rFont,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
   writeEntry(pKey.utf8().data(), rFont, bPersistent, bGlobal, bNLS);
 }
 
-void KConfigBase::writeEntry( const char *pKey, const TQFont& rFont,
+void TDEConfigBase::writeEntry( const char *pKey, const TQFont& rFont,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
@@ -1637,14 +1637,14 @@ void KConfigBase::writeEntry( const char *pKey, const TQFont& rFont,
 }
 
 
-void KConfigBase::writeEntry( const TQString& pKey, const TQRect& rRect,
+void TDEConfigBase::writeEntry( const TQString& pKey, const TQRect& rRect,
                               bool bPersistent, bool bGlobal,
                               bool bNLS )
 {
   writeEntry(pKey.utf8().data(), rRect, bPersistent, bGlobal, bNLS);
 }
 
-void KConfigBase::writeEntry( const char *pKey, const TQRect& rRect,
+void TDEConfigBase::writeEntry( const char *pKey, const TQRect& rRect,
                               bool bPersistent, bool bGlobal,
                               bool bNLS )
 {
@@ -1659,14 +1659,14 @@ void KConfigBase::writeEntry( const char *pKey, const TQRect& rRect,
 }
 
 
-void KConfigBase::writeEntry( const TQString& pKey, const TQPoint& rPoint,
+void TDEConfigBase::writeEntry( const TQString& pKey, const TQPoint& rPoint,
                               bool bPersistent, bool bGlobal,
                               bool bNLS )
 {
   writeEntry(pKey.utf8().data(), rPoint, bPersistent, bGlobal, bNLS);
 }
 
-void KConfigBase::writeEntry( const char *pKey, const TQPoint& rPoint,
+void TDEConfigBase::writeEntry( const char *pKey, const TQPoint& rPoint,
                               bool bPersistent, bool bGlobal,
                               bool bNLS )
 {
@@ -1679,14 +1679,14 @@ void KConfigBase::writeEntry( const char *pKey, const TQPoint& rPoint,
 }
 
 
-void KConfigBase::writeEntry( const TQString& pKey, const TQSize& rSize,
+void TDEConfigBase::writeEntry( const TQString& pKey, const TQSize& rSize,
                               bool bPersistent, bool bGlobal,
                               bool bNLS )
 {
   writeEntry(pKey.utf8().data(), rSize, bPersistent, bGlobal, bNLS);
 }
 
-void KConfigBase::writeEntry( const char *pKey, const TQSize& rSize,
+void TDEConfigBase::writeEntry( const char *pKey, const TQSize& rSize,
                               bool bPersistent, bool bGlobal,
                               bool bNLS )
 {
@@ -1698,7 +1698,7 @@ void KConfigBase::writeEntry( const char *pKey, const TQSize& rSize,
   writeEntry( pKey, list, ',', bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const TQString& pKey, const TQColor& rColor,
+void TDEConfigBase::writeEntry( const TQString& pKey, const TQColor& rColor,
                               bool bPersistent,
                               bool bGlobal,
                               bool bNLS  )
@@ -1706,7 +1706,7 @@ void KConfigBase::writeEntry( const TQString& pKey, const TQColor& rColor,
   writeEntry( pKey.utf8().data(), rColor, bPersistent, bGlobal, bNLS);
 }
 
-void KConfigBase::writeEntry( const char *pKey, const TQColor& rColor,
+void TDEConfigBase::writeEntry( const char *pKey, const TQColor& rColor,
                               bool bPersistent,
                               bool bGlobal,
                               bool bNLS  )
@@ -1720,14 +1720,14 @@ void KConfigBase::writeEntry( const char *pKey, const TQColor& rColor,
   writeEntry( pKey, aValue, bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const TQString& pKey, const TQDateTime& rDateTime,
+void TDEConfigBase::writeEntry( const TQString& pKey, const TQDateTime& rDateTime,
                               bool bPersistent, bool bGlobal,
                               bool bNLS )
 {
   writeEntry(pKey.utf8().data(), rDateTime, bPersistent, bGlobal, bNLS);
 }
 
-void KConfigBase::writeEntry( const char *pKey, const TQDateTime& rDateTime,
+void TDEConfigBase::writeEntry( const char *pKey, const TQDateTime& rDateTime,
                               bool bPersistent, bool bGlobal,
                               bool bNLS )
 {
@@ -1748,7 +1748,7 @@ void KConfigBase::writeEntry( const char *pKey, const TQDateTime& rDateTime,
   writeEntry( pKey, list, ',', bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::parseConfigFiles()
+void TDEConfigBase::parseConfigFiles()
 {
   if (!bLocaleInitialized && TDEGlobal::_locale) {
     setLocale();
@@ -1760,7 +1760,7 @@ void KConfigBase::parseConfigFiles()
   }
 }
 
-void KConfigBase::sync()
+void TDEConfigBase::sync()
 {
   if (isReadOnly())
     return;
@@ -1771,35 +1771,35 @@ void KConfigBase::sync()
     rollback();
 }
 
-KConfigBase::ConfigState KConfigBase::getConfigState() const {
+TDEConfigBase::ConfigState TDEConfigBase::getConfigState() const {
     if (backEnd)
        return backEnd->getConfigState();
     return ReadOnly;
 }
 
-void KConfigBase::rollback( bool /*bDeep = true*/ )
+void TDEConfigBase::rollback( bool /*bDeep = true*/ )
 {
   bDirty = false;
 }
 
 
-void KConfigBase::setReadDefaults(bool b)
+void TDEConfigBase::setReadDefaults(bool b)
 {
   if (!d)
   {
      if (!b) return;
-     d = new KConfigBasePrivate();
+     d = new TDEConfigBasePrivate();
   }
 
   d->readDefaults = b;
 }
 
-bool KConfigBase::readDefaults() const
+bool TDEConfigBase::readDefaults() const
 {
   return (d && d->readDefaults);
 }
 
-void KConfigBase::revertToDefault(const TQString &key)
+void TDEConfigBase::revertToDefault(const TQString &key)
 {
   setDirty(true);
 
@@ -1826,7 +1826,7 @@ void KConfigBase::revertToDefault(const TQString &key)
   putData(aEntryKey, entry, true); // Revert
 }
 
-bool KConfigBase::hasDefault(const TQString &key) const
+bool TDEConfigBase::hasDefault(const TQString &key) const
 {
   KEntryKey aEntryKey(mGroup, key.utf8());
   aEntryKey.bDefault = true;
@@ -1851,7 +1851,7 @@ bool KConfigBase::hasDefault(const TQString &key) const
 
 
 
-KConfigGroup::KConfigGroup(KConfigBase *master, const TQString &group)
+TDEConfigGroup::TDEConfigGroup(TDEConfigBase *master, const TQString &group)
 {
   mMaster = master;
   backEnd = mMaster->backEnd; // Needed for getConfigState()
@@ -1864,7 +1864,7 @@ KConfigGroup::KConfigGroup(KConfigBase *master, const TQString &group)
   setReadDefaults(mMaster->readDefaults());
 }
 
-KConfigGroup::KConfigGroup(KConfigBase *master, const TQCString &group)
+TDEConfigGroup::TDEConfigGroup(TDEConfigBase *master, const TQCString &group)
 {
   mMaster = master;
   backEnd = mMaster->backEnd; // Needed for getConfigState()
@@ -1877,7 +1877,7 @@ KConfigGroup::KConfigGroup(KConfigBase *master, const TQCString &group)
   setReadDefaults(mMaster->readDefaults());
 }
 
-KConfigGroup::KConfigGroup(KConfigBase *master, const char * group)
+TDEConfigGroup::TDEConfigGroup(TDEConfigBase *master, const char * group)
 {
   mMaster = master;
   backEnd = mMaster->backEnd; // Needed for getConfigState()
@@ -1890,43 +1890,43 @@ KConfigGroup::KConfigGroup(KConfigBase *master, const char * group)
   setReadDefaults(mMaster->readDefaults());
 }
 
-void KConfigGroup::deleteGroup(bool bGlobal)
+void TDEConfigGroup::deleteGroup(bool bGlobal)
 {
-  mMaster->deleteGroup(KConfigBase::group(), true, bGlobal);
+  mMaster->deleteGroup(TDEConfigBase::group(), true, bGlobal);
 }
 
-bool KConfigGroup::groupIsImmutable() const
+bool TDEConfigGroup::groupIsImmutable() const
 {
-    return mMaster->groupIsImmutable(KConfigBase::group());
+    return mMaster->groupIsImmutable(TDEConfigBase::group());
 }
 
-void KConfigGroup::setDirty(bool _bDirty)
+void TDEConfigGroup::setDirty(bool _bDirty)
 {
   mMaster->setDirty(_bDirty);
 }
 
-void KConfigGroup::putData(const KEntryKey &_key, const KEntry &_data, bool _checkGroup)
+void TDEConfigGroup::putData(const KEntryKey &_key, const KEntry &_data, bool _checkGroup)
 {
   mMaster->putData(_key, _data, _checkGroup);
 }
 
-KEntry KConfigGroup::lookupData(const KEntryKey &_key) const
+KEntry TDEConfigGroup::lookupData(const KEntryKey &_key) const
 {
   return mMaster->lookupData(_key);
 }
 
-void KConfigGroup::sync()
+void TDEConfigGroup::sync()
 {
   mMaster->sync();
 }
 
-void KConfigBase::virtual_hook( int, void* )
+void TDEConfigBase::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-void KConfigGroup::virtual_hook( int id, void* data )
-{ KConfigBase::virtual_hook( id, data ); }
+void TDEConfigGroup::virtual_hook( int id, void* data )
+{ TDEConfigBase::virtual_hook( id, data ); }
 
-bool KConfigBase::checkConfigFilesWritable(bool warnUser)
+bool TDEConfigBase::checkConfigFilesWritable(bool warnUser)
 {
   if (backEnd)
     return backEnd->checkConfigFilesWritable(warnUser);
diff --git a/tdecore/kconfigbase.h b/tdecore/kconfigbase.h
index 1818aadb5..ff02babdd 100644
--- a/tdecore/kconfigbase.h
+++ b/tdecore/kconfigbase.h
@@ -35,16 +35,16 @@
 #include "kconfigdata.h"
 #include "tdelibs_export.h"
 
-class KConfigBackEnd;
-class KConfigBasePrivate;
-class KConfigGroup;
+class TDEConfigBackEnd;
+class TDEConfigBasePrivate;
+class TDEConfigGroup;
 
 /**
  * @short KDE Configuration Management abstract base class
  *
  * This class forms the base for all %KDE configuration. It is an
  * abstract base class, meaning that you cannot directly instantiate
- * objects of this class. Either use KConfig (for usual %KDE
+ * objects of this class. Either use TDEConfig (for usual %KDE
  * configuration) or KSimpleConfig (for special needs as in ksamba), or
  * even KSharedConfig (stores values in shared memory).
  *
@@ -53,7 +53,7 @@ class KConfigGroup;
  * entries that do not explicitly specify which group they are in are
  * in a special group called the default group.
  *
- * If there is a $ character in an entry, KConfigBase tries to expand
+ * If there is a $ character in an entry, TDEConfigBase tries to expand
  * environment variable and uses its value instead of its name. You
  * can avoid this feature by having two consecutive $ characters in
  * your config file which get expanded to one.
@@ -63,29 +63,29 @@ class KConfigGroup;
  *
  * @author Kalle Dalheimer <kalle@kde.org>, Preston Brown <pbrown@kde.org>
  * @see TDEGlobal#config()
- * @see KConfig
+ * @see TDEConfig
  * @see KSimpleConfig
  * @see KSharedConfig
  */
-class TDECORE_EXPORT KConfigBase : public TQObject
+class TDECORE_EXPORT TDEConfigBase : public TQObject
 {
   Q_OBJECT
   
 
-  friend class KConfigBackEnd;
-  friend class KConfigINIBackEnd;
-  friend class KConfigGroup;
+  friend class TDEConfigBackEnd;
+  friend class TDEConfigINIBackEnd;
+  friend class TDEConfigGroup;
 
 public:
   /**
-   * Construct a KConfigBase object.
+   * Construct a TDEConfigBase object.
    */
-  KConfigBase();
+  TDEConfigBase();
 
   /**
-   * Destructs the KConfigBase object.
+   * Destructs the TDEConfigBase object.
    */
-  virtual ~KConfigBase();
+  virtual ~TDEConfigBase();
 
   /**
    * Specifies the group in which keys will be read and written.
@@ -1670,7 +1670,7 @@ public:
 
 
   /**
-   * Turns on or off "dollar  expansion" (see KConfigBase introduction)
+   * Turns on or off "dollar  expansion" (see TDEConfigBase introduction)
    *  when reading config entries.
    * Dollar sign expansion is initially OFF.
    *
@@ -1688,13 +1688,13 @@ public:
   /**
    * Mark the config object as "clean," i.e. don't write dirty entries
    * at destruction time. If @p bDeep is false, only the global dirty
-   * flag of the KConfig object gets cleared. If you then call
+   * flag of the TDEConfig object gets cleared. If you then call
    * writeEntry() again, the global dirty flag is set again and all
    * dirty entries will be written at a subsequent sync() call.
    *
-   * Classes that derive from KConfigBase should override this
+   * Classes that derive from TDEConfigBase should override this
    * method and implement storage-specific behavior, as well as
-   * calling the KConfigBase::rollback() explicitly in the initializer.
+   * calling the TDEConfigBase::rollback() explicitly in the initializer.
    *
    * @param bDeep If true, the dirty flags of all entries are cleared,
    *        as well as the global dirty flag.
@@ -1901,7 +1901,7 @@ protected:
   /**
    * Parses all configuration files for a configuration object.
    *
-   * The actual parsing is done by the associated KConfigBackEnd.
+   * The actual parsing is done by the associated TDEConfigBackEnd.
    */
   virtual void parseConfigFiles();
 
@@ -1937,7 +1937,7 @@ protected:
 
   /**
    * Inserts a (key/value) pair into the internal storage mechanism of
-   * the configuration object. Classes that derive from KConfigBase
+   * the configuration object. Classes that derive from TDEConfigBase
    * will need to implement this method in a storage-specific manner.
    *
    * Do not use this function, the implementation / return type are
@@ -1954,7 +1954,7 @@ protected:
 
   /**
    * Looks up an entry in the config object's internal structure.
-   * Classes that derive from KConfigBase will need to implement this
+   * Classes that derive from TDEConfigBase will need to implement this
    * method in a storage-specific manner.
    *
    * Do not use this function, the implementation and return type are
@@ -1973,7 +1973,7 @@ protected:
   /**
    * A back end for loading/saving to disk in a particular format.
    */
-  KConfigBackEnd *backEnd;
+  TDEConfigBackEnd *backEnd;
 public:
   /**
    * Overloaded public methods:
@@ -2008,8 +2008,8 @@ protected:
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  class KConfigBasePrivate;
-  KConfigBasePrivate *d;
+  class TDEConfigBasePrivate;
+  TDEConfigBasePrivate *d;
 
   void writeEntry( const char *pKey, const TQString &rValue,
     bool bPersistent, bool bGlobal, bool bNLS, bool bExpand );
@@ -2018,14 +2018,14 @@ private:
 
 };
 
-class KConfigGroupSaverPrivate;
+class TDEConfigGroupSaverPrivate;
 
 /**
-  * Helper class to facilitate working with KConfig / KSimpleConfig
+  * Helper class to facilitate working with TDEConfig / KSimpleConfig
   * groups.
   *
   * Careful programmers always set the group of a
-  * KConfig KSimpleConfig object to the group they want to read from
+  * TDEConfig KSimpleConfig object to the group they want to read from
   * and set it back to the old one of afterwards. This is usually
   * written as:
   * \code
@@ -2039,82 +2039,82 @@ class KConfigGroupSaverPrivate;
   * \endcode
   *
   * In order to facilitate this task, you can use
-  * KConfigGroupSaver. Simply construct such an object ON THE STACK
+  * TDEConfigGroupSaver. Simply construct such an object ON THE STACK
   * when you want to switch to a new group. Then, when the object goes
   * out of scope, the group will automatically be restored. If you
   * want to use several different groups within a function or method,
-  * you can still use KConfigGroupSaver: Simply enclose all work with
-  * one group (including the creation of the KConfigGroupSaver object)
+  * you can still use TDEConfigGroupSaver: Simply enclose all work with
+  * one group (including the creation of the TDEConfigGroupSaver object)
   * in one block.
   *
   * @deprecated This class is deprecated and will be removed in KDE 4.
-  * KConfigGroup provides similar functionality in a more object oriented
+  * TDEConfigGroup provides similar functionality in a more object oriented
   * way.
   *
   * @author Matthias Kalle Dalheimer <kalle@kde.org>
-  * @see KConfigBase, KConfig, KSimpleConfig, KConfigGroup
-  * @short Helper class for easier use of KConfig/KSimpleConfig groups
+  * @see TDEConfigBase, TDEConfig, KSimpleConfig, TDEConfigGroup
+  * @short Helper class for easier use of TDEConfig/KSimpleConfig groups
   */
 
-class TDECORE_EXPORT KConfigGroupSaver // KDE4 remove
+class TDECORE_EXPORT TDEConfigGroupSaver // KDE4 remove
 {
 public:
   /**
-   * Constructor. You pass a pointer to the KConfigBase-derived
+   * Constructor. You pass a pointer to the TDEConfigBase-derived
    * object you want to work with and a string indicating the _new_
    * group.
    *
-   * @param config The KConfigBase-derived object this
-   *               KConfigGroupSaver works on.
+   * @param config The TDEConfigBase-derived object this
+   *               TDEConfigGroupSaver works on.
    * @param group  The new group that the config object should switch to.
    */
-  KConfigGroupSaver( KConfigBase* config, TQString group )
+  TDEConfigGroupSaver( TDEConfigBase* config, TQString group )
       /* KDE 4 : make the second parameter const TQString & */
       : _config(config), _oldgroup(config->group())
         { _config->setGroup( group ); }
 
-  KConfigGroupSaver( KConfigBase* config, const char *group )
+  TDEConfigGroupSaver( TDEConfigBase* config, const char *group )
       : _config(config), _oldgroup(config->group())
         { _config->setGroup( group ); }
 
-  KConfigGroupSaver( KConfigBase* config, const TQCString &group )
+  TDEConfigGroupSaver( TDEConfigBase* config, const TQCString &group )
       : _config(config), _oldgroup(config->group())
         { _config->setGroup( group ); }
 
-  ~KConfigGroupSaver() { _config->setGroup( _oldgroup ); }
+  ~TDEConfigGroupSaver() { _config->setGroup( _oldgroup ); }
 
-    KConfigBase* config() { return _config; };
+    TDEConfigBase* config() { return _config; };
 
 private:
-  KConfigBase* _config;
+  TDEConfigBase* _config;
   TQString _oldgroup;
 
-  KConfigGroupSaver(const KConfigGroupSaver&);
-  KConfigGroupSaver& operator=(const KConfigGroupSaver&);
+  TDEConfigGroupSaver(const TDEConfigGroupSaver&);
+  TDEConfigGroupSaver& operator=(const TDEConfigGroupSaver&);
 
-  KConfigGroupSaverPrivate *d;
+  TDEConfigGroupSaverPrivate *d;
 };
 
-class KConfigGroupPrivate;
+class TDEConfigGroupPrivate;
 
 /**
- * A KConfigBase derived class for one specific group in a KConfig object.
+ * A TDEConfigBase derived class for one specific group in a TDEConfig object.
  */
-class TDECORE_EXPORT KConfigGroup: public KConfigBase
+class TDECORE_EXPORT TDEConfigGroup: public TDEConfigBase
 {
 public:
    /**
     * Construct a config group corresponding to @p group in @p master.
     * @p group is the group name encoded in UTF-8.
     */
-   KConfigGroup(KConfigBase *master, const TQCString &group);
+   TDEConfigGroup(TDEConfigBase *master, const TQCString &group);
    /**
     * This is an overloaded constructor provided for convenience.
     * It behaves essentially like the above function.
     *
     * Construct a config group corresponding to @p group in @p master
     */
-   KConfigGroup(KConfigBase *master, const TQString &group);
+   TDEConfigGroup(TDEConfigBase *master, const TQString &group);
    /**
     * This is an overloaded constructor provided for convenience.
     * It behaves essentially like the above function.
@@ -2122,7 +2122,7 @@ public:
     * Construct a config group corresponding to @p group in @p master
     * @p group is the group name encoded in UTF-8.
     */
-   KConfigGroup(KConfigBase *master, const char * group);
+   TDEConfigGroup(TDEConfigBase *master, const char * group);
 
    /**
     * Delete all entries in the entire group
@@ -2170,11 +2170,11 @@ private:
 
    void getConfigState() { }
 
-   KConfigBase *mMaster;
+   TDEConfigBase *mMaster;
 protected:
    virtual void virtual_hook( int id, void* data );
 private:
-   KConfigGroupPrivate* d;
+   TDEConfigGroupPrivate* d;
 };
 
 #endif
diff --git a/tdecore/kconfigdialogmanager.cpp b/tdecore/kconfigdialogmanager.cpp
index 82567ca0b..dfb81853b 100644
--- a/tdecore/kconfigdialogmanager.cpp
+++ b/tdecore/kconfigdialogmanager.cpp
@@ -37,7 +37,7 @@
 
 #include <assert.h>
 
-class KConfigDialogManager::Private {
+class TDEConfigDialogManager::Private {
 
 public:
   Private() : insideGroupBox(false) { }
@@ -48,7 +48,7 @@ public:
   bool insideGroupBox;
 };
 
-KConfigDialogManager::KConfigDialogManager(TQWidget *parent, KConfigSkeleton *conf, const char *name)
+TDEConfigDialogManager::TDEConfigDialogManager(TQWidget *parent, TDEConfigSkeleton *conf, const char *name)
  : TQObject(parent, name), m_conf(conf), m_dialog(parent)
 {
   d = new Private();
@@ -59,12 +59,12 @@ KConfigDialogManager::KConfigDialogManager(TQWidget *parent, KConfigSkeleton *co
   init(true);
 }
 
-KConfigDialogManager::~KConfigDialogManager()
+TDEConfigDialogManager::~TDEConfigDialogManager()
 {
   delete d;
 }
 
-void KConfigDialogManager::init(bool trackChanges)
+void TDEConfigDialogManager::init(bool trackChanges)
 {
   if(trackChanges)
   {
@@ -121,12 +121,12 @@ void KConfigDialogManager::init(bool trackChanges)
   (void) parseChildren(m_dialog, trackChanges);
 }
 
-void KConfigDialogManager::addWidget(TQWidget *widget)
+void TDEConfigDialogManager::addWidget(TQWidget *widget)
 {
   (void) parseChildren(widget, true);
 }
 
-void KConfigDialogManager::setupWidget(TQWidget *widget, KConfigSkeletonItem *item)
+void TDEConfigDialogManager::setupWidget(TQWidget *widget, TDEConfigSkeletonItem *item)
 {
   TQVariant minValue = item->minValue();
   if (minValue.isValid())
@@ -150,7 +150,7 @@ void KConfigDialogManager::setupWidget(TQWidget *widget, KConfigSkeletonItem *it
   }
 }
 
-bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChanges)
+bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChanges)
 {
   bool valueChanged = false;
   const TQObjectList listOfChildren = widget->childrenListObject();
@@ -174,7 +174,7 @@ bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChang
     {
       // This is one of our widgets!
       TQString configId = widgetName+5;
-      KConfigSkeletonItem *item = m_conf->findItem(configId);
+      TDEConfigSkeletonItem *item = m_conf->findItem(configId);
       if (item)
       {
         d->knownWidget.insert(configId, childWidget);
@@ -187,7 +187,7 @@ bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChang
         {
 		   // If the class name of the widget wasn't in the monitored widgets map, then look for 
 		   // it again using the super class name. This fixes a problem with using QtRuby/Korundum 
-		   // widgets with KConfigXT where 'Qt::Widget' wasn't being seen a the real deal, even 
+		   // widgets with TDEConfigXT where 'Qt::Widget' wasn't being seen a the real deal, even 
 		   // though it was a 'QWidget'.
           changedIt = changedMap.find(childWidget->metaObject()->superClassName());
         }
@@ -256,7 +256,7 @@ bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChang
   return valueChanged;
 }
 
-void KConfigDialogManager::updateWidgets()
+void TDEConfigDialogManager::updateWidgets()
 {
   bool changed = false;
   bool bSignalsBlocked = signalsBlocked();
@@ -266,7 +266,7 @@ void KConfigDialogManager::updateWidgets()
   for( TQDictIterator<TQWidget> it( d->knownWidget );
        (widget = it.current()); ++it )
   {
-     KConfigSkeletonItem *item = m_conf->findItem(it.currentKey());
+     TDEConfigSkeletonItem *item = m_conf->findItem(it.currentKey());
      if (!item)
      {
         kdWarning(178) << "The setting '" << it.currentKey() << "' has disappeared!" << endl;
@@ -294,14 +294,14 @@ void KConfigDialogManager::updateWidgets()
     TQTimer::singleShot(0, this, TQT_SIGNAL(widgetModified()));
 }
 
-void KConfigDialogManager::updateWidgetsDefault()
+void TDEConfigDialogManager::updateWidgetsDefault()
 {
   bool bUseDefaults = m_conf->useDefaults(true);
   updateWidgets();
   m_conf->useDefaults(bUseDefaults);
 }
 
-void KConfigDialogManager::updateSettings()
+void TDEConfigDialogManager::updateSettings()
 {
   bool changed = false;
 
@@ -309,7 +309,7 @@ void KConfigDialogManager::updateSettings()
   for( TQDictIterator<TQWidget> it( d->knownWidget );
        (widget = it.current()); ++it )
   {
-     KConfigSkeletonItem *item = m_conf->findItem(it.currentKey());
+     TDEConfigSkeletonItem *item = m_conf->findItem(it.currentKey());
      if (!item)
      {
         kdWarning(178) << "The setting '" << it.currentKey() << "' has disappeared!" << endl;
@@ -330,7 +330,7 @@ void KConfigDialogManager::updateSettings()
   }
 }
 
-void KConfigDialogManager::setProperty(TQWidget *w, const TQVariant &v)
+void TDEConfigDialogManager::setProperty(TQWidget *w, const TQVariant &v)
 {
   TQButtonGroup *bg = dynamic_cast<TQButtonGroup *>(w);
   if (bg)
@@ -349,7 +349,7 @@ void KConfigDialogManager::setProperty(TQWidget *w, const TQVariant &v)
   propertyMap->setProperty(w, v);
 }
 
-TQVariant KConfigDialogManager::property(TQWidget *w)
+TQVariant TDEConfigDialogManager::property(TQWidget *w)
 {
   TQButtonGroup *bg = dynamic_cast<TQButtonGroup *>(w);
   if (bg)
@@ -362,14 +362,14 @@ TQVariant KConfigDialogManager::property(TQWidget *w)
   return propertyMap->property(w);
 }
 
-bool KConfigDialogManager::hasChanged()
+bool TDEConfigDialogManager::hasChanged()
 {
 
   TQWidget *widget;
   for( TQDictIterator<TQWidget> it( d->knownWidget );
        (widget = it.current()); ++it )
   {
-     KConfigSkeletonItem *item = m_conf->findItem(it.currentKey());
+     TDEConfigSkeletonItem *item = m_conf->findItem(it.currentKey());
      if (!item)
      {
         kdWarning(178) << "The setting '" << it.currentKey() << "' has disappeared!" << endl;
@@ -386,7 +386,7 @@ bool KConfigDialogManager::hasChanged()
   return false;
 }
 
-bool KConfigDialogManager::isDefault()
+bool TDEConfigDialogManager::isDefault()
 {
   bool bUseDefaults = m_conf->useDefaults(true);
   bool result = !hasChanged();
diff --git a/tdecore/kconfigdialogmanager.h b/tdecore/kconfigdialogmanager.h
index cc2238d4c..1b82e9eda 100644
--- a/tdecore/kconfigdialogmanager.h
+++ b/tdecore/kconfigdialogmanager.h
@@ -25,28 +25,28 @@
 #include <tqptrlist.h>
 #include "tdelibs_export.h"
 
-class KConfigSkeleton;
-class KConfigSkeletonItem;
+class TDEConfigSkeleton;
+class TDEConfigSkeletonItem;
 class TQWidget;
 class TQSqlPropertyMap;
 
 /**
  * @short Provides a means of automatically retrieving,
- * saving and resetting KConfigSkeleton based settings in a dialog.
+ * saving and resetting TDEConfigSkeleton based settings in a dialog.
  *
- * The KConfigDialogManager class provides a means of automatically
+ * The TDEConfigDialogManager class provides a means of automatically
  * retrieving, saving and resetting basic settings.
  * It also can emit signals when settings have been changed
  * (settings were saved) or modified (the user changes a checkbox
  * from on to off).
  *
  * The names of the widgets to be managed have to correspond to the names of the
- * configuration entries in the KConfigSkeleton object plus an additional
+ * configuration entries in the TDEConfigSkeleton object plus an additional
  * "kcfg_" prefix. For example a widget named "kcfg_MyOption" would be
  * associated to the configuration entry "MyOption".
  *
- * KConfigDialogManager uses the TQSqlPropertyMap class to determine if it can do
- * anything to a widget.  Note that KConfigDialogManager doesn't  require a
+ * TDEConfigDialogManager uses the TQSqlPropertyMap class to determine if it can do
+ * anything to a widget.  Note that TDEConfigDialogManager doesn't  require a
  * database, it simply uses the functionality that is built into the
  * TQSqlPropertyMap class.  New widgets can be added to the map using
  * TQSqlPropertyMap::installDefaultMap().  Note that you can't just add any
@@ -75,7 +75,7 @@ class TQSqlPropertyMap;
  * @author Benjamin C Meyer <ben+tdelibs at meyerhome dot net>
  * @author Waldo Bastian <bastian@kde.org>
  */
-class TDECORE_EXPORT KConfigDialogManager : public TQObject {
+class TDECORE_EXPORT TDEConfigDialogManager : public TQObject {
 
 Q_OBJECT
 
@@ -114,12 +114,12 @@ public:
    * @param conf Object that contains settings
    * @param name - Object name.
    */
-   KConfigDialogManager(TQWidget *parent, KConfigSkeleton *conf, const char *name=0);
+   TDEConfigDialogManager(TQWidget *parent, TDEConfigSkeleton *conf, const char *name=0);
 
   /**
    * Destructor.
    */
-  ~KConfigDialogManager();
+  ~TDEConfigDialogManager();
 
   /**
    * Add additional widgets to manage
@@ -200,13 +200,13 @@ protected:
   /**
    * Setup secondary widget properties
    */
-  void setupWidget(TQWidget *widget, KConfigSkeletonItem *item);
+  void setupWidget(TQWidget *widget, TDEConfigSkeletonItem *item);
 
 protected:
   /**
-   * KConfigSkeleton object used to store settings
+   * TDEConfigSkeleton object used to store settings
    */
-  KConfigSkeleton *m_conf;
+  TDEConfigSkeleton *m_conf;
 
   /**
    * Dialog being managed
@@ -226,7 +226,7 @@ protected:
 private:
   class Private;
   /**
-   * KConfigDialogManager Private class.
+   * TDEConfigDialogManager Private class.
    */
   Private *d;
 
diff --git a/tdecore/kconfigskeleton.cpp b/tdecore/kconfigskeleton.cpp
index ee873eca2..afc45bb87 100644
--- a/tdecore/kconfigskeleton.cpp
+++ b/tdecore/kconfigskeleton.cpp
@@ -32,22 +32,22 @@
 
 #include "kconfigskeleton.h"
 
-void KConfigSkeletonItem::readImmutability( KConfig *config )
+void TDEConfigSkeletonItem::readImmutability( TDEConfig *config )
 {
   mIsImmutable = config->entryIsImmutable( mKey );
 }
 
 
-KConfigSkeleton::ItemString::ItemString( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemString::ItemString( const TQString &group, const TQString &key,
                                     TQString &reference,
                                     const TQString &defaultValue,
                                     Type type )
-  : KConfigSkeletonGenericItem<TQString>( group, key, reference, defaultValue ),
+  : TDEConfigSkeletonGenericItem<TQString>( group, key, reference, defaultValue ),
     mType( type )
 {
 }
 
-void KConfigSkeleton::ItemString::writeConfig( KConfig *config )
+void TDEConfigSkeleton::ItemString::writeConfig( TDEConfig *config )
 {
   if ( mReference != mLoadedValue ) // WABA: Is this test needed?
   {
@@ -64,7 +64,7 @@ void KConfigSkeleton::ItemString::writeConfig( KConfig *config )
 }
 
 
-void KConfigSkeleton::ItemString::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemString::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
 
@@ -88,39 +88,39 @@ void KConfigSkeleton::ItemString::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemString::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemString::setProperty(const TQVariant & p)
 {
   mReference = p.toString();
 }
 
-TQVariant KConfigSkeleton::ItemString::property() const
+TQVariant TDEConfigSkeleton::ItemString::property() const
 {
   return TQVariant(mReference);
 }
 
-KConfigSkeleton::ItemPassword::ItemPassword( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemPassword::ItemPassword( const TQString &group, const TQString &key,
                                     TQString &reference,
                                     const TQString &defaultValue)
   : ItemString( group, key, reference, defaultValue, Password )
 {
 }
 
-KConfigSkeleton::ItemPath::ItemPath( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemPath::ItemPath( const TQString &group, const TQString &key,
                                     TQString &reference,
                                     const TQString &defaultValue)
   : ItemString( group, key, reference, defaultValue, Path )
 {
 }
 
-KConfigSkeleton::ItemProperty::ItemProperty( const TQString &group,
+TDEConfigSkeleton::ItemProperty::ItemProperty( const TQString &group,
                                         const TQString &key,
                                         TQVariant &reference,
                                         TQVariant defaultValue )
-  : KConfigSkeletonGenericItem<TQVariant>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<TQVariant>( group, key, reference, defaultValue )
 {
 }
 
-void KConfigSkeleton::ItemProperty::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemProperty::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readPropertyEntry( mKey, mDefault );
@@ -129,23 +129,23 @@ void KConfigSkeleton::ItemProperty::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemProperty::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemProperty::setProperty(const TQVariant & p)
 {
   mReference = p;
 }
 
-TQVariant KConfigSkeleton::ItemProperty::property() const
+TQVariant TDEConfigSkeleton::ItemProperty::property() const
 {
   return mReference;
 }
 
-KConfigSkeleton::ItemBool::ItemBool( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemBool::ItemBool( const TQString &group, const TQString &key,
                                 bool &reference, bool defaultValue )
-  : KConfigSkeletonGenericItem<bool>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<bool>( group, key, reference, defaultValue )
 {
 }
 
-void KConfigSkeleton::ItemBool::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemBool::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readBoolEntry( mKey, mDefault );
@@ -154,25 +154,25 @@ void KConfigSkeleton::ItemBool::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemBool::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemBool::setProperty(const TQVariant & p)
 {
   mReference = p.toBool();
 }
 
-TQVariant KConfigSkeleton::ItemBool::property() const
+TQVariant TDEConfigSkeleton::ItemBool::property() const
 {
   return TQVariant( mReference, 42 /* dummy */ );
 }
 
 
-KConfigSkeleton::ItemInt::ItemInt( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemInt::ItemInt( const TQString &group, const TQString &key,
                               int &reference, int defaultValue )
-  : KConfigSkeletonGenericItem<int>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<int>( group, key, reference, defaultValue )
   ,mHasMin(false), mHasMax(false)
 {
 }
 
-void KConfigSkeleton::ItemInt::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemInt::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readNumEntry( mKey, mDefault );
@@ -185,51 +185,51 @@ void KConfigSkeleton::ItemInt::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemInt::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemInt::setProperty(const TQVariant & p)
 {
   mReference = p.toInt();
 }
 
-TQVariant KConfigSkeleton::ItemInt::property() const
+TQVariant TDEConfigSkeleton::ItemInt::property() const
 {
   return TQVariant(mReference);
 }
 
-TQVariant KConfigSkeleton::ItemInt::minValue() const
+TQVariant TDEConfigSkeleton::ItemInt::minValue() const
 {
   if (mHasMin)
     return TQVariant(mMin);
   return TQVariant();
 }
 
-TQVariant KConfigSkeleton::ItemInt::maxValue() const
+TQVariant TDEConfigSkeleton::ItemInt::maxValue() const
 {
   if (mHasMax)
     return TQVariant(mMax);
   return TQVariant();
 }
 
-void KConfigSkeleton::ItemInt::setMinValue(int v)
+void TDEConfigSkeleton::ItemInt::setMinValue(int v)
 {
   mHasMin = true;
   mMin = v;
 }
 
-void KConfigSkeleton::ItemInt::setMaxValue(int v)
+void TDEConfigSkeleton::ItemInt::setMaxValue(int v)
 {
   mHasMax = true;
   mMax = v;
 }
 
 
-KConfigSkeleton::ItemInt64::ItemInt64( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemInt64::ItemInt64( const TQString &group, const TQString &key,
                               TQ_INT64 &reference, TQ_INT64 defaultValue )
-  : KConfigSkeletonGenericItem<TQ_INT64>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<TQ_INT64>( group, key, reference, defaultValue )
   ,mHasMin(false), mHasMax(false)
 {
 }
 
-void KConfigSkeleton::ItemInt64::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemInt64::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readNum64Entry( mKey, mDefault );
@@ -242,43 +242,43 @@ void KConfigSkeleton::ItemInt64::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemInt64::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemInt64::setProperty(const TQVariant & p)
 {
   mReference = p.toLongLong();
 }
 
-TQVariant KConfigSkeleton::ItemInt64::property() const
+TQVariant TDEConfigSkeleton::ItemInt64::property() const
 {
   return TQVariant(mReference);
 }
 
-TQVariant KConfigSkeleton::ItemInt64::minValue() const
+TQVariant TDEConfigSkeleton::ItemInt64::minValue() const
 {
   if (mHasMin)
     return TQVariant(mMin);
   return TQVariant();
 }
 
-TQVariant KConfigSkeleton::ItemInt64::maxValue() const
+TQVariant TDEConfigSkeleton::ItemInt64::maxValue() const
 {
   if (mHasMax)
     return TQVariant(mMax);
   return TQVariant();
 }
 
-void KConfigSkeleton::ItemInt64::setMinValue(TQ_INT64 v)
+void TDEConfigSkeleton::ItemInt64::setMinValue(TQ_INT64 v)
 {
   mHasMin = true;
   mMin = v;
 }
 
-void KConfigSkeleton::ItemInt64::setMaxValue(TQ_INT64 v)
+void TDEConfigSkeleton::ItemInt64::setMaxValue(TQ_INT64 v)
 {
   mHasMax = true;
   mMax = v;
 }
 
-KConfigSkeleton::ItemEnum::ItemEnum( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemEnum::ItemEnum( const TQString &group, const TQString &key,
                                      int &reference,
                                      const TQValueList<Choice> &choices,
                                      int defaultValue )
@@ -286,7 +286,7 @@ KConfigSkeleton::ItemEnum::ItemEnum( const TQString &group, const TQString &key,
 {
 }
 
-void KConfigSkeleton::ItemEnum::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemEnum::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   if (!config->hasKey(mKey))
@@ -315,7 +315,7 @@ void KConfigSkeleton::ItemEnum::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemEnum::writeConfig( KConfig *config )
+void TDEConfigSkeleton::ItemEnum::writeConfig( TDEConfig *config )
 {
   if ( mReference != mLoadedValue ) // WABA: Is this test needed?
   {
@@ -329,21 +329,21 @@ void KConfigSkeleton::ItemEnum::writeConfig( KConfig *config )
   }
 }
 
-TQValueList<KConfigSkeleton::ItemEnum::Choice> KConfigSkeleton::ItemEnum::choices() const
+TQValueList<TDEConfigSkeleton::ItemEnum::Choice> TDEConfigSkeleton::ItemEnum::choices() const
 {
   return mChoices;
 }
 
 
-KConfigSkeleton::ItemUInt::ItemUInt( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemUInt::ItemUInt( const TQString &group, const TQString &key,
                                 unsigned int &reference,
                                 unsigned int defaultValue )
-  : KConfigSkeletonGenericItem<unsigned int>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<unsigned int>( group, key, reference, defaultValue )
   ,mHasMin(false), mHasMax(false)
 {
 }
 
-void KConfigSkeleton::ItemUInt::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemUInt::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readUnsignedNumEntry( mKey, mDefault );
@@ -356,51 +356,51 @@ void KConfigSkeleton::ItemUInt::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemUInt::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemUInt::setProperty(const TQVariant & p)
 {
   mReference = p.toUInt();
 }
 
-TQVariant KConfigSkeleton::ItemUInt::property() const
+TQVariant TDEConfigSkeleton::ItemUInt::property() const
 {
   return TQVariant(mReference);
 }
 
-TQVariant KConfigSkeleton::ItemUInt::minValue() const
+TQVariant TDEConfigSkeleton::ItemUInt::minValue() const
 {
   if (mHasMin)
     return TQVariant(mMin);
   return TQVariant();
 }
 
-TQVariant KConfigSkeleton::ItemUInt::maxValue() const
+TQVariant TDEConfigSkeleton::ItemUInt::maxValue() const
 {
   if (mHasMax)
     return TQVariant(mMax);
   return TQVariant();
 }
 
-void KConfigSkeleton::ItemUInt::setMinValue(unsigned int v)
+void TDEConfigSkeleton::ItemUInt::setMinValue(unsigned int v)
 {
   mHasMin = true;
   mMin = v;
 }
 
-void KConfigSkeleton::ItemUInt::setMaxValue(unsigned int v)
+void TDEConfigSkeleton::ItemUInt::setMaxValue(unsigned int v)
 {
   mHasMax = true;
   mMax = v;
 }
 
 
-KConfigSkeleton::ItemUInt64::ItemUInt64( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemUInt64::ItemUInt64( const TQString &group, const TQString &key,
                               TQ_UINT64 &reference, TQ_UINT64 defaultValue )
-  : KConfigSkeletonGenericItem<TQ_UINT64>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<TQ_UINT64>( group, key, reference, defaultValue )
   ,mHasMin(false), mHasMax(false)
 {
 }
 
-void KConfigSkeleton::ItemUInt64::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemUInt64::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readUnsignedNum64Entry( mKey, mDefault );
@@ -413,50 +413,50 @@ void KConfigSkeleton::ItemUInt64::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemUInt64::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemUInt64::setProperty(const TQVariant & p)
 {
   mReference = p.toULongLong();
 }
 
-TQVariant KConfigSkeleton::ItemUInt64::property() const
+TQVariant TDEConfigSkeleton::ItemUInt64::property() const
 {
   return TQVariant(mReference);
 }
 
-TQVariant KConfigSkeleton::ItemUInt64::minValue() const
+TQVariant TDEConfigSkeleton::ItemUInt64::minValue() const
 {
   if (mHasMin)
     return TQVariant(mMin);
   return TQVariant();
 }
 
-TQVariant KConfigSkeleton::ItemUInt64::maxValue() const
+TQVariant TDEConfigSkeleton::ItemUInt64::maxValue() const
 {
   if (mHasMax)
     return TQVariant(mMax);
   return TQVariant();
 }
 
-void KConfigSkeleton::ItemUInt64::setMinValue(TQ_UINT64 v)
+void TDEConfigSkeleton::ItemUInt64::setMinValue(TQ_UINT64 v)
 {
   mHasMin = true;
   mMin = v;
 }
 
-void KConfigSkeleton::ItemUInt64::setMaxValue(TQ_UINT64 v)
+void TDEConfigSkeleton::ItemUInt64::setMaxValue(TQ_UINT64 v)
 {
   mHasMax = true;
   mMax = v;
 }
 
-KConfigSkeleton::ItemLong::ItemLong( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemLong::ItemLong( const TQString &group, const TQString &key,
                                 long &reference, long defaultValue )
-  : KConfigSkeletonGenericItem<long>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<long>( group, key, reference, defaultValue )
   ,mHasMin(false), mHasMax(false)
 {
 }
 
-void KConfigSkeleton::ItemLong::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemLong::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readLongNumEntry( mKey, mDefault );
@@ -469,52 +469,52 @@ void KConfigSkeleton::ItemLong::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemLong::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemLong::setProperty(const TQVariant & p)
 {
   mReference = p.toLongLong();
 }
 
-TQVariant KConfigSkeleton::ItemLong::property() const
+TQVariant TDEConfigSkeleton::ItemLong::property() const
 {
   return TQVariant((TQ_LLONG) mReference);
 }
 
-TQVariant KConfigSkeleton::ItemLong::minValue() const
+TQVariant TDEConfigSkeleton::ItemLong::minValue() const
 {
   if (mHasMin)
     return TQVariant((TQ_LLONG) mMin);
   return TQVariant();
 }
 
-TQVariant KConfigSkeleton::ItemLong::maxValue() const
+TQVariant TDEConfigSkeleton::ItemLong::maxValue() const
 {
   if (mHasMax)
     return TQVariant((TQ_LLONG) mMax);
   return TQVariant();
 }
 
-void KConfigSkeleton::ItemLong::setMinValue(long v)
+void TDEConfigSkeleton::ItemLong::setMinValue(long v)
 {
   mHasMin = true;
   mMin = v;
 }
 
-void KConfigSkeleton::ItemLong::setMaxValue(long v)
+void TDEConfigSkeleton::ItemLong::setMaxValue(long v)
 {
   mHasMax = true;
   mMax = v;
 }
 
 
-KConfigSkeleton::ItemULong::ItemULong( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemULong::ItemULong( const TQString &group, const TQString &key,
                                   unsigned long &reference,
                                   unsigned long defaultValue )
-  : KConfigSkeletonGenericItem<unsigned long>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<unsigned long>( group, key, reference, defaultValue )
   ,mHasMin(false), mHasMax(false)
 {
 }
 
-void KConfigSkeleton::ItemULong::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemULong::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readUnsignedLongNumEntry( mKey, mDefault );
@@ -527,51 +527,51 @@ void KConfigSkeleton::ItemULong::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemULong::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemULong::setProperty(const TQVariant & p)
 {
   mReference = p.toULongLong();
 }
 
-TQVariant KConfigSkeleton::ItemULong::property() const
+TQVariant TDEConfigSkeleton::ItemULong::property() const
 {
   return TQVariant((TQ_ULLONG) mReference);
 }
 
-TQVariant KConfigSkeleton::ItemULong::minValue() const
+TQVariant TDEConfigSkeleton::ItemULong::minValue() const
 {
   if (mHasMin)
     return TQVariant((TQ_ULLONG) mMin);
   return TQVariant();
 }
 
-TQVariant KConfigSkeleton::ItemULong::maxValue() const
+TQVariant TDEConfigSkeleton::ItemULong::maxValue() const
 {
   if (mHasMax)
     return TQVariant((TQ_ULLONG) mMax);
   return TQVariant();
 }
 
-void KConfigSkeleton::ItemULong::setMinValue(unsigned long v)
+void TDEConfigSkeleton::ItemULong::setMinValue(unsigned long v)
 {
   mHasMin = true;
   mMin = v;
 }
 
-void KConfigSkeleton::ItemULong::setMaxValue(unsigned long v)
+void TDEConfigSkeleton::ItemULong::setMaxValue(unsigned long v)
 {
   mHasMax = true;
   mMax = v;
 }
 
 
-KConfigSkeleton::ItemDouble::ItemDouble( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemDouble::ItemDouble( const TQString &group, const TQString &key,
                                     double &reference, double defaultValue )
-  : KConfigSkeletonGenericItem<double>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<double>( group, key, reference, defaultValue )
   ,mHasMin(false), mHasMax(false)
 {
 }
 
-void KConfigSkeleton::ItemDouble::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemDouble::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readDoubleNumEntry( mKey, mDefault );
@@ -584,51 +584,51 @@ void KConfigSkeleton::ItemDouble::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemDouble::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemDouble::setProperty(const TQVariant & p)
 {
   mReference = p.toDouble();
 }
 
-TQVariant KConfigSkeleton::ItemDouble::property() const
+TQVariant TDEConfigSkeleton::ItemDouble::property() const
 {
   return TQVariant(mReference);
 }
 
-TQVariant KConfigSkeleton::ItemDouble::minValue() const
+TQVariant TDEConfigSkeleton::ItemDouble::minValue() const
 {
   if (mHasMin)
     return TQVariant(mMin);
   return TQVariant();
 }
 
-TQVariant KConfigSkeleton::ItemDouble::maxValue() const
+TQVariant TDEConfigSkeleton::ItemDouble::maxValue() const
 {
   if (mHasMax)
     return TQVariant(mMax);
   return TQVariant();
 }
 
-void KConfigSkeleton::ItemDouble::setMinValue(double v)
+void TDEConfigSkeleton::ItemDouble::setMinValue(double v)
 {
   mHasMin = true;
   mMin = v;
 }
 
-void KConfigSkeleton::ItemDouble::setMaxValue(double v)
+void TDEConfigSkeleton::ItemDouble::setMaxValue(double v)
 {
   mHasMax = true;
   mMax = v;
 }
 
 
-KConfigSkeleton::ItemColor::ItemColor( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemColor::ItemColor( const TQString &group, const TQString &key,
                                   TQColor &reference,
                                   const TQColor &defaultValue )
-  : KConfigSkeletonGenericItem<TQColor>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<TQColor>( group, key, reference, defaultValue )
 {
 }
 
-void KConfigSkeleton::ItemColor::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemColor::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readColorEntry( mKey, &mDefault );
@@ -637,25 +637,25 @@ void KConfigSkeleton::ItemColor::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemColor::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemColor::setProperty(const TQVariant & p)
 {
   mReference = p.toColor();
 }
 
-TQVariant KConfigSkeleton::ItemColor::property() const
+TQVariant TDEConfigSkeleton::ItemColor::property() const
 {
   return TQVariant(mReference);
 }
 
 
-KConfigSkeleton::ItemFont::ItemFont( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemFont::ItemFont( const TQString &group, const TQString &key,
                                 TQFont &reference,
                                 const TQFont &defaultValue )
-  : KConfigSkeletonGenericItem<TQFont>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<TQFont>( group, key, reference, defaultValue )
 {
 }
 
-void KConfigSkeleton::ItemFont::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemFont::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readFontEntry( mKey, &mDefault );
@@ -664,25 +664,25 @@ void KConfigSkeleton::ItemFont::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemFont::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemFont::setProperty(const TQVariant & p)
 {
   mReference = p.toFont();
 }
 
-TQVariant KConfigSkeleton::ItemFont::property() const
+TQVariant TDEConfigSkeleton::ItemFont::property() const
 {
   return TQVariant(mReference);
 }
 
 
-KConfigSkeleton::ItemRect::ItemRect( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemRect::ItemRect( const TQString &group, const TQString &key,
                                 TQRect &reference,
                                 const TQRect &defaultValue )
-  : KConfigSkeletonGenericItem<TQRect>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<TQRect>( group, key, reference, defaultValue )
 {
 }
 
-void KConfigSkeleton::ItemRect::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemRect::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readRectEntry( mKey, &mDefault );
@@ -691,25 +691,25 @@ void KConfigSkeleton::ItemRect::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemRect::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemRect::setProperty(const TQVariant & p)
 {
   mReference = p.toRect();
 }
 
-TQVariant KConfigSkeleton::ItemRect::property() const
+TQVariant TDEConfigSkeleton::ItemRect::property() const
 {
   return TQVariant(mReference);
 }
 
 
-KConfigSkeleton::ItemPoint::ItemPoint( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemPoint::ItemPoint( const TQString &group, const TQString &key,
                                   TQPoint &reference,
                                   const TQPoint &defaultValue )
-  : KConfigSkeletonGenericItem<TQPoint>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<TQPoint>( group, key, reference, defaultValue )
 {
 }
 
-void KConfigSkeleton::ItemPoint::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemPoint::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readPointEntry( mKey, &mDefault );
@@ -718,25 +718,25 @@ void KConfigSkeleton::ItemPoint::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemPoint::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemPoint::setProperty(const TQVariant & p)
 {
   mReference = p.toPoint();
 }
 
-TQVariant KConfigSkeleton::ItemPoint::property() const
+TQVariant TDEConfigSkeleton::ItemPoint::property() const
 {
   return TQVariant(mReference);
 }
 
 
-KConfigSkeleton::ItemSize::ItemSize( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemSize::ItemSize( const TQString &group, const TQString &key,
                                 TQSize &reference,
                                 const TQSize &defaultValue )
-  : KConfigSkeletonGenericItem<TQSize>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<TQSize>( group, key, reference, defaultValue )
 {
 }
 
-void KConfigSkeleton::ItemSize::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemSize::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readSizeEntry( mKey, &mDefault );
@@ -745,25 +745,25 @@ void KConfigSkeleton::ItemSize::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemSize::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemSize::setProperty(const TQVariant & p)
 {
   mReference = p.toSize();
 }
 
-TQVariant KConfigSkeleton::ItemSize::property() const
+TQVariant TDEConfigSkeleton::ItemSize::property() const
 {
   return TQVariant(mReference);
 }
 
 
-KConfigSkeleton::ItemDateTime::ItemDateTime( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemDateTime::ItemDateTime( const TQString &group, const TQString &key,
                                         TQDateTime &reference,
                                         const TQDateTime &defaultValue )
-  : KConfigSkeletonGenericItem<TQDateTime>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<TQDateTime>( group, key, reference, defaultValue )
 {
 }
 
-void KConfigSkeleton::ItemDateTime::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemDateTime::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readDateTimeEntry( mKey, &mDefault );
@@ -772,25 +772,25 @@ void KConfigSkeleton::ItemDateTime::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemDateTime::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemDateTime::setProperty(const TQVariant & p)
 {
   mReference = p.toDateTime();
 }
 
-TQVariant KConfigSkeleton::ItemDateTime::property() const
+TQVariant TDEConfigSkeleton::ItemDateTime::property() const
 {
   return TQVariant(mReference);
 }
 
 
-KConfigSkeleton::ItemStringList::ItemStringList( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemStringList::ItemStringList( const TQString &group, const TQString &key,
                                             TQStringList &reference,
                                             const TQStringList &defaultValue )
-  : KConfigSkeletonGenericItem<TQStringList>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<TQStringList>( group, key, reference, defaultValue )
 {
 }
 
-void KConfigSkeleton::ItemStringList::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemStringList::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   if ( !config->hasKey( mKey ) )
@@ -802,25 +802,25 @@ void KConfigSkeleton::ItemStringList::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemStringList::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemStringList::setProperty(const TQVariant & p)
 {
   mReference = p.toStringList();
 }
 
-TQVariant KConfigSkeleton::ItemStringList::property() const
+TQVariant TDEConfigSkeleton::ItemStringList::property() const
 {
   return TQVariant(mReference);
 }
 
 
-KConfigSkeleton::ItemPathList::ItemPathList( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemPathList::ItemPathList( const TQString &group, const TQString &key,
                                             TQStringList &reference,
                                             const TQStringList &defaultValue )
   : ItemStringList( group, key, reference, defaultValue )
 {
 }
 
-void KConfigSkeleton::ItemPathList::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemPathList::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   if ( !config->hasKey( mKey ) )
@@ -832,7 +832,7 @@ void KConfigSkeleton::ItemPathList::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemPathList::writeConfig( KConfig *config )
+void TDEConfigSkeleton::ItemPathList::writeConfig( TDEConfig *config )
 {
   if ( mReference != mLoadedValue ) // WABA: Is this test needed?
   {
@@ -847,14 +847,14 @@ void KConfigSkeleton::ItemPathList::writeConfig( KConfig *config )
 }
 
 
-KConfigSkeleton::ItemIntList::ItemIntList( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemIntList::ItemIntList( const TQString &group, const TQString &key,
                                       TQValueList<int> &reference,
                                       const TQValueList<int> &defaultValue )
-  : KConfigSkeletonGenericItem<TQValueList<int> >( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<TQValueList<int> >( group, key, reference, defaultValue )
 {
 }
 
-void KConfigSkeleton::ItemIntList::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemIntList::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   if ( !config->hasKey( mKey ) )
@@ -866,22 +866,22 @@ void KConfigSkeleton::ItemIntList::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemIntList::setProperty(const TQVariant &)
+void TDEConfigSkeleton::ItemIntList::setProperty(const TQVariant &)
 {
   // TODO: Not yet supported
 }
 
-TQVariant KConfigSkeleton::ItemIntList::property() const
+TQVariant TDEConfigSkeleton::ItemIntList::property() const
 {
   // TODO: Not yet supported
   return TQVariant();  
 }
 
 
-KConfigSkeleton::KConfigSkeleton( const TQString &configname )
+TDEConfigSkeleton::TDEConfigSkeleton( const TQString &configname )
   : mCurrentGroup( "No Group" ), mUseDefaults(false)
 {
-  kdDebug(177) << "Creating KConfigSkeleton (" << (void *)this << ")" << endl;
+  kdDebug(177) << "Creating TDEConfigSkeleton (" << (void *)this << ")" << endl;
 
   if ( !configname.isEmpty() )
   {
@@ -893,40 +893,40 @@ KConfigSkeleton::KConfigSkeleton( const TQString &configname )
   }
 }
 
-KConfigSkeleton::KConfigSkeleton(KSharedConfig::Ptr config)
+TDEConfigSkeleton::TDEConfigSkeleton(KSharedConfig::Ptr config)
   : mCurrentGroup( "No Group" ), mUseDefaults(false)
 {
-  kdDebug(177) << "Creating KConfigSkeleton (" << (void *)this << ")" << endl;
+  kdDebug(177) << "Creating TDEConfigSkeleton (" << (void *)this << ")" << endl;
   mConfig = config;
 }
 
 
-KConfigSkeleton::~KConfigSkeleton()
+TDEConfigSkeleton::~TDEConfigSkeleton()
 {
-  KConfigSkeletonItem::List::ConstIterator it;
+  TDEConfigSkeletonItem::List::ConstIterator it;
   for( it = mItems.begin(); it != mItems.end(); ++it )
   {
     delete *it;
   }
 }
 
-void KConfigSkeleton::setCurrentGroup( const TQString &group )
+void TDEConfigSkeleton::setCurrentGroup( const TQString &group )
 {
   mCurrentGroup = group;
 }
 
-KConfig *KConfigSkeleton::config() const
+TDEConfig *TDEConfigSkeleton::config() const
 {
   return mConfig;
 }
 
-bool KConfigSkeleton::useDefaults(bool b)
+bool TDEConfigSkeleton::useDefaults(bool b)
 {
   if (b == mUseDefaults)
      return mUseDefaults;
 
   mUseDefaults = b;
-  KConfigSkeletonItem::List::ConstIterator it;
+  TDEConfigSkeletonItem::List::ConstIterator it;
   for( it = mItems.begin(); it != mItems.end(); ++it )
   {
     (*it)->swapDefault();
@@ -936,9 +936,9 @@ bool KConfigSkeleton::useDefaults(bool b)
   return !mUseDefaults;
 }
 
-void KConfigSkeleton::setDefaults()
+void TDEConfigSkeleton::setDefaults()
 {
-  KConfigSkeletonItem::List::ConstIterator it;
+  TDEConfigSkeletonItem::List::ConstIterator it;
   for( it = mItems.begin(); it != mItems.end(); ++it ) {
     (*it)->setDefault();
   }
@@ -946,14 +946,14 @@ void KConfigSkeleton::setDefaults()
   usrSetDefaults();
 }
 
-void KConfigSkeleton::readConfig()
+void TDEConfigSkeleton::readConfig()
 {
-  kdDebug(177) << "KConfigSkeleton::readConfig()" << endl;
+  kdDebug(177) << "TDEConfigSkeleton::readConfig()" << endl;
   
   TQString origGroup = mConfig->group();
 
   mConfig->reparseConfiguration();
-  KConfigSkeletonItem::List::ConstIterator it;
+  TDEConfigSkeletonItem::List::ConstIterator it;
   for( it = mItems.begin(); it != mItems.end(); ++it )
   {
     (*it)->readConfig( mConfig );
@@ -964,13 +964,13 @@ void KConfigSkeleton::readConfig()
   mConfig->setGroup(origGroup);
 }
 
-void KConfigSkeleton::writeConfig()
+void TDEConfigSkeleton::writeConfig()
 {
-  kdDebug(177) << "KConfigSkeleton::writeConfig()" << endl;
+  kdDebug(177) << "TDEConfigSkeleton::writeConfig()" << endl;
 
   TQString origGroup = mConfig->group();
 
-  KConfigSkeletonItem::List::ConstIterator it;
+  TDEConfigSkeletonItem::List::ConstIterator it;
   for( it = mItems.begin(); it != mItems.end(); ++it )
   {
     (*it)->writeConfig( mConfig );
@@ -985,7 +985,7 @@ void KConfigSkeleton::writeConfig()
   mConfig->setGroup(origGroup);
 }
 
-void KConfigSkeleton::addItem( KConfigSkeletonItem *item, const TQString &name )
+void TDEConfigSkeleton::addItem( TDEConfigSkeletonItem *item, const TQString &name )
 {
   item->setName( name.isEmpty() ? item->key() : name );
   mItems.append( item );
@@ -994,214 +994,214 @@ void KConfigSkeleton::addItem( KConfigSkeletonItem *item, const TQString &name )
   item->readConfig( mConfig );
 }
 
-KConfigSkeleton::ItemString *KConfigSkeleton::addItemString( const TQString &name, TQString &reference,
+TDEConfigSkeleton::ItemString *TDEConfigSkeleton::addItemString( const TQString &name, TQString &reference,
                                      const TQString &defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemString *item;
-  item = new KConfigSkeleton::ItemString( mCurrentGroup, key.isEmpty() ? name : key,
+  TDEConfigSkeleton::ItemString *item;
+  item = new TDEConfigSkeleton::ItemString( mCurrentGroup, key.isEmpty() ? name : key,
                                           reference, defaultValue,
-                                          KConfigSkeleton::ItemString::Normal );
+                                          TDEConfigSkeleton::ItemString::Normal );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemPassword *KConfigSkeleton::addItemPassword( const TQString &name, TQString &reference,
+TDEConfigSkeleton::ItemPassword *TDEConfigSkeleton::addItemPassword( const TQString &name, TQString &reference,
                                        const TQString &defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemPassword *item;
-  item = new KConfigSkeleton::ItemPassword( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemPassword *item;
+  item = new TDEConfigSkeleton::ItemPassword( mCurrentGroup, key.isNull() ? name : key,
                                           reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemPath *KConfigSkeleton::addItemPath( const TQString &name, TQString &reference,
+TDEConfigSkeleton::ItemPath *TDEConfigSkeleton::addItemPath( const TQString &name, TQString &reference,
                                    const TQString &defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemPath *item;
-  item = new KConfigSkeleton::ItemPath( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemPath *item;
+  item = new TDEConfigSkeleton::ItemPath( mCurrentGroup, key.isNull() ? name : key,
                                         reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemProperty *KConfigSkeleton::addItemProperty( const TQString &name, TQVariant &reference,
+TDEConfigSkeleton::ItemProperty *TDEConfigSkeleton::addItemProperty( const TQString &name, TQVariant &reference,
                                        const TQVariant &defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemProperty *item;
-  item = new KConfigSkeleton::ItemProperty( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemProperty *item;
+  item = new TDEConfigSkeleton::ItemProperty( mCurrentGroup, key.isNull() ? name : key,
                                             reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemBool *KConfigSkeleton::addItemBool( const TQString &name, bool &reference,
+TDEConfigSkeleton::ItemBool *TDEConfigSkeleton::addItemBool( const TQString &name, bool &reference,
                                    bool defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemBool *item;
-  item = new KConfigSkeleton::ItemBool( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemBool *item;
+  item = new TDEConfigSkeleton::ItemBool( mCurrentGroup, key.isNull() ? name : key,
                                         reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemInt *KConfigSkeleton::addItemInt( const TQString &name, int &reference,
+TDEConfigSkeleton::ItemInt *TDEConfigSkeleton::addItemInt( const TQString &name, int &reference,
                                   int defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemInt *item;
-  item = new KConfigSkeleton::ItemInt( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemInt *item;
+  item = new TDEConfigSkeleton::ItemInt( mCurrentGroup, key.isNull() ? name : key,
                                        reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemUInt *KConfigSkeleton::addItemUInt( const TQString &name, unsigned int &reference,
+TDEConfigSkeleton::ItemUInt *TDEConfigSkeleton::addItemUInt( const TQString &name, unsigned int &reference,
                                    unsigned int defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemUInt *item;
-  item = new KConfigSkeleton::ItemUInt( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemUInt *item;
+  item = new TDEConfigSkeleton::ItemUInt( mCurrentGroup, key.isNull() ? name : key,
                                         reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemInt64 *KConfigSkeleton::addItemInt64( const TQString &name, TQ_INT64 &reference,
+TDEConfigSkeleton::ItemInt64 *TDEConfigSkeleton::addItemInt64( const TQString &name, TQ_INT64 &reference,
                                     TQ_INT64 defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemInt64 *item;
-  item = new KConfigSkeleton::ItemInt64( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemInt64 *item;
+  item = new TDEConfigSkeleton::ItemInt64( mCurrentGroup, key.isNull() ? name : key,
                                          reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemUInt64 *KConfigSkeleton::addItemUInt64( const TQString &name, TQ_UINT64 &reference,
+TDEConfigSkeleton::ItemUInt64 *TDEConfigSkeleton::addItemUInt64( const TQString &name, TQ_UINT64 &reference,
                                      TQ_UINT64 defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemUInt64 *item;
-  item = new KConfigSkeleton::ItemUInt64( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemUInt64 *item;
+  item = new TDEConfigSkeleton::ItemUInt64( mCurrentGroup, key.isNull() ? name : key,
                                           reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemLong *KConfigSkeleton::addItemLong( const TQString &name, long &reference,
+TDEConfigSkeleton::ItemLong *TDEConfigSkeleton::addItemLong( const TQString &name, long &reference,
                                    long defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemLong *item;
-  item = new KConfigSkeleton::ItemLong( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemLong *item;
+  item = new TDEConfigSkeleton::ItemLong( mCurrentGroup, key.isNull() ? name : key,
                                         reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemULong *KConfigSkeleton::addItemULong( const TQString &name, unsigned long &reference,
+TDEConfigSkeleton::ItemULong *TDEConfigSkeleton::addItemULong( const TQString &name, unsigned long &reference,
                                     unsigned long defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemULong *item;
-  item = new KConfigSkeleton::ItemULong( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemULong *item;
+  item = new TDEConfigSkeleton::ItemULong( mCurrentGroup, key.isNull() ? name : key,
                                          reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemDouble *KConfigSkeleton::addItemDouble( const TQString &name, double &reference,
+TDEConfigSkeleton::ItemDouble *TDEConfigSkeleton::addItemDouble( const TQString &name, double &reference,
                                      double defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemDouble *item;
-  item = new KConfigSkeleton::ItemDouble( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemDouble *item;
+  item = new TDEConfigSkeleton::ItemDouble( mCurrentGroup, key.isNull() ? name : key,
                                           reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemColor *KConfigSkeleton::addItemColor( const TQString &name, TQColor &reference,
+TDEConfigSkeleton::ItemColor *TDEConfigSkeleton::addItemColor( const TQString &name, TQColor &reference,
                                     const TQColor &defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemColor *item;
-  item = new KConfigSkeleton::ItemColor( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemColor *item;
+  item = new TDEConfigSkeleton::ItemColor( mCurrentGroup, key.isNull() ? name : key,
                                          reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemFont *KConfigSkeleton::addItemFont( const TQString &name, TQFont &reference,
+TDEConfigSkeleton::ItemFont *TDEConfigSkeleton::addItemFont( const TQString &name, TQFont &reference,
                                    const TQFont &defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemFont *item;
-  item = new KConfigSkeleton::ItemFont( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemFont *item;
+  item = new TDEConfigSkeleton::ItemFont( mCurrentGroup, key.isNull() ? name : key,
                                         reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemRect *KConfigSkeleton::addItemRect( const TQString &name, TQRect &reference,
+TDEConfigSkeleton::ItemRect *TDEConfigSkeleton::addItemRect( const TQString &name, TQRect &reference,
                                    const TQRect &defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemRect *item;
-  item = new KConfigSkeleton::ItemRect( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemRect *item;
+  item = new TDEConfigSkeleton::ItemRect( mCurrentGroup, key.isNull() ? name : key,
                                         reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemPoint *KConfigSkeleton::addItemPoint( const TQString &name, TQPoint &reference,
+TDEConfigSkeleton::ItemPoint *TDEConfigSkeleton::addItemPoint( const TQString &name, TQPoint &reference,
                                     const TQPoint &defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemPoint *item;
-  item = new KConfigSkeleton::ItemPoint( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemPoint *item;
+  item = new TDEConfigSkeleton::ItemPoint( mCurrentGroup, key.isNull() ? name : key,
                                          reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemSize *KConfigSkeleton::addItemSize( const TQString &name, TQSize &reference,
+TDEConfigSkeleton::ItemSize *TDEConfigSkeleton::addItemSize( const TQString &name, TQSize &reference,
                                    const TQSize &defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemSize *item;
-  item = new KConfigSkeleton::ItemSize( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemSize *item;
+  item = new TDEConfigSkeleton::ItemSize( mCurrentGroup, key.isNull() ? name : key,
                                         reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemDateTime *KConfigSkeleton::addItemDateTime( const TQString &name, TQDateTime &reference,
+TDEConfigSkeleton::ItemDateTime *TDEConfigSkeleton::addItemDateTime( const TQString &name, TQDateTime &reference,
                                        const TQDateTime &defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemDateTime *item;
-  item = new KConfigSkeleton::ItemDateTime( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemDateTime *item;
+  item = new TDEConfigSkeleton::ItemDateTime( mCurrentGroup, key.isNull() ? name : key,
                                             reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemStringList *KConfigSkeleton::addItemStringList( const TQString &name, TQStringList &reference,
+TDEConfigSkeleton::ItemStringList *TDEConfigSkeleton::addItemStringList( const TQString &name, TQStringList &reference,
                                          const TQStringList &defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemStringList *item;
-  item = new KConfigSkeleton::ItemStringList( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemStringList *item;
+  item = new TDEConfigSkeleton::ItemStringList( mCurrentGroup, key.isNull() ? name : key,
                                               reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemIntList *KConfigSkeleton::addItemIntList( const TQString &name, TQValueList<int> &reference,
+TDEConfigSkeleton::ItemIntList *TDEConfigSkeleton::addItemIntList( const TQString &name, TQValueList<int> &reference,
                                       const TQValueList<int> &defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemIntList *item;
-  item = new KConfigSkeleton::ItemIntList( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemIntList *item;
+  item = new TDEConfigSkeleton::ItemIntList( mCurrentGroup, key.isNull() ? name : key,
                                            reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-bool KConfigSkeleton::isImmutable(const TQString &name)
+bool TDEConfigSkeleton::isImmutable(const TQString &name)
 {
-  KConfigSkeletonItem *item = findItem(name);
+  TDEConfigSkeletonItem *item = findItem(name);
   return !item || item->isImmutable();
 }
 
-KConfigSkeletonItem *KConfigSkeleton::findItem(const TQString &name)
+TDEConfigSkeletonItem *TDEConfigSkeleton::findItem(const TQString &name)
 {
   return mItemDict.find(name);
 }
diff --git a/tdecore/kconfigskeleton.h b/tdecore/kconfigskeleton.h
index 3ad18d958..30dc98841 100644
--- a/tdecore/kconfigskeleton.h
+++ b/tdecore/kconfigskeleton.h
@@ -39,20 +39,20 @@
   /**
    * @short Class for storing a preferences setting
    * @author Cornelius Schumacher
-   * @see KConfigSkeleton
+   * @see TDEConfigSkeleton
    * 
-   * This class represents one preferences setting as used by @ref KConfigSkeleton.
-   * Subclasses of KConfigSkeletonItem implement storage functions for a certain type of
+   * This class represents one preferences setting as used by @ref TDEConfigSkeleton.
+   * Subclasses of TDEConfigSkeletonItem implement storage functions for a certain type of
    * setting. Normally you don't have to use this class directly. Use the special
-   * addItem() functions of KConfigSkeleton instead. If you subclass this class you will
-   * have to register instances with the function KConfigSkeleton::addItem().
+   * addItem() functions of TDEConfigSkeleton instead. If you subclass this class you will
+   * have to register instances with the function TDEConfigSkeleton::addItem().
    */
-  class TDECORE_EXPORT KConfigSkeletonItem
+  class TDECORE_EXPORT TDEConfigSkeletonItem
   {
   public:
-    typedef TQValueList < KConfigSkeletonItem * >List;
-    typedef TQDict < KConfigSkeletonItem > Dict;
-    typedef TQDictIterator < KConfigSkeletonItem > DictIterator;
+    typedef TQValueList < TDEConfigSkeletonItem * >List;
+    typedef TQDict < TDEConfigSkeletonItem > Dict;
+    typedef TQDictIterator < TDEConfigSkeletonItem > DictIterator;
 
     /**
      * Constructor.
@@ -60,7 +60,7 @@
      * @param group Config file group.
      * @param key Config file key.
      */
-    KConfigSkeletonItem(const TQString & group, const TQString & key)
+    TDEConfigSkeletonItem(const TQString & group, const TQString & key)
       :mGroup(group),mKey(key), mIsImmutable(true)
     {
     }
@@ -68,7 +68,7 @@
     /**
      * Destructor.
      */
-    virtual ~KConfigSkeletonItem()
+    virtual ~TDEConfigSkeletonItem()
     {
     }
 
@@ -153,22 +153,22 @@
     }
 
     /**
-     * This function is called by @ref KConfigSkeleton to read the value for this setting
+     * This function is called by @ref TDEConfigSkeleton to read the value for this setting
      * from a config file.
      * value.
      */
-    virtual void readConfig(KConfig *) = 0;
+    virtual void readConfig(TDEConfig *) = 0;
 
     /**
-     * This function is called by @ref KConfigSkeleton to write the value of this setting
+     * This function is called by @ref TDEConfigSkeleton to write the value of this setting
      * to a config file.
      */
-    virtual void writeConfig(KConfig *) = 0;
+    virtual void writeConfig(TDEConfig *) = 0;
 
     /**
      * Read global default value.
      */
-    virtual void readDefault(KConfig *) = 0;
+    virtual void readDefault(TDEConfig *) = 0;
 
     /**
      * Set item to @p p
@@ -197,7 +197,7 @@
 
     /**
      * Exchanges the current value with the default value
-     * Used by KConfigSkeleton::useDefaults(bool);
+     * Used by TDEConfigSkeleton::useDefaults(bool);
      */
     virtual void swapDefault() = 0;
 
@@ -212,9 +212,9 @@
   protected:
     /**
      * sets mIsImmutable to true if mKey in config is immutable
-     * @param config KConfig to check if mKey is immutable in
+     * @param config TDEConfig to check if mKey is immutable in
      */
-    void readImmutability(KConfig *config);
+    void readImmutability(TDEConfig *config);
 
     TQString mGroup;
     TQString mKey;
@@ -228,18 +228,18 @@
   };
 
 
-template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonItem
+template < typename T > class TDEConfigSkeletonGenericItem:public TDEConfigSkeletonItem
   {
   public:
-    KConfigSkeletonGenericItem(const TQString & group, const TQString & key, T & reference,
+    TDEConfigSkeletonGenericItem(const TQString & group, const TQString & key, T & reference,
                 T defaultValue)
-      : KConfigSkeletonItem(group, key), mReference(reference),
+      : TDEConfigSkeletonItem(group, key), mReference(reference),
         mDefault(defaultValue), mLoadedValue(defaultValue)
     {
     }
 
     /**
-     * Set value of this KConfigSkeletonItem.
+     * Set value of this TDEConfigSkeletonItem.
      */
     void setValue(const T & v)
     {
@@ -247,7 +247,7 @@ template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonI
     }
 
     /**
-     * Return value of this KConfigSkeletonItem.
+     * Return value of this TDEConfigSkeletonItem.
      */
     T & value()
     {
@@ -255,7 +255,7 @@ template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonI
     }
 
     /**
-     * Return const value of this KConfigSkeletonItem.
+     * Return const value of this TDEConfigSkeletonItem.
      */
     const T & value() const
     {
@@ -275,7 +275,7 @@ template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonI
       mReference = mDefault;
     }
 
-    virtual void writeConfig(KConfig * config)
+    virtual void writeConfig(TDEConfig * config)
     {
       if ( mReference != mLoadedValue ) // Is this needed?
       {
@@ -287,7 +287,7 @@ template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonI
       }
     }
 
-    void readDefault(KConfig * config)
+    void readDefault(TDEConfig * config)
     {
       config->setReadDefaults(true);
       readConfig(config);
@@ -311,19 +311,19 @@ template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonI
   /**
    * @short Class for handling preferences settings for an application.
    * @author Cornelius Schumacher
-   * @see KConfigSkeletonItem
+   * @see TDEConfigSkeletonItem
    * 
    * This class provides an interface to preferences settings. Preferences items
    * can be registered by the addItem() function corresponding to the data type of
-   * the seetting. KConfigSkeleton then handles reading and writing of config files and
+   * the seetting. TDEConfigSkeleton then handles reading and writing of config files and
    * setting of default values.
    * 
-   * Normally you will subclass KConfigSkeleton, add data members for the preferences
+   * Normally you will subclass TDEConfigSkeleton, add data members for the preferences
    * settings and register the members in the constructor of the subclass.
    * 
    * Example:
    * \code
-   * class MyPrefs : public KConfigSkeleton
+   * class MyPrefs : public TDEConfigSkeleton
    * {
    *   public:
    *     MyPrefs()
@@ -342,9 +342,9 @@ template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonI
    * }
    * \endcode
    * 
-   * It might be convenient in many cases to make this subclass of KConfigSkeleton a
+   * It might be convenient in many cases to make this subclass of TDEConfigSkeleton a
    * singleton for global access from all over the application without passing
-   * references to the KConfigSkeleton object around.
+   * references to the TDEConfigSkeleton object around.
    * 
    * You can write the data to the configuration file by calling @ref writeConfig()
    * and read the data from the configuration file by calling @ref readConfig().
@@ -355,21 +355,21 @@ template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonI
    * @ref usrWriteConfig().
    * 
    * Internally preferences settings are stored in instances of subclasses of
-   * @ref KConfigSkeletonItem. You can also add KConfigSkeletonItem subclasses 
+   * @ref TDEConfigSkeletonItem. You can also add TDEConfigSkeletonItem subclasses 
    * for your own types and call the generic @ref addItem() to register them.
    *
-   * In many cases you don't have to write the specific KConfigSkeleton
+   * In many cases you don't have to write the specific TDEConfigSkeleton
    * subclasses yourself, but you can use \ref kconfig_compiler to automatically
    * generate the C++ code from an XML description of the configuration options.
    */
-class TDECORE_EXPORT KConfigSkeleton
+class TDECORE_EXPORT TDEConfigSkeleton
 {
 public:
 
   /**
    * Class for handling a string preferences item.
    */
-  class TDECORE_EXPORT ItemString:public KConfigSkeletonGenericItem < TQString >
+  class TDECORE_EXPORT ItemString:public TDEConfigSkeletonGenericItem < TQString >
   {
   public:
     enum Type { Normal, Password, Path };
@@ -379,8 +379,8 @@ public:
                const TQString & defaultValue = TQString::fromLatin1(""), // NOT TQString::null !!
                Type type = Normal);
 
-    void writeConfig(KConfig * config);
-    void readConfig(KConfig * config);
+    void writeConfig(TDEConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
 
@@ -414,13 +414,13 @@ public:
   /**
    * Class for handling a TQVariant preferences item.
    */
-  class TDECORE_EXPORT ItemProperty:public KConfigSkeletonGenericItem < TQVariant >
+  class TDECORE_EXPORT ItemProperty:public TDEConfigSkeletonGenericItem < TQVariant >
   {
   public:
     ItemProperty(const TQString & group, const TQString & key,
                  TQVariant & reference, TQVariant defaultValue = 0);
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
   };
@@ -429,13 +429,13 @@ public:
   /**
    * Class for handling a bool preferences item.
    */
-  class TDECORE_EXPORT ItemBool:public KConfigSkeletonGenericItem < bool >
+  class TDECORE_EXPORT ItemBool:public TDEConfigSkeletonGenericItem < bool >
   {
   public:
     ItemBool(const TQString & group, const TQString & key, bool & reference,
              bool defaultValue = true);
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
   };
@@ -444,13 +444,13 @@ public:
   /**
    * Class for handling an integer preferences item.
    */
-  class TDECORE_EXPORT ItemInt:public KConfigSkeletonGenericItem < int >
+  class TDECORE_EXPORT ItemInt:public TDEConfigSkeletonGenericItem < int >
   {
   public:
     ItemInt(const TQString & group, const TQString & key, int &reference,
             int defaultValue = 0);
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
     TQVariant minValue() const;
@@ -469,13 +469,13 @@ public:
   /**
    * Class for handling an 64-bit integer preferences item.
    */
-  class TDECORE_EXPORT ItemInt64:public KConfigSkeletonGenericItem < TQ_INT64 >
+  class TDECORE_EXPORT ItemInt64:public TDEConfigSkeletonGenericItem < TQ_INT64 >
   {
   public:
     ItemInt64(const TQString & group, const TQString & key, TQ_INT64 &reference,
             TQ_INT64 defaultValue = 0);
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
 
@@ -510,8 +510,8 @@ public:
 
     TQValueList<Choice> choices() const;
 
-    void readConfig(KConfig * config);
-    void writeConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
+    void writeConfig(TDEConfig * config);
 
   private:
       TQValueList<Choice> mChoices;
@@ -521,13 +521,13 @@ public:
   /**
    * Class for handling an unsingend integer preferences item.
    */
-  class TDECORE_EXPORT ItemUInt:public KConfigSkeletonGenericItem < unsigned int >
+  class TDECORE_EXPORT ItemUInt:public TDEConfigSkeletonGenericItem < unsigned int >
   {
   public:
     ItemUInt(const TQString & group, const TQString & key,
              unsigned int &reference, unsigned int defaultValue = 0);
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
     TQVariant minValue() const;
@@ -547,13 +547,13 @@ public:
   /**
    * Class for hanlding a long integer preferences item.
    */
-  class TDECORE_EXPORT ItemLong:public KConfigSkeletonGenericItem < long >
+  class TDECORE_EXPORT ItemLong:public TDEConfigSkeletonGenericItem < long >
   {
   public:
     ItemLong(const TQString & group, const TQString & key, long &reference,
              long defaultValue = 0);
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
     TQVariant minValue() const;
@@ -573,13 +573,13 @@ public:
   /**
    * Class for handling an unsigned long integer preferences item.
    */
-  class TDECORE_EXPORT ItemULong:public KConfigSkeletonGenericItem < unsigned long >
+  class TDECORE_EXPORT ItemULong:public TDEConfigSkeletonGenericItem < unsigned long >
   {
   public:
     ItemULong(const TQString & group, const TQString & key,
               unsigned long &reference, unsigned long defaultValue = 0);
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
     TQVariant minValue() const;
@@ -598,13 +598,13 @@ public:
   /**
    * Class for handling unsigned 64-bit integer preferences item.
    */
-  class TDECORE_EXPORT ItemUInt64:public KConfigSkeletonGenericItem < TQ_UINT64 >
+  class TDECORE_EXPORT ItemUInt64:public TDEConfigSkeletonGenericItem < TQ_UINT64 >
   {
   public:
     ItemUInt64(const TQString & group, const TQString & key, TQ_UINT64 &reference,
             TQ_UINT64 defaultValue = 0);
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
 
@@ -624,13 +624,13 @@ public:
   /**
    * Class for handling a floating point preference item.
    */
-  class TDECORE_EXPORT ItemDouble:public KConfigSkeletonGenericItem < double >
+  class TDECORE_EXPORT ItemDouble:public TDEConfigSkeletonGenericItem < double >
   {
   public:
     ItemDouble(const TQString & group, const TQString & key,
                double &reference, double defaultValue = 0);
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
     TQVariant minValue() const;
@@ -650,14 +650,14 @@ public:
   /**
    * Class for handling a color preferences item.
    */
-  class TDECORE_EXPORT ItemColor:public KConfigSkeletonGenericItem < TQColor >
+  class TDECORE_EXPORT ItemColor:public TDEConfigSkeletonGenericItem < TQColor >
   {
   public:
     ItemColor(const TQString & group, const TQString & key,
               TQColor & reference,
               const TQColor & defaultValue = TQColor(128, 128, 128));
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
   };
@@ -666,13 +666,13 @@ public:
   /**
    * Class for handling a font preferences item.
    */
-  class TDECORE_EXPORT ItemFont:public KConfigSkeletonGenericItem < TQFont >
+  class TDECORE_EXPORT ItemFont:public TDEConfigSkeletonGenericItem < TQFont >
   {
   public:
     ItemFont(const TQString & group, const TQString & key, TQFont & reference,
              const TQFont & defaultValue = TDEGlobalSettings::generalFont());
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
   };
@@ -681,13 +681,13 @@ public:
   /**
    * Class for handling a TQRect preferences item.
    */
-  class TDECORE_EXPORT ItemRect:public KConfigSkeletonGenericItem < TQRect >
+  class TDECORE_EXPORT ItemRect:public TDEConfigSkeletonGenericItem < TQRect >
   {
   public:
     ItemRect(const TQString & group, const TQString & key, TQRect & reference,
              const TQRect & defaultValue = TQRect());
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
   };
@@ -696,13 +696,13 @@ public:
   /**
    * Class for handling a TQPoint preferences item.
    */
-  class TDECORE_EXPORT ItemPoint:public KConfigSkeletonGenericItem < TQPoint >
+  class TDECORE_EXPORT ItemPoint:public TDEConfigSkeletonGenericItem < TQPoint >
   {
   public:
     ItemPoint(const TQString & group, const TQString & key, TQPoint & reference,
               const TQPoint & defaultValue = TQPoint());
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
   };
@@ -711,13 +711,13 @@ public:
   /**
    * Class for handling a TQSize preferences item.
    */
-  class TDECORE_EXPORT ItemSize:public KConfigSkeletonGenericItem < TQSize >
+  class TDECORE_EXPORT ItemSize:public TDEConfigSkeletonGenericItem < TQSize >
   {
   public:
     ItemSize(const TQString & group, const TQString & key, TQSize & reference,
              const TQSize & defaultValue = TQSize());
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
   };
@@ -726,14 +726,14 @@ public:
   /**
    * Class for handling a TQDateTime preferences item.
    */
-  class TDECORE_EXPORT ItemDateTime:public KConfigSkeletonGenericItem < TQDateTime >
+  class TDECORE_EXPORT ItemDateTime:public TDEConfigSkeletonGenericItem < TQDateTime >
   {
   public:
     ItemDateTime(const TQString & group, const TQString & key,
                  TQDateTime & reference,
                  const TQDateTime & defaultValue = TQDateTime());
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
   };
@@ -742,14 +742,14 @@ public:
   /**
    * Class for handling a string list preferences item.
    */
-  class TDECORE_EXPORT ItemStringList:public KConfigSkeletonGenericItem < TQStringList >
+  class TDECORE_EXPORT ItemStringList:public TDEConfigSkeletonGenericItem < TQStringList >
   {
   public:
     ItemStringList(const TQString & group, const TQString & key,
                    TQStringList & reference,
                    const TQStringList & defaultValue = TQStringList());
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
   };
@@ -765,22 +765,22 @@ public:
                    TQStringList & reference,
                    const TQStringList & defaultValue = TQStringList());
 
-    void readConfig(KConfig * config);
-    void writeConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
+    void writeConfig(TDEConfig * config);
   };
 
 
   /**
    * Class for handling an integer list preferences item.
    */
-  class TDECORE_EXPORT ItemIntList:public KConfigSkeletonGenericItem < TQValueList < int > >
+  class TDECORE_EXPORT ItemIntList:public TDEConfigSkeletonGenericItem < TQValueList < int > >
   {
   public:
     ItemIntList(const TQString & group, const TQString & key,
                 TQValueList < int >&reference,
                 const TQValueList < int >&defaultValue = TQValueList < int >());
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
   };
@@ -793,19 +793,19 @@ public:
    * @param configname name of config file. If no name is given, the default
    * config file as returned by kapp()->config() is used.
    */
-  KConfigSkeleton(const TQString & configname = TQString::null);
+  TDEConfigSkeleton(const TQString & configname = TQString::null);
 
   /**
    * Constructor.
    * 
    * @param config configuration object to use.
    */
-  KConfigSkeleton(KSharedConfig::Ptr config);
+  TDEConfigSkeleton(KSharedConfig::Ptr config);
 
   /**
    * Destructor
    */
-    virtual ~ KConfigSkeleton();
+    virtual ~ TDEConfigSkeleton();
 
   /**
     Set all registered items to their default values.
@@ -840,12 +840,12 @@ public:
   }
 
   /**
-   * Register a custom @ref KConfigSkeletonItem with a given name. If the name
-   * parameter is null, take the name from KConfigSkeletonItem::key().
+   * Register a custom @ref TDEConfigSkeletonItem with a given name. If the name
+   * parameter is null, take the name from TDEConfigSkeletonItem::key().
    * Note that all names must be unique but that multiple entries can have
    * the same key if they reside in different groups. 
    */
-  void addItem(KConfigSkeletonItem *, const TQString & name = TQString::null );
+  void addItem(TDEConfigSkeletonItem *, const TQString & name = TQString::null );
 
   /**
    * Register an item of type TQString.
@@ -1154,14 +1154,14 @@ public:
                               const TQString & key = TQString::null);
 
   /**
-   * Return the @ref KConfig object used for reading and writing the settings.
+   * Return the @ref TDEConfig object used for reading and writing the settings.
    */
-  KConfig *config() const;
+  TDEConfig *config() const;
 
   /**
-   * Return list of items managed by this KConfigSkeleton object.
+   * Return list of items managed by this TDEConfigSkeleton object.
    */
-  KConfigSkeletonItem::List items() const
+  TDEConfigSkeletonItem::List items() const
   {
     return mItems;
   }
@@ -1174,7 +1174,7 @@ public:
   /**
    * Lookup item by name
    */
-  KConfigSkeletonItem * findItem(const TQString & name);
+  TDEConfigSkeletonItem * findItem(const TQString & name);
 
   /**
    * Indicate whether this object should reflect the actual
@@ -1215,10 +1215,10 @@ protected:
 private:
   TQString mCurrentGroup;
 
-  KSharedConfig::Ptr mConfig; // pointer to KConfig object
+  KSharedConfig::Ptr mConfig; // pointer to TDEConfig object
 
-  KConfigSkeletonItem::List mItems;
-  KConfigSkeletonItem::Dict mItemDict;
+  TDEConfigSkeletonItem::List mItems;
+  TDEConfigSkeletonItem::Dict mItemDict;
   
   bool mUseDefaults;
 
diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas
index 3d1818592..9813a0e16 100644
--- a/tdecore/kdebug.areas
+++ b/tdecore/kdebug.areas
@@ -21,8 +21,8 @@
 174        tdecore (KProcIO)
 175        tdecore (TDEProcess)
 176        tdecore (KWin)
-177        tdecore (KConfigSkeleton)
-178        tdecore (KConfigDialogManager)
+177        tdecore (TDEConfigSkeleton)
+178        tdecore (TDEConfigDialogManager)
 179        tdecore (KNetwork resolver)
 180        tdecore (tdelibs)
 200        tdeui (KMainWindow)
@@ -34,7 +34,7 @@
 265        tdecore (KIconEffect)
 270        tdeui (KRootPixmap)
 280        tdeui (KSharedPixmap)
-281        tdeui (KCModule)
+281        tdeui (TDECModule)
 282        tdeui (KDockWidget)
 290        tdeui (KPixmapIO)
 291        tdeui (KAboutDialog)
@@ -53,9 +53,9 @@
 703        kutils (KPluginInfo)
 704        kutils (KSettings::ComponentsDialog)
 710        kutils (KCMultiDialog)
-711        kutils (KCModuleProxy)
-712        kutils (KCModuleInfo)
-713        kutils (KCModuleContainer)
+711        kutils (TDECModuleProxy)
+712        kutils (TDECModuleInfo)
+713        kutils (TDECModuleContainer)
 750        kspell (tdelibs)
 760        kmdi
 780        kcmshell (tdelibs)
diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp
index ef76e04f6..e484a3711 100644
--- a/tdecore/kdebug.cpp
+++ b/tdecore/kdebug.cpp
@@ -162,7 +162,7 @@ struct kDebugPrivate {
 
   TQCString aAreaName;
   unsigned int oldarea;
-  KConfig *config;
+  TDEConfig *config;
 };
 
 static kDebugPrivate *kDebug_data = 0;
@@ -187,7 +187,7 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char
 
   if (!kDebug_data->config && TDEGlobal::_instance )
   {
-      kDebug_data->config = new KConfig("kdebugrc", false, false);
+      kDebug_data->config = new TDEConfig("kdebugrc", false, false);
       kDebug_data->config->setGroup("0");
 
       //AB: this is necessary here, otherwise all output with area 0 won't be
diff --git a/tdecore/kdesktopfile.cpp b/tdecore/kdesktopfile.cpp
index 29c30f9d9..1b9a49890 100644
--- a/tdecore/kdesktopfile.cpp
+++ b/tdecore/kdesktopfile.cpp
@@ -42,9 +42,9 @@
 
 KDesktopFile::KDesktopFile(const TQString &fileName, bool bReadOnly,
 			   const char * resType)
-  : KConfig(TQString::fromLatin1(""), bReadOnly, false)
+  : TDEConfig(TQString::fromLatin1(""), bReadOnly, false)
 {
-  // KConfigBackEnd will try to locate the filename that is provided
+  // TDEConfigBackEnd will try to locate the filename that is provided
   // based on the resource type specified, _only_ if the filename
   // is not an absolute path.
   backEnd->changeFileName(fileName, resType, false);
@@ -346,7 +346,7 @@ KDesktopFile::sortOrder() const
 }
 
 void KDesktopFile::virtual_hook( int id, void* data )
-{ KConfig::virtual_hook( id, data ); }
+{ TDEConfig::virtual_hook( id, data ); }
 
 TQString KDesktopFile::readDocPath() const
 {
@@ -361,7 +361,7 @@ TQString KDesktopFile::readDocPath() const
 KDesktopFile* KDesktopFile::copyTo(const TQString &file) const
 {
   KDesktopFile *config = new KDesktopFile(TQString::null, false);
-  KConfig::copyTo(file, config);
+  TDEConfig::copyTo(file, config);
   config->setDesktopGroup();
   return config;
 }
diff --git a/tdecore/kdesktopfile.h b/tdecore/kdesktopfile.h
index ff19981cd..28db47842 100644
--- a/tdecore/kdesktopfile.h
+++ b/tdecore/kdesktopfile.h
@@ -28,10 +28,10 @@ class KDesktopFilePrivate;
  * KDE Desktop File Management.
  *
  * @author Pietro Iglio <iglio@kde.org>
- * @see  KConfigBase  KConfig
+ * @see  TDEConfigBase  TDEConfig
  * @short KDE Desktop File Management class
  */
-class TDECORE_EXPORT KDesktopFile : public KConfig
+class TDECORE_EXPORT KDesktopFile : public TDEConfig
 {
   Q_OBJECT
 
diff --git a/tdecore/kdetcompmgr.cpp b/tdecore/kdetcompmgr.cpp
index c4a903242..2047a7707 100644
--- a/tdecore/kdetcompmgr.cpp
+++ b/tdecore/kdetcompmgr.cpp
@@ -51,7 +51,7 @@ int main(int argc, char **argv)
 
     TDEApplication app;
 
-    KConfig config("twinrc", true);
+    TDEConfig config("twinrc", true);
     config.setGroup( "Notification Messages" );
     if (!config.readBoolEntry("UseTranslucency",false)) {
         // Attempt to load the kompmgr pid file
@@ -97,7 +97,7 @@ int main(int argc, char **argv)
     }
 
      if (app.detectCompositionManagerAvailable(false, false)) {		// Perform a shallow check for the composite extension (a deep check would cause noticeable flicker)
-	KConfig config2("twinrc", true);
+	TDEConfig config2("twinrc", true);
 	config2.setGroup( "Notification Messages" );
 	if (config2.readBoolEntry("UseTranslucency",false)) {
 		app.detectCompositionManagerAvailable(true, true);
diff --git a/tdecore/kextsock.cpp b/tdecore/kextsock.cpp
index cd74f9ad0..d77d2c561 100644
--- a/tdecore/kextsock.cpp
+++ b/tdecore/kextsock.cpp
@@ -72,8 +72,8 @@ public:
   KResolver resLocal;		// binding resolution
   unsigned current;		// used by the asynchronous connection
 
-  ::KSocketAddress *local;	// local socket address
-  ::KSocketAddress *peer;	// peer socket address
+  ::TDESocketAddress *local;	// local socket address
+  ::TDESocketAddress *peer;	// peer socket address
 
   TQSocketNotifier *qsnIn, *qsnOut;
   int inMaxSize, outMaxSize;
@@ -718,7 +718,7 @@ bool KExtendedSocket::setBufferSize(int rsize, int wsize)
  * if we have done this already, we return it. Otherwise, we'll have
  * to find the socket name
  */
-const ::KSocketAddress *KExtendedSocket::localAddress()
+const ::TDESocketAddress *KExtendedSocket::localAddress()
 {
   if (d->local != NULL)
     return d->local;
@@ -733,7 +733,7 @@ const ::KSocketAddress *KExtendedSocket::localAddress()
  * passiveSocket and that we require to be connected already. Also note that
  * the behavior on connectionless sockets is not defined here.
  */
-const ::KSocketAddress* KExtendedSocket::peerAddress()
+const ::TDESocketAddress* KExtendedSocket::peerAddress()
 {
   if (d->peer != NULL)
     return d->peer;
@@ -2002,7 +2002,7 @@ int KExtendedSocket::resolve(sockaddr *sock, ksocklen_t len, TQString &host,
   return err;
 }
 
-int KExtendedSocket::resolve(::KSocketAddress *sock, TQString &host, TQString &port,
+int KExtendedSocket::resolve(::TDESocketAddress *sock, TQString &host, TQString &port,
 			     int flags)
 {
   return resolve(sock->data, sock->datasize, host, port, flags);
@@ -2058,7 +2058,7 @@ TQPtrList<KAddressInfo> KExtendedSocket::lookup(const TQString& host, const TQSt
 	  ai->ai->ai_addr = 0;
 	}
 
-      ai->addr = ::KSocketAddress::newAddress(ai->ai->ai_addr, ai->ai->ai_addrlen);
+      ai->addr = ::TDESocketAddress::newAddress(ai->ai->ai_addr, ai->ai->ai_addrlen);
 
       l.append(ai);
     }
@@ -2069,9 +2069,9 @@ TQPtrList<KAddressInfo> KExtendedSocket::lookup(const TQString& host, const TQSt
   return l;
 }
 
-::KSocketAddress *KExtendedSocket::localAddress(int fd)
+::TDESocketAddress *KExtendedSocket::localAddress(int fd)
 {
-  ::KSocketAddress *local;
+  ::TDESocketAddress *local;
   struct sockaddr static_sa, *sa = &static_sa;
   ksocklen_t len = sizeof(static_sa);
 
@@ -2106,20 +2106,20 @@ TQPtrList<KAddressInfo> KExtendedSocket::lookup(const TQString& host, const TQSt
 	  return NULL;
 	}
 
-      local = ::KSocketAddress::newAddress(sa, len);
+      local = ::TDESocketAddress::newAddress(sa, len);
       free(sa);
     }
   else
-    local = ::KSocketAddress::newAddress(sa, len);
+    local = ::TDESocketAddress::newAddress(sa, len);
 
   return local;
 }
 
 /* This is exactly the same code as localAddress, except
  * we call getpeername here */
-::KSocketAddress *KExtendedSocket::peerAddress(int fd)
+::TDESocketAddress *KExtendedSocket::peerAddress(int fd)
 {
-  ::KSocketAddress *peer;
+  ::TDESocketAddress *peer;
   struct sockaddr static_sa, *sa = &static_sa;
   ksocklen_t len = sizeof(static_sa);
 
@@ -2154,11 +2154,11 @@ TQPtrList<KAddressInfo> KExtendedSocket::lookup(const TQString& host, const TQSt
 	  return NULL;
 	}
 
-      peer = ::KSocketAddress::newAddress(sa, len);
+      peer = ::TDESocketAddress::newAddress(sa, len);
       free(sa);
     }
   else
-    peer = ::KSocketAddress::newAddress(sa, len);
+    peer = ::TDESocketAddress::newAddress(sa, len);
 
   return peer;
 }
@@ -2204,7 +2204,7 @@ KAddressInfo::KAddressInfo(addrinfo *p)
       ai->ai_addrlen = 0;
    }
 
-   addr = ::KSocketAddress::newAddress(ai->ai_addr, ai->ai_addrlen);
+   addr = ::TDESocketAddress::newAddress(ai->ai_addr, ai->ai_addrlen);
 }
 #endif
 KAddressInfo::~KAddressInfo()
diff --git a/tdecore/kextsock.h b/tdecore/kextsock.h
index 080898443..6327d51dc 100644
--- a/tdecore/kextsock.h
+++ b/tdecore/kextsock.h
@@ -58,8 +58,8 @@ class KExtendedSocketPrivate;
 /**
  * The extended socket class.
  *
- * This class should be used instead of KSocket whenever the user needs
- * fine-grained control over the socket being created. Unlike KSocket, which
+ * This class should be used instead of TDESocket whenever the user needs
+ * fine-grained control over the socket being created. Unlike TDESocket, which
  * does everything at once, without much intervention, KExtendedSocket allows
  * intervention at every step of the process and the setting of parameters.
  *
@@ -87,7 +87,7 @@ class KExtendedSocketPrivate;
  * @deprecated
  *	This class is now deprecated. Please use the classes in KNetwork for
  *	new programs. In particular, this class is replaced by KNetwork::KStreamSocket
- *	and @ref KNetwork::KServerSocket.
+ *	and @ref KNetwork::TDEServerSocket.
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @short an extended socket
@@ -491,7 +491,7 @@ public:
    * @return the local socket address, can be 0 if the connection has not been established
    *         yet
    */
-  const ::KSocketAddress *localAddress();
+  const ::TDESocketAddress *localAddress();
 
   /**
    * Returns the peer socket address. Use KExtendedSocket::resolve() to
@@ -499,7 +499,7 @@ public:
    * @return the peer address, can be 0 if the connection has not been established yet
    *         or the socket is passive
    */
-  const ::KSocketAddress *peerAddress();
+  const ::TDESocketAddress *peerAddress();
 
   /**
    * Returns the file descriptor
@@ -964,7 +964,7 @@ public:
    * @param flags	the same flags as getnameinfo()
    * @returns 0 on success, nonzero otherwise.
    */
-  static int resolve(::KSocketAddress* sock, TQString& host, TQString& port, int flags = 0) KDE_DEPRECATED;
+  static int resolve(::TDESocketAddress* sock, TQString& host, TQString& port, int flags = 0) KDE_DEPRECATED;
 
   /** @deprecated
    * This function is now deprecated. Please use @ref KNetwork::KResolver::resolve.
@@ -994,7 +994,7 @@ public:
    * @param fd		the file descriptor
    * @return the local socket address or 0 if an error occurred. Delete after use.
    */
-  static ::KSocketAddress *localAddress(int fd) KDE_DEPRECATED;
+  static ::TDESocketAddress *localAddress(int fd) KDE_DEPRECATED;
 
   /**
    * Returns the peer socket address. Use KExtendedSocket::resolve() to
@@ -1003,7 +1003,7 @@ public:
    * @param fd		the file descriptor
    * @return the peer socket address or 0 if an error occurred. Delete after use.
    */
-  static ::KSocketAddress *peerAddress(int fd) KDE_DEPRECATED;
+  static ::TDESocketAddress *peerAddress(int fd) KDE_DEPRECATED;
 
   /**
    * Returns the representing text of this error code
@@ -1029,8 +1029,8 @@ protected:
 private:
   KExtendedSocketPrivate *d;
 
-  friend class KSocket;
-  friend class KServerSocket;
+  friend class TDESocket;
+  friend class TDEServerSocket;
 };
 
 /** @deprecated
@@ -1043,7 +1043,7 @@ class TDECORE_EXPORT KAddressInfo
 {
 private:
   addrinfo *ai;
-  ::KSocketAddress *addr;
+  ::TDESocketAddress *addr;
 
   inline KAddressInfo() : ai(0), addr(0)
   { }
@@ -1056,10 +1056,10 @@ public:
   ~KAddressInfo();
 
   /**
-   * Returns the KAddressInfo's KSocketAddress.
+   * Returns the KAddressInfo's TDESocketAddress.
    * Only valid as long as the KAddressInfo exists.
    */
-  inline KDE_DEPRECATED operator const ::KSocketAddress*() const 
+  inline KDE_DEPRECATED operator const ::TDESocketAddress*() const 
   { return addr; }
 
   /**
@@ -1076,11 +1076,11 @@ public:
   { return ai; }
 
   /**
-   * Returns the KAddressInfo's KSocketAddress.
+   * Returns the KAddressInfo's TDESocketAddress.
    * Only valid as long as the KAddressInfo exists.
-   * @return the KAddressInfo's KSocketAddress.
+   * @return the KAddressInfo's TDESocketAddress.
    */
-  inline KDE_DEPRECATED const ::KSocketAddress* address() const
+  inline KDE_DEPRECATED const ::TDESocketAddress* address() const
   { return addr; }
 
   /**
@@ -1116,8 +1116,8 @@ public:
   const char* canonname() const KDE_DEPRECATED;
 
   /**
-   * Returns the length of the KSocketAddress.
-   * @return the KSocketAddress's length
+   * Returns the length of the TDESocketAddress.
+   * @return the TDESocketAddress's length
    */
   inline int length() const
   { if (addr) return addr->size(); return 0; }
diff --git a/tdecore/kglobal.cpp b/tdecore/kglobal.cpp
index c51f13e7f..9759edbcf 100644
--- a/tdecore/kglobal.cpp
+++ b/tdecore/kglobal.cpp
@@ -60,7 +60,7 @@ KStandardDirs *TDEGlobal::dirs()
     return _instance->dirs();
 }
 
-KConfig	*TDEGlobal::config()
+TDEConfig	*TDEGlobal::config()
 {
     MYASSERT(_instance);
 
diff --git a/tdecore/kglobal.h b/tdecore/kglobal.h
index 361129e2b..22877c8ce 100644
--- a/tdecore/kglobal.h
+++ b/tdecore/kglobal.h
@@ -22,7 +22,7 @@
 #include <kinstance.h> // KDE4: class TDEInstance is enough here
 
 class KCharsets;
-class KConfig;
+class TDEConfig;
 class KSharedConfig;
 class KIconLoader;
 class TDEHardwareDevices;
@@ -65,7 +65,7 @@ public:
      *  Returns the general config object.
      * @return the global configuration object.
      */
-    static KConfig		*config();
+    static TDEConfig		*config();
 
     /**
      *  Returns the general config object.
diff --git a/tdecore/kglobalaccel.cpp b/tdecore/kglobalaccel.cpp
index f5fb71027..3d759466f 100644
--- a/tdecore/kglobalaccel.cpp
+++ b/tdecore/kglobalaccel.cpp
@@ -119,11 +119,11 @@ const TQString& TDEGlobalAccel::configGroup() const
 void TDEGlobalAccel::setConfigGroup( const TQString& s )
 	{ d->setConfigGroup( s ); }
 
-bool TDEGlobalAccel::readSettings( KConfigBase* pConfig )
+bool TDEGlobalAccel::readSettings( TDEConfigBase* pConfig )
 	{ d->readSettings( pConfig ); return true; }
-bool TDEGlobalAccel::writeSettings( KConfigBase* pConfig ) const
+bool TDEGlobalAccel::writeSettings( TDEConfigBase* pConfig ) const
 	{ d->writeSettings( pConfig ); return true; }
-bool TDEGlobalAccel::writeSettings( KConfigBase* pConfig, bool bGlobal ) const
+bool TDEGlobalAccel::writeSettings( TDEConfigBase* pConfig, bool bGlobal ) const
 {
 	d->setConfigGlobal( bGlobal );
 	d->writeSettings( pConfig );
diff --git a/tdecore/kglobalaccel.h b/tdecore/kglobalaccel.h
index 1389386c4..fdda08f5a 100644
--- a/tdecore/kglobalaccel.h
+++ b/tdecore/kglobalaccel.h
@@ -27,7 +27,7 @@ class TQPopupMenu;
 class TQWidget;
 class KAccelAction;
 class KAccelActions;
-class KConfigBase;
+class TDEConfigBase;
 
 class TDEGlobalAccelPrivate;
 
@@ -157,14 +157,14 @@ class TDECORE_EXPORT TDEGlobalAccel : public TQObject
 	/**
 	 * Returns the configuration group that is used to save the accelerators.
 	 * @return the configuration group
-	 * @see KConfig
+	 * @see TDEConfig
 	 */
 	const TQString& configGroup() const;
 
 	/**
 	 * Sets the configuration group that is used to save the accelerators.
 	 * @param cg the configuration group
-	 * @see KConfig
+	 * @see TDEConfig
 	 */
 	void setConfigGroup( const TQString &cg );
 
@@ -176,7 +176,7 @@ class TDECORE_EXPORT TDEGlobalAccel : public TQObject
 	 *                 configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool readSettings( KConfigBase* pConfig = 0 );
+	bool readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current shortcuts to @p pConfig,
@@ -187,7 +187,7 @@ class TDECORE_EXPORT TDEGlobalAccel : public TQObject
 	 * @return true if successful, false otherwise
 	 * @since 3.1
 	 */
-	bool writeSettings( KConfigBase* pConfig = 0 ) const;
+	bool writeSettings( TDEConfigBase* pConfig = 0 ) const;
 	// BCI: merge these two writeSettings methods in KDE 4.0
 	/**
 	 * Write the current shortcuts to @p pConfig,
@@ -199,7 +199,7 @@ class TDECORE_EXPORT TDEGlobalAccel : public TQObject
 	 * @param bGlobal if true write the configuration to the kde global settings
 	 * @return true if successful, false otherwise
 	 */
-	bool writeSettings( KConfigBase* pConfig, bool bGlobal ) const;
+	bool writeSettings( TDEConfigBase* pConfig, bool bGlobal ) const;
 
 	/**
 	 * @internal -- this a wrapper function to
diff --git a/tdecore/kglobalsettings.cpp b/tdecore/kglobalsettings.cpp
index f654608ac..8e617b06a 100644
--- a/tdecore/kglobalsettings.cpp
+++ b/tdecore/kglobalsettings.cpp
@@ -108,19 +108,19 @@ void readXdgUserDirs(TQString *desktop, TQString *documents)
 
 int TDEGlobalSettings::dndEventDelay()
 {
-    KConfigGroup g( TDEGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     return g.readNumEntry("StartDragDist", TQApplication::startDragDistance());
 }
 
 bool TDEGlobalSettings::singleClick()
 {
-    KConfigGroup g( TDEGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     return g.readBoolEntry("SingleClick", KDE_DEFAULT_SINGLECLICK);
 }
 
 bool TDEGlobalSettings::iconUseRoundedRect()
 {
-    KConfigGroup g( TDEGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     return g.readBoolEntry("IconUseRoundedRect", KDE_DEFAULT_ICONTEXTROUNDED);
 }
 
@@ -128,7 +128,7 @@ TDEGlobalSettings::TearOffHandle TDEGlobalSettings::insertTearOffHandle()
 {
     int tearoff;
     bool effectsenabled;
-    KConfigGroup g( TDEGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     effectsenabled = g.readBoolEntry( "EffectsEnabled", false);
     tearoff = g.readNumEntry("InsertTearOffHandle", KDE_DEFAULT_INSERTTEAROFFHANDLES);
     return effectsenabled ? (TearOffHandle) tearoff : Disable;
@@ -136,19 +136,19 @@ TDEGlobalSettings::TearOffHandle TDEGlobalSettings::insertTearOffHandle()
 
 bool TDEGlobalSettings::changeCursorOverIcon()
 {
-    KConfigGroup g( TDEGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     return g.readBoolEntry("ChangeCursor", KDE_DEFAULT_CHANGECURSOR);
 }
 
 bool TDEGlobalSettings::visualActivate()
 {
-    KConfigGroup g( TDEGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     return g.readBoolEntry("VisualActivate", KDE_DEFAULT_VISUAL_ACTIVATE);
 }
 
 unsigned int TDEGlobalSettings::visualActivateSpeed()
 {
-    KConfigGroup g( TDEGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     return
         g.readNumEntry(
             "VisualActivateSpeed",
@@ -160,14 +160,14 @@ unsigned int TDEGlobalSettings::visualActivateSpeed()
 
 int TDEGlobalSettings::autoSelectDelay()
 {
-    KConfigGroup g( TDEGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     return g.readNumEntry("AutoSelectDelay", KDE_DEFAULT_AUTOSELECTDELAY);
 }
 
 TDEGlobalSettings::Completion TDEGlobalSettings::completionMode()
 {
     int completion;
-    KConfigGroup g( TDEGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     completion = g.readNumEntry("completionMode", -1);
     if ((completion < (int) CompletionNone) ||
         (completion > (int) CompletionPopupAuto))
@@ -179,13 +179,13 @@ TDEGlobalSettings::Completion TDEGlobalSettings::completionMode()
 
 bool TDEGlobalSettings::showContextMenusOnPress ()
 {
-    KConfigGroup g(TDEGlobal::config(), "ContextMenus");
+    TDEConfigGroup g(TDEGlobal::config(), "ContextMenus");
     return g.readBoolEntry("ShowOnPress", true);
 }
 
 int TDEGlobalSettings::contextMenuKey ()
 {
-    KConfigGroup g(TDEGlobal::config(), "Shortcuts");
+    TDEConfigGroup g(TDEGlobal::config(), "Shortcuts");
     KShortcut cut (g.readEntry ("PopupMenuContext", "Menu"));
     return cut.keyCodeQt();
 }
@@ -193,7 +193,7 @@ int TDEGlobalSettings::contextMenuKey ()
 TQColor TDEGlobalSettings::toolBarHighlightColor()
 {
     initColors();
-    KConfigGroup g( TDEGlobal::config(), "Toolbar style" );
+    TDEConfigGroup g( TDEGlobal::config(), "Toolbar style" );
     return g.readColorEntry("HighlightColor", _trinity4Blue);
 }
 
@@ -204,7 +204,7 @@ TQColor TDEGlobalSettings::inactiveTitleColor()
 #else
     if (!_inactiveBackground)
         _inactiveBackground = new TQColor(157, 170, 186);
-    KConfigGroup g( TDEGlobal::config(), "WM" );
+    TDEConfigGroup g( TDEGlobal::config(), "WM" );
     return g.readColorEntry( "inactiveBackground", _inactiveBackground );
 #endif
 }
@@ -216,7 +216,7 @@ TQColor TDEGlobalSettings::inactiveTextColor()
 #else
     if (!_inactiveForeground)
        _inactiveForeground = new TQColor(221,221,221);
-    KConfigGroup g( TDEGlobal::config(), "WM" );
+    TDEConfigGroup g( TDEGlobal::config(), "WM" );
     return g.readColorEntry( "inactiveForeground", _inactiveForeground );
 #endif
 }
@@ -229,7 +229,7 @@ TQColor TDEGlobalSettings::activeTitleColor()
     initColors();
     if (!_activeBackground)
       _activeBackground = new TQColor(65,142,220);
-    KConfigGroup g( TDEGlobal::config(), "WM" );
+    TDEConfigGroup g( TDEGlobal::config(), "WM" );
     return g.readColorEntry( "activeBackground", _activeBackground);
 #endif
 }
@@ -239,14 +239,14 @@ TQColor TDEGlobalSettings::activeTextColor()
 #ifdef Q_WS_WIN
     return qt_colorref2qrgb(GetSysColor(COLOR_CAPTIONTEXT));
 #else
-    KConfigGroup g( TDEGlobal::config(), "WM" );
+    TDEConfigGroup g( TDEGlobal::config(), "WM" );
     return g.readColorEntry( "activeForeground", tqwhiteptr );
 #endif
 }
 
 int TDEGlobalSettings::contrast()
 {
-    KConfigGroup g( TDEGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     return g.readNumEntry( "contrast", 7 );
 }
 
@@ -254,13 +254,13 @@ TQColor TDEGlobalSettings::buttonBackground()
 {
     if (!_buttonBackground)
       _buttonBackground = new TQColor(221,223,228);
-    KConfigGroup g( TDEGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     return g.readColorEntry( "buttonBackground", _buttonBackground );
 }
 
 TQColor TDEGlobalSettings::buttonTextColor()
 {
-    KConfigGroup g( TDEGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     return g.readColorEntry( "buttonForeground", tqblackptr );
 }
 
@@ -269,7 +269,7 @@ TQColor TDEGlobalSettings::buttonTextColor()
 //   TDEApplication::kdisplaySetPalette()
 TQColor TDEGlobalSettings::baseColor()
 {
-    KConfigGroup g( TDEGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     return g.readColorEntry( "windowBackground", tqwhiteptr );
 }
 
@@ -278,7 +278,7 @@ TQColor TDEGlobalSettings::baseColor()
 //   TDEApplication::kdisplaySetPalette()
 TQColor TDEGlobalSettings::textColor()
 {
-    KConfigGroup g( TDEGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     return g.readColorEntry( "windowForeground", tqblackptr );
 }
 
@@ -287,7 +287,7 @@ TQColor TDEGlobalSettings::textColor()
 //   TDEApplication::kdisplaySetPalette()
 TQColor TDEGlobalSettings::highlightedTextColor()
 {
-    KConfigGroup g( TDEGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     return g.readColorEntry( "selectForeground", tqwhiteptr );
 }
 
@@ -299,14 +299,14 @@ TQColor TDEGlobalSettings::highlightColor()
     initColors();
     if (!_selectBackground)
         _selectBackground = new TQColor(103,141,178);
-    KConfigGroup g( TDEGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     return g.readColorEntry( "selectBackground", _selectBackground );
 }
 
 TQColor TDEGlobalSettings::alternateBackgroundColor()
 {
     initColors();
-    KConfigGroup g( TDEGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     *alternateColor = calculateAlternateBackgroundColor( baseColor() );
     return g.readColorEntry( "alternateBackground", alternateColor );
 }
@@ -330,7 +330,7 @@ TQColor TDEGlobalSettings::calculateAlternateBackgroundColor(const TQColor& base
 
 bool TDEGlobalSettings::shadeSortColumn()
 {
-    KConfigGroup g( TDEGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     return g.readBoolEntry( "shadeSortColumn", KDE_DEFAULT_SHADE_SORT_COLUMN );
 }
 
@@ -339,7 +339,7 @@ TQColor TDEGlobalSettings::linkColor()
     initColors();
     if (!_linkColor)
         _linkColor = new TQColor(0,0,238);
-    KConfigGroup g( TDEGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     return g.readColorEntry( "linkColor", _linkColor );
 }
 
@@ -347,7 +347,7 @@ TQColor TDEGlobalSettings::visitedLinkColor()
 {
     if (!_visitedLinkColor)
         _visitedLinkColor = new TQColor(82,24,139);
-    KConfigGroup g( TDEGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     return g.readColorEntry( "visitedLinkColor", _visitedLinkColor );
 }
 
@@ -361,7 +361,7 @@ TQFont TDEGlobalSettings::generalFont()
     _generalFont->setPointSize(10);
     _generalFont->setStyleHint(TQFont::SansSerif);
 
-    KConfigGroup g( TDEGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     *_generalFont = g.readFontEntry("font", _generalFont);
 
     return *_generalFont;
@@ -377,7 +377,7 @@ TQFont TDEGlobalSettings::fixedFont()
     _fixedFont->setPointSize(10);
     _fixedFont->setStyleHint(TQFont::TypeWriter);
 
-    KConfigGroup g( TDEGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     *_fixedFont = g.readFontEntry("fixed", _fixedFont);
 
     return *_fixedFont;
@@ -393,7 +393,7 @@ TQFont TDEGlobalSettings::toolBarFont()
     _toolBarFont->setPointSize(10);
     _toolBarFont->setStyleHint(TQFont::SansSerif);
 
-    KConfigGroup g( TDEGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     *_toolBarFont = g.readFontEntry("toolBarFont", _toolBarFont);
 
     return *_toolBarFont;
@@ -409,7 +409,7 @@ TQFont TDEGlobalSettings::menuFont()
     _menuFont->setPointSize(10);
     _menuFont->setStyleHint(TQFont::SansSerif);
 
-    KConfigGroup g( TDEGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     *_menuFont = g.readFontEntry("menuFont", _menuFont);
 
     return *_menuFont;
@@ -425,7 +425,7 @@ TQFont TDEGlobalSettings::windowTitleFont()
     _windowTitleFont->setPointSize(10);
     _windowTitleFont->setStyleHint(TQFont::SansSerif);
 
-    KConfigGroup g( TDEGlobal::config(), "WM" );
+    TDEConfigGroup g( TDEGlobal::config(), "WM" );
     *_windowTitleFont = g.readFontEntry("activeFont", _windowTitleFont); // inconsistency
 
     return *_windowTitleFont;
@@ -441,7 +441,7 @@ TQFont TDEGlobalSettings::taskbarFont()
     _taskbarFont->setPointSize(10);
     _taskbarFont->setStyleHint(TQFont::SansSerif);
 
-    KConfigGroup g( TDEGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     *_taskbarFont = g.readFontEntry("taskbarFont", _taskbarFont);
 
     return *_taskbarFont;
@@ -516,7 +516,7 @@ void TDEGlobalSettings::initStatic() // should be called initPaths(). Don't put
     s_trashPath = new TQString();
     s_documentPath = new TQString();
 
-    KConfigGroup g( TDEGlobal::config(), "Paths" );
+    TDEConfigGroup g( TDEGlobal::config(), "Paths" );
 
 	// Read desktop and documents path using XDG_USER_DIRS
 	readXdgUserDirs(s_desktopPath, s_documentPath);
@@ -613,7 +613,7 @@ TDEGlobalSettings::KMouseSettings & TDEGlobalSettings::mouseSettings()
         KMouseSettings & s = *s_mouseSettings; // for convenience
 
 #ifndef Q_WS_WIN
-        KConfigGroup g( TDEGlobal::config(), "Mouse" );
+        TDEConfigGroup g( TDEGlobal::config(), "Mouse" );
         TQString setting = g.readEntry("MouseButtonMapping");
         if (setting == "RightHanded")
             s.handed = KMouseSettings::RightHanded;
@@ -678,7 +678,7 @@ bool TDEGlobalSettings::isMultiHead()
 
 bool TDEGlobalSettings::wheelMouseZooms()
 {
-    KConfigGroup g( TDEGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     return g.readBoolEntry( "WheelMouseZooms", KDE_DEFAULT_WHEEL_ZOOM );
 }
 
@@ -687,7 +687,7 @@ TQRect TDEGlobalSettings::splashScreenDesktopGeometry()
     TQDesktopWidget *dw = TQApplication::desktop();
 
     if (dw->isVirtualDesktop()) {
-        KConfigGroup group(TDEGlobal::config(), "Windows");
+        TDEConfigGroup group(TDEGlobal::config(), "Windows");
         int scr = group.readNumEntry("Unmanaged", -3);
         if (group.readBoolEntry("XineramaEnabled", true) && scr != -2) {
             if (scr == -3)
@@ -706,7 +706,7 @@ TQRect TDEGlobalSettings::desktopGeometry(const TQPoint& point)
     TQDesktopWidget *dw = TQApplication::desktop();
 
     if (dw->isVirtualDesktop()) {
-        KConfigGroup group(TDEGlobal::config(), "Windows");
+        TDEConfigGroup group(TDEGlobal::config(), "Windows");
         if (group.readBoolEntry("XineramaEnabled", true) &&
             group.readBoolEntry("XineramaPlacementEnabled", true)) {
             return dw->screenGeometry(dw->screenNumber(point));
@@ -723,7 +723,7 @@ TQRect TDEGlobalSettings::desktopGeometry(TQWidget* w)
     TQDesktopWidget *dw = TQApplication::desktop();
 
     if (dw->isVirtualDesktop()) {
-        KConfigGroup group(TDEGlobal::config(), "Windows");
+        TDEConfigGroup group(TDEGlobal::config(), "Windows");
         if (group.readBoolEntry("XineramaEnabled", true) &&
             group.readBoolEntry("XineramaPlacementEnabled", true)) {
             if (w)
@@ -739,14 +739,14 @@ TQRect TDEGlobalSettings::desktopGeometry(TQWidget* w)
 
 bool TDEGlobalSettings::showIconsOnPushButtons()
 {
-    KConfigGroup g( TDEGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     return g.readBoolEntry("ShowIconsOnPushButtons",
         KDE_DEFAULT_ICON_ON_PUSHBUTTON);
 }
 
 bool TDEGlobalSettings::showFilePreview(const KURL &url)
 {
-    KConfigGroup g(TDEGlobal::config(), "PreviewSettings");
+    TDEConfigGroup g(TDEGlobal::config(), "PreviewSettings");
     TQString protocol = url.protocol();
     bool defaultSetting = KProtocolInfo::showFilePreview( protocol );
     return g.readBoolEntry(protocol, defaultSetting );
@@ -754,21 +754,21 @@ bool TDEGlobalSettings::showFilePreview(const KURL &url)
 
 bool TDEGlobalSettings::showKonqIconActivationEffect()
 {
-    KConfigGroup g( TDEGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     return g.readBoolEntry("ShowKonqIconActivationEffect",
         KDE_DEFAULT_KONQ_ACTIVATION_EFFECT);
 }
 
 bool TDEGlobalSettings::opaqueResize()
 {
-    KConfigGroup g( TDEGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     return g.readBoolEntry("OpaqueResize",
         KDE_DEFAULT_OPAQUE_RESIZE);
 }
 
 int TDEGlobalSettings::buttonLayout()
 {
-    KConfigGroup g( TDEGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     return g.readNumEntry("ButtonLayout",
         KDE_DEFAULT_BUTTON_LAYOUT);
 }
diff --git a/tdecore/kglobalsettings.h b/tdecore/kglobalsettings.h
index 2d3adc5e1..7a9c42900 100644
--- a/tdecore/kglobalsettings.h
+++ b/tdecore/kglobalsettings.h
@@ -241,7 +241,7 @@ class TDECORE_EXPORT TDEGlobalSettings
     /**
      * DEPRECATED (starting from kde-3.4).
      * This isn't where the trash contents is, anymore.
-     * Use KIO::trash() to trash files, "trash:/" to list the trash contents.
+     * Use TDEIO::trash() to trash files, "trash:/" to list the trash contents.
      */
     static TQString trashPath() { initStatic(); return *s_trashPath; }
     // KDE4: if you want to remove the above, move it to kdesktop/init.cc, which needs
diff --git a/tdecore/kiconeffect.cpp b/tdecore/kiconeffect.cpp
index 546ef99eb..4fd16a49a 100644
--- a/tdecore/kiconeffect.cpp
+++ b/tdecore/kiconeffect.cpp
@@ -63,7 +63,7 @@ KIconEffect::~KIconEffect()
 
 void KIconEffect::init()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
 
     int i, j, effect=-1;
     TQStringList groups;
@@ -86,7 +86,7 @@ void KIconEffect::init()
     TQString _none("none");
     TQString _tomonochrome("tomonochrome");
 
-    KConfigGroupSaver cs(config, "default");
+    TDEConfigGroupSaver cs(config, "default");
 
     for (it=groups.begin(), i=0; it!=groups.end(); it++, i++)
     {
diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp
index 01aaa84fd..127f8eaba 100644
--- a/tdecore/kiconloader.cpp
+++ b/tdecore/kiconloader.cpp
@@ -214,8 +214,8 @@ void KIconLoader::init( const TQString& _appname, KStandardDirs *_dirs )
 
     // These have to match the order in kicontheme.h
     static const char * const groups[] = { "Desktop", "Toolbar", "MainToolbar", "Small", "Panel", 0L };
-    KConfig *config = TDEGlobal::config();
-    KConfigGroupSaver cs(config, "dummy");
+    TDEConfig *config = TDEGlobal::config();
+    TDEConfigGroupSaver cs(config, "dummy");
 
     // loading config and default sizes
     d->mpGroups = new KIconGroup[(int) KIcon::LastGroup];
diff --git a/tdecore/kiconloader.h b/tdecore/kiconloader.h
index 9cac06c5d..2357aef13 100644
--- a/tdecore/kiconloader.h
+++ b/tdecore/kiconloader.h
@@ -33,7 +33,7 @@
 
 struct KIconGroup;
 class KIconThemeNode;
-class KConfig;
+class TDEConfig;
 struct KIconLoaderPrivate;
 class KStandardDirs;
 class KIconEffect;
diff --git a/tdecore/kicontheme.cpp b/tdecore/kicontheme.cpp
index 103d37a05..853c0ab78 100644
--- a/tdecore/kicontheme.cpp
+++ b/tdecore/kicontheme.cpp
@@ -52,7 +52,7 @@ public:
 class KIconThemeDir
 {
 public:
-    KIconThemeDir(const TQString& dir, const KConfigBase *config);
+    KIconThemeDir(const TQString& dir, const TDEConfigBase *config);
 
     bool isValid() const { return mbValid; }
     TQString iconPath(const TQString& name) const;
@@ -139,7 +139,7 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName)
     // Use KSharedConfig to avoid parsing the file many times, from each kinstance.
     // Need to keep a ref to it to make this useful
     d->sharedConfig = KSharedConfig::openConfig( fileName, true /*readonly*/, false /*useKDEGlobals*/ );
-    KConfig& cfg = *d->sharedConfig;
+    TDEConfig& cfg = *d->sharedConfig;
     //was: KSimpleConfig cfg(fileName);
 
     cfg.setGroup(mainSection);
@@ -448,8 +448,8 @@ TQString KIconTheme::current()
         return *_theme;
 
     _theme = new TQString();
-    KConfig *config = TDEGlobal::config();
-    KConfigGroupSaver saver(config, "Icons");
+    TDEConfig *config = TDEGlobal::config();
+    TDEConfigGroupSaver saver(config, "Icons");
     *_theme = config->readEntry("Theme",defaultThemeName());
     if ( *_theme == TQString::fromLatin1("hicolor") ) *_theme = defaultThemeName();
 /*    if (_theme->isEmpty())
@@ -516,7 +516,7 @@ TQString KIconTheme::defaultThemeName()
 
 /*** KIconThemeDir ***/
 
-KIconThemeDir::KIconThemeDir(const TQString& dir, const KConfigBase *config)
+KIconThemeDir::KIconThemeDir(const TQString& dir, const TDEConfigBase *config)
 {
     mbValid = false;
     mDir = dir;
diff --git a/tdecore/kicontheme.h b/tdecore/kicontheme.h
index 9aa4d8e32..b20dd6340 100644
--- a/tdecore/kicontheme.h
+++ b/tdecore/kicontheme.h
@@ -19,7 +19,7 @@
 #include <tqvaluelist.h>
 #include "tdelibs_export.h"
 
-class KConfig;
+class TDEConfig;
 class KIconThemeDir;
 
 class KIconThemePrivate;
diff --git a/tdecore/kinstance.cpp b/tdecore/kinstance.cpp
index 13e29c049..9b4b7c2c7 100644
--- a/tdecore/kinstance.cpp
+++ b/tdecore/kinstance.cpp
@@ -195,7 +195,7 @@ void TDEInstance::setConfigReadOnly(bool ro)
     m_configReadOnly = ro;
 }
 
-KConfig	*TDEInstance::config() const
+TDEConfig	*TDEInstance::config() const
 {
     DEBUG_CHECK_ALIVE
     if( _config == 0 ) {
diff --git a/tdecore/kinstance.h b/tdecore/kinstance.h
index 775fe3bdf..8178fe9c5 100644
--- a/tdecore/kinstance.h
+++ b/tdecore/kinstance.h
@@ -20,7 +20,7 @@
 
 class KStandardDirs;
 class TDEAboutData;
-class KConfig;
+class TDEConfig;
 class KIconLoader;
 class KCharsets;
 class TQFont;
@@ -86,13 +86,13 @@ class TDECORE_EXPORT TDEInstance
 
     /**
      * Returns the general config object ("appnamerc").
-     * @return the KConfig object for the instance.
+     * @return the TDEConfig object for the instance.
      */
-    KConfig            *config() const;
+    TDEConfig            *config() const;
 
     /**
      * Returns the general config object ("appnamerc").
-     * @return the KConfig object for the instance.
+     * @return the TDEConfig object for the instance.
      */
     KSharedConfig      *sharedConfig() const;
 
@@ -165,7 +165,7 @@ protected:
 private:
     mutable KStandardDirs       *_dirs;
 
-    mutable KConfig             *_config;
+    mutable TDEConfig             *_config;
     mutable KIconLoader         *_iconLoader;
 
     mutable TDEHardwareDevices  *_hardwaredevices;
diff --git a/tdecore/kkeyserver_x11.cpp b/tdecore/kkeyserver_x11.cpp
index d0ec7583d..e7673debb 100644
--- a/tdecore/kkeyserver_x11.cpp
+++ b/tdecore/kkeyserver_x11.cpp
@@ -361,7 +361,7 @@ bool initializeMods()
 
 	XFreeModifiermap( xmk );
 
-	//KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
+	//TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
 	// read in mod that win should be attached to
 
 	g_bInitializedMods = true;
@@ -380,7 +380,7 @@ static void initializeVariations()
 
 static void intializeKKeyLabels()
 {
-	KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
+	TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
 	g_rgModInfo[0].sLabel = TDEGlobal::config()->readEntry( "Label Shift", i18n(g_rgModInfo[0].psName) );
 	g_rgModInfo[1].sLabel = TDEGlobal::config()->readEntry( "Label Ctrl", i18n(g_rgModInfo[1].psName) );
 	g_rgModInfo[2].sLabel = TDEGlobal::config()->readEntry( "Label Alt", i18n(g_rgModInfo[2].psName) );
diff --git a/tdecore/klocale.cpp b/tdecore/klocale.cpp
index 6b64abbd8..4c60bed43 100644
--- a/tdecore/klocale.cpp
+++ b/tdecore/klocale.cpp
@@ -62,12 +62,12 @@ public:
   TQValueList<KCatalogue> catalogues; // list of all loaded catalogs, contains one instance per catalog name and language
   TQString encoding;
   TQTextCodec * codecForEncoding;
-  KConfig * config;
+  TDEConfig * config;
   bool formatInited;
   int /*TQPrinter::PageSize*/ pageSize;
   KLocale::MeasureSystem measureSystem;
   TQStringList langTwoAlpha;
-  KConfig *languages;
+  TDEConfig *languages;
 
   TQString calendarType;
   KCalendarSystem * calendar;
@@ -81,7 +81,7 @@ public:
 
 static KLocale *this_klocale = 0;
 
-KLocale::KLocale( const TQString & catalog, KConfig * config )
+KLocale::KLocale( const TQString & catalog, TDEConfig * config )
 {
   d = new KLocalePrivate;
   d->config = config;
@@ -92,7 +92,7 @@ KLocale::KLocale( const TQString & catalog, KConfig * config )
   initEncoding(0);
   initFileNameEncoding(0);
 
-  KConfig *cfg = d->config;
+  TDEConfig *cfg = d->config;
   this_klocale = this;
   if (!cfg) cfg = TDEGlobal::instance()->config();
   this_klocale = 0;
@@ -103,12 +103,12 @@ KLocale::KLocale( const TQString & catalog, KConfig * config )
   initMainCatalogues(catalog);
 }
 
-TQString KLocale::_initLanguage(KConfigBase *config)
+TQString KLocale::_initLanguage(TDEConfigBase *config)
 {
   if (this_klocale)
   {
      // ### HPB Why this cast??
-     this_klocale->initLanguageList((KConfig *) config, true);
+     this_klocale->initLanguageList((TDEConfig *) config, true);
      // todo: adapt current catalog list: remove unused languages, insert main catalogs, if not already found
      return this_klocale->language();
   }
@@ -144,9 +144,9 @@ void KLocale::initMainCatalogues(const TQString & catalog)
   }
 }
 
-void KLocale::initLanguageList(KConfig * config, bool useEnv)
+void KLocale::initLanguageList(TDEConfig * config, bool useEnv)
 {
-  KConfigGroupSaver saver(config, "Locale");
+  TDEConfigGroupSaver saver(config, "Locale");
 
   m_country = config->readEntry( "Country" );
   if ( m_country.isEmpty() )
@@ -297,19 +297,19 @@ void KLocale::doFormatInit() const
 
 void KLocale::initFormat()
 {
-  KConfig *config = d->config;
+  TDEConfig *config = d->config;
   if (!config) config = TDEGlobal::instance()->config();
   Q_ASSERT( config );
 
   kdDebug(173) << "KLocale::initFormat" << endl;
 
   // make sure the config files are read using the correct locale
-  // ### Why not add a KConfigBase::setLocale( const KLocale * )?
+  // ### Why not add a TDEConfigBase::setLocale( const KLocale * )?
   // ### Then we could remove this hack
   KLocale *lsave = TDEGlobal::_locale;
   TDEGlobal::_locale = this;
 
-  KConfigGroupSaver saver(config, "Locale");
+  TDEConfigGroupSaver saver(config, "Locale");
 
   KSimpleConfig entry(locate("locale",
                              TQString::fromLatin1("l10n/%1/entry.desktop")
@@ -2054,7 +2054,7 @@ bool KLocale::useDefaultLanguage() const
   return language() == defaultLanguage();
 }
 
-void KLocale::initEncoding(KConfig *)
+void KLocale::initEncoding(TDEConfig *)
 {
   const int mibDefault = 4; // ISO 8859-1
 
@@ -2070,7 +2070,7 @@ void KLocale::initEncoding(KConfig *)
   Q_ASSERT( d->codecForEncoding );
 }
 
-void KLocale::initFileNameEncoding(KConfig *)
+void KLocale::initFileNameEncoding(TDEConfig *)
 {
   // If the following environment variable is set, assume all filenames
   // are in UTF-8 regardless of the current C locale.
@@ -2325,7 +2325,7 @@ TQStringList KLocale::languagesTwoAlpha() const
 
   TQStringList result;
 
-  KConfig config(TQString::fromLatin1("language.codes"), true, false);
+  TDEConfig config(TQString::fromLatin1("language.codes"), true, false);
   config.setGroup("TwoLetterCodes");
 
   for ( TQStringList::ConstIterator it = origList.begin();
@@ -2359,7 +2359,7 @@ TQStringList KLocale::languagesTwoAlpha() const
 TQStringList KLocale::allLanguagesTwoAlpha() const
 {
   if (!d->languages)
-    d->languages = new KConfig("all_languages", true, false, "locale");
+    d->languages = new TDEConfig("all_languages", true, false, "locale");
 
   return d->languages->groupList();
 }
@@ -2367,7 +2367,7 @@ TQStringList KLocale::allLanguagesTwoAlpha() const
 TQString KLocale::twoAlphaToLanguageName(const TQString &code) const
 {
   if (!d->languages)
-    d->languages = new KConfig("all_languages", true, false, "locale");
+    d->languages = new TDEConfig("all_languages", true, false, "locale");
 
   TQString groupName = code;
   const int i = groupName.find('_');
@@ -2393,7 +2393,7 @@ TQStringList KLocale::allCountriesTwoAlpha() const
 
 TQString KLocale::twoAlphaToCountryName(const TQString &code) const
 {
-  KConfig cfg("l10n/"+code.lower()+"/entry.desktop", true, false, "locale");
+  TDEConfig cfg("l10n/"+code.lower()+"/entry.desktop", true, false, "locale");
   cfg.setGroup("KCM Locale");
   return cfg.readEntry("Name");
 }
diff --git a/tdecore/klocale.h b/tdecore/klocale.h
index 42619afd4..7a8e05e98 100644
--- a/tdecore/klocale.h
+++ b/tdecore/klocale.h
@@ -32,8 +32,8 @@ class TQTime;
 class TQDateTime;
 
 class TDEGlobal;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 class KLocalePrivate;
 class KCatalogue;
 class KCalendarSystem;
@@ -141,7 +141,7 @@ public:
    * @param catalog The name of the main language file
    * @param config The configuration file to use.
    */
-  KLocale( const TQString& catalog, KConfig *config = 0 );
+  KLocale( const TQString& catalog, TDEConfig *config = 0 );
 
   /**
    * Copy constructor.
@@ -1138,9 +1138,9 @@ public:
 
 
   /**
-   * @internal Called from KConfigBackend to initialize language.
+   * @internal Called from TDEConfigBackend to initialize language.
    */
-  static TQString _initLanguage(KConfigBase *config);
+  static TQString _initLanguage(TDEConfigBase *config);
 
 #ifdef KDE_NO_COMPAT
 private:
@@ -1185,7 +1185,7 @@ private:
    *
    * @param config The configuration object used for init.
    */
-  void initFormat(KConfig *config);
+  void initFormat(TDEConfig *config);
   
   /**
    * @internal Initializes the catalogs appname, tdelibs and kio for all chosen languages.
@@ -1203,20 +1203,20 @@ private:
    * @param config The configuration object used for init
    * @param useEnv True if we should use environment variables
    */
-  void initLanguageList(KConfig * config, bool useEnv);
+  void initLanguageList(TDEConfig * config, bool useEnv);
 
   /**
    * @internal Figures out which encoding the user prefers.
    *
    * @param config The configuration object used for init
    */
-  void initEncoding(KConfig * config);
+  void initEncoding(TDEConfig * config);
 
   /**
    * @internal Figures out which encoding the user prefers for filenames
    * and sets up the appropriate TQFile encoding and decoding functions.
    */
-  void initFileNameEncoding(KConfig *config);
+  void initFileNameEncoding(TDEConfig *config);
 
   /**
    * @internal A TQFile filename encoding function (TQFile::encodeFn).
diff --git a/tdecore/knotifyclient.cpp b/tdecore/knotifyclient.cpp
index e84c8c44a..e5d088dcb 100644
--- a/tdecore/knotifyclient.cpp
+++ b/tdecore/knotifyclient.cpp
@@ -51,12 +51,12 @@ static bool canAvoidStartupEvent( const TQString& event, const TQString& appname
         return false;
     }
     // starttde event is in global events file
-    static KConfig* configfile = appname != "ksmserver"
-        ? new KConfig( appname + ".eventsrc", true, false )
-        : new KConfig( "knotify.eventsrc", true, false );
-    static KConfig* eventsfile = appname != "ksmserver"
-        ? new KConfig( appname + "/eventsrc", true, false, "data" )
-        : new KConfig( "knotify/eventsrc", true, false, "data" );
+    static TDEConfig* configfile = appname != "ksmserver"
+        ? new TDEConfig( appname + ".eventsrc", true, false )
+        : new TDEConfig( "knotify.eventsrc", true, false );
+    static TDEConfig* eventsfile = appname != "ksmserver"
+        ? new TDEConfig( appname + "/eventsrc", true, false, "data" )
+        : new TDEConfig( "knotify/eventsrc", true, false, "data" );
     configfile->setGroup( event );
     eventsfile->setGroup( event );
     int ev1 = configfile->readNumEntry( "presentation", -2 );
@@ -178,7 +178,7 @@ int KNotifyClient::getPresentation(const TQString &eventname)
 	int present;
 	if (eventname.isEmpty()) return Default;
 
-	KConfig eventsfile( KNotifyClient::instance()->instanceName()+".eventsrc", true, false);
+	TDEConfig eventsfile( KNotifyClient::instance()->instanceName()+".eventsrc", true, false);
 	eventsfile.setGroup(eventname);
 
 	present=eventsfile.readNumEntry("presentation", -1);
@@ -190,7 +190,7 @@ TQString KNotifyClient::getFile(const TQString &eventname, int present)
 {
 	if (eventname.isEmpty()) return TQString::null;
 
-	KConfig eventsfile( KNotifyClient::instance()->instanceName()+".eventsrc", true, false);
+	TDEConfig eventsfile( KNotifyClient::instance()->instanceName()+".eventsrc", true, false);
 	eventsfile.setGroup(eventname);
 
 	switch (present)
@@ -209,7 +209,7 @@ int KNotifyClient::getDefaultPresentation(const TQString &eventname)
 	int present;
 	if (eventname.isEmpty()) return Default;
 
-	KConfig eventsfile( KNotifyClient::instance()->instanceName()+"/eventsrc", true, false, "data");
+	TDEConfig eventsfile( KNotifyClient::instance()->instanceName()+"/eventsrc", true, false, "data");
 	eventsfile.setGroup(eventname);
 
 	present=eventsfile.readNumEntry("default_presentation", -1);
@@ -221,7 +221,7 @@ TQString KNotifyClient::getDefaultFile(const TQString &eventname, int present)
 {
 	if (eventname.isEmpty()) return TQString::null;
 
-	KConfig eventsfile( KNotifyClient::instance()->instanceName()+"/eventsrc", true, false, "data");
+	TDEConfig eventsfile( KNotifyClient::instance()->instanceName()+"/eventsrc", true, false, "data");
 	eventsfile.setGroup(eventname);
 
 	switch (present)
@@ -332,8 +332,8 @@ KNotifyClient::Instance::Instance(TDEInstance *instance)
     d->instance = instance;
     instances()->push(this);
 
-    KConfig *config = instance->config();
-    KConfigGroupSaver cs( config, "General" );
+    TDEConfig *config = instance->config();
+    TDEConfigGroupSaver cs( config, "General" );
     d->useSystemBell = config->readBoolEntry( "UseSystemBell", false );
 }
 
diff --git a/tdecore/krootprop.h b/tdecore/krootprop.h
index 002790ca4..f1a72d265 100644
--- a/tdecore/krootprop.h
+++ b/tdecore/krootprop.h
@@ -33,14 +33,14 @@ class KRootPropPrivate;
 /**
 * Access KDE desktop resources stored on the root window.
 *
-* A companion to the KConfig class.
+* A companion to the TDEConfig class.
 *
 * The KRootProp class is used for reading and writing configuration entries
 * to properties on the root window.
 *
 * All configuration entries are of the form "key=value".
 *
-* @see  KConfig::KConfig
+* @see  TDEConfig::TDEConfig
 * @author Mark Donohoe (donohe@kde.org)
 */
 class TDECORE_EXPORT KRootProp
diff --git a/tdecore/kshortcutlist.cpp b/tdecore/kshortcutlist.cpp
index 9666f7aab..fcfc48b48 100644
--- a/tdecore/kshortcutlist.cpp
+++ b/tdecore/kshortcutlist.cpp
@@ -68,7 +68,7 @@ bool KShortcutList::setOther( Other, uint, TQVariant )
 	return false;
 }
 
-bool KShortcutList::readSettings( const TQString& sConfigGroup, KConfigBase* pConfig )
+bool KShortcutList::readSettings( const TQString& sConfigGroup, TDEConfigBase* pConfig )
 {
 	kdDebug(125) << "KShortcutList::readSettings( \"" << sConfigGroup << "\", " << pConfig << " ) start" << endl;
 	if( !pConfig )
@@ -84,7 +84,7 @@ bool KShortcutList::readSettings( const TQString& sConfigGroup, KConfigBase* pCo
 	kdDebug(125) << "\treadSettings( \"" << sGroup << "\", " << pConfig << " )" << endl;
 	if( !pConfig->hasGroup( sGroup ) )
 		return true;
-	KConfigGroupSaver cgs( pConfig, sGroup );
+	TDEConfigGroupSaver cgs( pConfig, sGroup );
 
 	uint nSize = count();
 	for( uint i = 0; i < nSize; i++ ) {
@@ -106,7 +106,7 @@ bool KShortcutList::readSettings( const TQString& sConfigGroup, KConfigBase* pCo
 	return true;
 }
 
-bool KShortcutList::writeSettings( const TQString &sConfigGroup, KConfigBase* pConfig, bool bWriteAll, bool bGlobal ) const
+bool KShortcutList::writeSettings( const TQString &sConfigGroup, TDEConfigBase* pConfig, bool bWriteAll, bool bGlobal ) const
 {
 	kdDebug(125) << "KShortcutList::writeSettings( " << sConfigGroup << ", " << pConfig << ", " << bWriteAll << ", " << bGlobal << " )" << endl;
 	if( !pConfig )
@@ -118,7 +118,7 @@ bool KShortcutList::writeSettings( const TQString &sConfigGroup, KConfigBase* pC
 	if( pConfig->hasGroup( "Keys" ) )
 		pConfig->deleteGroup( "Keys", true );
 
-	KConfigGroupSaver cs( pConfig, sGroup );
+	TDEConfigGroupSaver cs( pConfig, sGroup );
 
 	uint nSize = count();
 	for( uint i = 0; i < nSize; i++ ) {
diff --git a/tdecore/kshortcutlist.h b/tdecore/kshortcutlist.h
index 497bfaf15..7f4caa079 100644
--- a/tdecore/kshortcutlist.h
+++ b/tdecore/kshortcutlist.h
@@ -25,7 +25,7 @@
 #include "tdelibs_export.h"
 
 class TQVariant;
-class KConfigBase;
+class TDEConfigBase;
 class TDEInstance;
 class KKeySequence;
 class KShortcut;
@@ -162,7 +162,7 @@ class TDECORE_EXPORT KShortcutList
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	virtual bool readSettings( const TQString& sConfigGroup = TQString::null, KConfigBase* pConfig = 0 );
+	virtual bool readSettings( const TQString& sConfigGroup = TQString::null, TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the shortcuts to the given configuration file.
@@ -173,7 +173,7 @@ class TDECORE_EXPORT KShortcutList
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	virtual bool writeSettings( const TQString& sConfigGroup = TQString::null, KConfigBase* pConfig = 0,
+	virtual bool writeSettings( const TQString& sConfigGroup = TQString::null, TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
  protected:
diff --git a/tdecore/ksimpleconfig.cpp b/tdecore/ksimpleconfig.cpp
index 5c17b665d..5c0203a9f 100644
--- a/tdecore/ksimpleconfig.cpp
+++ b/tdecore/ksimpleconfig.cpp
@@ -38,9 +38,9 @@
 #include "ksimpleconfig.h"
 
 KSimpleConfig::KSimpleConfig(const TQString &fileName, bool bReadOnly)
-  : KConfig(TQString::fromLatin1(""), bReadOnly, false)
+  : TDEConfig(TQString::fromLatin1(""), bReadOnly, false)
 {
-  // the difference between KConfig and KSimpleConfig is just that
+  // the difference between TDEConfig and KSimpleConfig is just that
   // for KSimpleConfig an absolute filename is guaranteed
   if (!fileName.isNull() && TQDir::isRelativePath(fileName)) {
      backEnd->changeFileName( TDEGlobal::dirs()->
@@ -52,16 +52,16 @@ KSimpleConfig::KSimpleConfig(const TQString &fileName, bool bReadOnly)
   reparseConfiguration();
 }
 
-KSimpleConfig::KSimpleConfig(KConfigBackEnd *backEnd, bool bReadOnly)
-  : KConfig(backEnd, bReadOnly)
+KSimpleConfig::KSimpleConfig(TDEConfigBackEnd *backEnd, bool bReadOnly)
+  : TDEConfig(backEnd, bReadOnly)
 {}
 
 KSimpleConfig::~KSimpleConfig()
 {
   // we need to call the KSimpleConfig version of sync.  Relying on the
-  // regular KConfig sync is bad, because the KSimpleConfig sync has
+  // regular TDEConfig sync is bad, because the KSimpleConfig sync has
   // different behavior.  Syncing here will insure that the sync() call
-  // in the KConfig destructor doesn't actually do anything.
+  // in the TDEConfig destructor doesn't actually do anything.
   sync();
 }
 
@@ -76,6 +76,6 @@ void KSimpleConfig::sync()
 }
 
 void KSimpleConfig::virtual_hook( int id, void* data )
-{ KConfig::virtual_hook( id, data ); }
+{ TDEConfig::virtual_hook( id, data ); }
 
 #include "ksimpleconfig.moc"
diff --git a/tdecore/ksimpleconfig.h b/tdecore/ksimpleconfig.h
index c7efeecfa..326fc8094 100644
--- a/tdecore/ksimpleconfig.h
+++ b/tdecore/ksimpleconfig.h
@@ -28,17 +28,17 @@ class KSimpleConfigPrivate;
 /**
  * KDE Configuration entries
  *
- * This is a trivial extension of KConfig for applications that need
+ * This is a trivial extension of TDEConfig for applications that need
  * only one configuration file and no default system.
- * A difference with KConfig is that when the data in memory is written back
+ * A difference with TDEConfig is that when the data in memory is written back
  * it is not merged with what is on disk.
  * Whatever is in memory simply replaces what is on disk entirely.
  *
  * @author Kalle Dalheimer <kalle@kde.org>, Preston Brown <pbrown@kde.org>
- * @see KConfigBase KConfig
+ * @see TDEConfigBase TDEConfig
  * @short KDE Configuration Management class with deletion ability
  */
-class TDECORE_EXPORT KSimpleConfig : public KConfig
+class TDECORE_EXPORT KSimpleConfig : public TDEConfig
 {
   Q_OBJECT
 
@@ -55,7 +55,7 @@ public:
    */
   KSimpleConfig( const TQString &fileName, bool bReadOnly = false);
 
-  KSimpleConfig(KConfigBackEnd *backEnd, bool bReadOnly = false);
+  KSimpleConfig(TDEConfigBackEnd *backEnd, bool bReadOnly = false);
 
   /**
    * Destructor.
diff --git a/tdecore/ksimpledirwatch.cpp b/tdecore/ksimpledirwatch.cpp
index 9552c4104..08d686beb 100644
--- a/tdecore/ksimpledirwatch.cpp
+++ b/tdecore/ksimpledirwatch.cpp
@@ -214,7 +214,7 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate()
   delayRemove = false;
   m_ref = 0;
 
-  KConfigGroup config(TDEGlobal::config(), TQCString("DirWatch"));
+  TDEConfigGroup config(TDEGlobal::config(), TQCString("DirWatch"));
   m_nfsPollInterval = config.readNumEntry("NFSPollInterval", 5000);
   m_PollInterval = config.readNumEntry("PollInterval", 500);
 
diff --git a/tdecore/ksock.cpp b/tdecore/ksock.cpp
index 10c694512..96526463a 100644
--- a/tdecore/ksock.cpp
+++ b/tdecore/ksock.cpp
@@ -89,21 +89,21 @@ extern "C" {
 #include "tqwindowdefs.h"
 #endif 
 
-class KSocketPrivate
+class TDESocketPrivate
 {
 public:
   TQSocketNotifier *readNotifier;
   TQSocketNotifier *writeNotifier;
 
-  KSocketPrivate() :
+  TDESocketPrivate() :
     readNotifier(0), writeNotifier(0)
   { }
 };
 
 // I moved this into here so we could accurately detect the domain, for
 // posterity.  Really.
-KSocket::KSocket( int _sock)
-  : sock(_sock), d(new KSocketPrivate)
+TDESocket::TDESocket( int _sock)
+  : sock(_sock), d(new TDESocketPrivate)
 {
   struct sockaddr_in sin;
   ksocklen_t len = sizeof(sin);
@@ -116,19 +116,19 @@ KSocket::KSocket( int _sock)
   KSocks::self()->getsockname(_sock, (struct sockaddr *)&sin, &len);
 }
 
-KSocket::KSocket( const char *_host, unsigned short int _port, int _timeout ) :
-  sock( -1 ), d(new KSocketPrivate)
+TDESocket::TDESocket( const char *_host, unsigned short int _port, int _timeout ) :
+  sock( -1 ), d(new TDESocketPrivate)
 {
     connect( _host, _port, _timeout );
 }
 
-KSocket::KSocket( const char *_path ) :
-  sock( -1 ), d(new KSocketPrivate)
+TDESocket::TDESocket( const char *_path ) :
+  sock( -1 ), d(new TDESocketPrivate)
 {
   connect( _path );
 }
 
-void KSocket::enableRead( bool _state )
+void TDESocket::enableRead( bool _state )
 {
   if ( _state )
     {
@@ -144,7 +144,7 @@ void KSocket::enableRead( bool _state )
 	d->readNotifier->setEnabled( false );
 }
 
-void KSocket::enableWrite( bool _state )
+void TDESocket::enableWrite( bool _state )
 {
   if ( _state )
     {
@@ -161,7 +161,7 @@ void KSocket::enableWrite( bool _state )
 	d->writeNotifier->setEnabled( false );
 }
 
-void KSocket::slotRead( int )
+void TDESocket::slotRead( int )
 {
   char buffer[2];
 
@@ -172,7 +172,7 @@ void KSocket::slotRead( int )
 	emit readEvent( this );
 }
 
-void KSocket::slotWrite( int )
+void TDESocket::slotWrite( int )
 {
   emit writeEvent( this );
 }
@@ -180,7 +180,7 @@ void KSocket::slotWrite( int )
 /*
  * Connects the PF_UNIX domain socket to _path.
  */
-bool KSocket::connect( const char *_path )
+bool TDESocket::connect( const char *_path )
 {
   KExtendedSocket ks(TQString::null, _path, KExtendedSocket::unixSocket);
 
@@ -194,7 +194,7 @@ bool KSocket::connect( const char *_path )
 /*
  * Connects the socket to _host, _port.
  */
-bool KSocket::connect( const TQString& _host, unsigned short int _port, int _timeout )
+bool TDESocket::connect( const TQString& _host, unsigned short int _port, int _timeout )
 {
   KExtendedSocket ks(_host, _port, KExtendedSocket::inetSocket);
   ks.setTimeout(_timeout, 0);
@@ -208,10 +208,10 @@ bool KSocket::connect( const TQString& _host, unsigned short int _port, int _tim
 
 // only for doxygen - the define is always true as defined above
 #ifdef KSOCK_NO_BROKEN
-unsigned long KSocket::ipv4_addr()
+unsigned long TDESocket::ipv4_addr()
 {
   unsigned long retval = 0;
-  KSocketAddress *sa = KExtendedSocket::peerAddress(sock);
+  TDESocketAddress *sa = KExtendedSocket::peerAddress(sock);
   if (sa == NULL)
     return 0;
 
@@ -230,12 +230,12 @@ unsigned long KSocket::ipv4_addr()
   return retval;
 }
 
-bool KSocket::initSockaddr (ksockaddr_in *server_name, const char *hostname, unsigned short int port, int domain)
+bool TDESocket::initSockaddr (ksockaddr_in *server_name, const char *hostname, unsigned short int port, int domain)
 {
   // This function is now IPv4 only
   // if you want something better, you should use KExtendedSocket::lookup yourself
 
-  kdWarning(170) << "deprecated KSocket::initSockaddr called" << endl;
+  kdWarning(170) << "deprecated TDESocket::initSockaddr called" << endl;
 
   if (domain != PF_INET)
     return false;
@@ -255,13 +255,13 @@ bool KSocket::initSockaddr (ksockaddr_in *server_name, const char *hostname, uns
     return false;
 
   memcpy(server_name, sin->addressV4(), sizeof(*server_name));
-  kdDebug(170) << "KSocket::initSockaddr: returning " << sin->pretty() << endl;
+  kdDebug(170) << "TDESocket::initSockaddr: returning " << sin->pretty() << endl;
   return true;
 }
 
 #endif
 
-KSocket::~KSocket()
+TDESocket::~TDESocket()
 {
   // Coolo says delete 0 is ok :) -thiago
   delete d->readNotifier;
@@ -274,7 +274,7 @@ KSocket::~KSocket()
   }
 }
 
-class KServerSocketPrivate
+class TDEServerSocketPrivate
 {
 public:
    bool bind;
@@ -284,25 +284,25 @@ public:
 };
 
 
-KServerSocket::KServerSocket( const char *_path, bool _bind ) :
+TDEServerSocket::TDEServerSocket( const char *_path, bool _bind ) :
   sock( -1 )
 {
-  d = new KServerSocketPrivate();
+  d = new TDEServerSocketPrivate();
   d->bind = _bind;
 
   init ( _path );
 }
 
-KServerSocket::KServerSocket( unsigned short int _port, bool _bind ) :
+TDEServerSocket::TDEServerSocket( unsigned short int _port, bool _bind ) :
   sock( -1 )
 {
-  d = new KServerSocketPrivate();
+  d = new TDEServerSocketPrivate();
   d->bind = _bind;
 
   init ( _port );
 }
 
-bool KServerSocket::init( const char *_path )
+bool TDEServerSocket::init( const char *_path )
 {
   unlink(_path );
   d->path = _path;
@@ -317,7 +317,7 @@ bool KServerSocket::init( const char *_path )
 }
 
 
-bool KServerSocket::init( unsigned short int _port )
+bool TDEServerSocket::init( unsigned short int _port )
 {
   d->port = _port;
   KExtendedSocket *ks;
@@ -330,7 +330,7 @@ bool KServerSocket::init( unsigned short int _port )
   return true;
 }
 
-bool KServerSocket::bindAndListen()
+bool TDEServerSocket::bindAndListen()
 {
   if (d == NULL || d->ks == NULL)
     return false;
@@ -354,11 +354,11 @@ bool KServerSocket::bindAndListen()
 }
 
 
-unsigned short int KServerSocket::port()
+unsigned short int TDEServerSocket::port()
 {
   if (d == NULL || d->ks == NULL || sock == -1)
     return 0;
-  const KSocketAddress *sa = d->ks->localAddress();
+  const TDESocketAddress *sa = d->ks->localAddress();
   if (sa == NULL)
     return 0;
 
@@ -378,11 +378,11 @@ unsigned short int KServerSocket::port()
   return 0;			// not a port we know
 }
 
-unsigned long KServerSocket::ipv4_addr()
+unsigned long TDEServerSocket::ipv4_addr()
 {
   if (d == NULL || d->ks == NULL || sock == -1)
     return 0;
-  const KSocketAddress *sa = d->ks->localAddress();
+  const TDESocketAddress *sa = d->ks->localAddress();
 
   const sockaddr_in *sin = (sockaddr_in*)sa->address();
 
@@ -401,7 +401,7 @@ unsigned long KServerSocket::ipv4_addr()
   return 0;			// this is dumb, isn't it?
 }
 
-void KServerSocket::slotAccept( int )
+void TDEServerSocket::slotAccept( int )
 {
   if (d == NULL || d->ks == NULL || sock == -1)
     return;			// nothing!
@@ -417,10 +417,10 @@ void KServerSocket::slotAccept( int )
   s->release();			// we're getting rid of the KExtendedSocket
   delete s;
 
-  emit accepted( new KSocket( new_sock ) );
+  emit accepted( new TDESocket( new_sock ) );
 }
 
-KServerSocket::~KServerSocket()
+TDEServerSocket::~TDEServerSocket()
 {
   if (d != NULL)
     {
diff --git a/tdecore/ksock.h b/tdecore/ksock.h
index d6e4515ea..cdf4ad1ac 100644
--- a/tdecore/ksock.h
+++ b/tdecore/ksock.h
@@ -65,8 +65,8 @@ typedef sockaddr_in ksockaddr_in;
 
 #define KSOCK_DEFAULT_DOMAIN PF_INET
 
-class KSocketPrivate;
-class KServerSocketPrivate;
+class TDESocketPrivate;
+class TDEServerSocketPrivate;
 
 /** @deprecated
  * You can connect this socket to any Internet address.
@@ -79,7 +79,7 @@ class KServerSocketPrivate;
  * Using socket() you get a file descriptor
  * which you can use with the usual UNIX function like write() or
  * read().
- * If you have already such a socket identifier you can construct a KSocket
+ * If you have already such a socket identifier you can construct a TDESocket
  * on this identifier.
  *
  * If socket() delivers a value of -1 or less, the connection
@@ -88,33 +88,33 @@ class KServerSocketPrivate;
  * @author Torben Weis <weis@uni-frankfurt.de>
  * @short A TCP/IP client socket.
  */
-class TDECORE_EXPORT KSocket : public TQObject
+class TDECORE_EXPORT TDESocket : public TQObject
 {
     Q_OBJECT
 public:
     /**
-     * Constructs a KSocket with the provided file descriptor.
+     * Constructs a TDESocket with the provided file descriptor.
      * @param _sock	The file descriptor to use.
      */
-    KSocket( int _sock ) KDE_DEPRECATED;
+    TDESocket( int _sock ) KDE_DEPRECATED;
     /**
      * Creates a socket and connects to a host.
      * @param _host	The remote host to which to connect.
      * @param _port	The port on the remote host.
      * @param timeOut	The number of seconds waiting for connect (default 30).
      */
-    KSocket( const char *_host, unsigned short int _port, int timeOut = 30) KDE_DEPRECATED;
+    TDESocket( const char *_host, unsigned short int _port, int timeOut = 30) KDE_DEPRECATED;
 
     /**
      * Connects to a UNIX domain socket.
      * @param _path    The filename of the socket.
      */
-    KSocket( const char * _path ) KDE_DEPRECATED;
+    TDESocket( const char * _path ) KDE_DEPRECATED;
 
     /**
      * Destructor. Closes the socket if it is still open.
      */
-    virtual ~KSocket();
+    virtual ~TDESocket();
 
     /**
      * Returns a file descriptor for this socket.
@@ -171,9 +171,9 @@ signals:
      *
      * This signal will only be raised if enableRead( @p true ) was called
      * first.
-     * @param s the KSocket that triggered the event
+     * @param s the TDESocket that triggered the event
      */
-    void readEvent( KSocket *s );
+    void readEvent( TDESocket *s );
 
     /**
      * Socket is ready for writing.
@@ -184,15 +184,15 @@ signals:
      * Warning: If you forget to call enableWrite(false) when you are
      * not ready to send data, you will get lots of writeEvent() signals,
      * in the order of thousands a second !
-     * @param s the KSocket that triggered the event
+     * @param s the TDESocket that triggered the event
      */
-    void writeEvent( KSocket *s );
+    void writeEvent( TDESocket *s );
 
     /**
      * Raised when the connection is broken.
-     * @param s the KSocket that triggered the event
+     * @param s the TDESocket that triggered the event
      */
-    void closeEvent( KSocket *s );
+    void closeEvent( TDESocket *s );
 
 public slots:
     /**
@@ -224,10 +224,10 @@ protected:
     int sock;
 
 private:
-    KSocket(const KSocket&);
-    KSocket& operator=(const KSocket&);
+    TDESocket(const TDESocket&);
+    TDESocket& operator=(const TDESocket&);
 
-    KSocketPrivate *d;
+    TDESocketPrivate *d;
 
 };
 
@@ -239,19 +239,19 @@ private:
  * This class is deprecated and will be removed in the future.
  * Please use the classes in KNetwork for new programs. 
  * In special, this class is replaced by KNetwork::KStreamSocket
- * and KNetwork::KServerSocket. 
+ * and KNetwork::TDEServerSocket. 
  *
- * You can use a KServerSocket to listen on a port for incoming
- * connections. When a connection arrived in the port, a KSocket
+ * You can use a TDEServerSocket to listen on a port for incoming
+ * connections. When a connection arrived in the port, a TDESocket
  * is created and the signal accepted is raised. Make sure you
  * always connect to this signal. If you don't the ServerSocket will
- * create new KSocket's and no one will delete them!
+ * create new TDESocket's and no one will delete them!
  *
  * If socket() is -1 or less the socket was not created properly.
  *
  * @author Torben Weis <weis@stud.uni-frankfurt.de>
 */
-class TDECORE_EXPORT KServerSocket : public TQObject
+class TDECORE_EXPORT TDEServerSocket : public TQObject
 {
     Q_OBJECT
 public:
@@ -262,7 +262,7 @@ public:
      *                  This gives you the opportunity to set options on the
      *                  socket.
      */
-    KServerSocket( unsigned short int _port, bool _bind = true );
+    TDEServerSocket( unsigned short int _port, bool _bind = true );
 
     /**
      * Creates a UNIX domain server socket.
@@ -271,12 +271,12 @@ public:
      *                  This gives you the opportunity to set options on the
      *                  socket.
      */
-    KServerSocket( const char *_path, bool _bind = true);
+    TDEServerSocket( const char *_path, bool _bind = true);
 
     /**
      * Destructor. Closes the socket if it was not already closed.
      */
-    virtual ~KServerSocket();
+    virtual ~TDEServerSocket();
 
     /**
      * Binds the socket and start listening. This should only be called
@@ -319,14 +319,14 @@ public slots:
 signals:
     /**
      * A connection has been accepted.
-     * It is your task to delete the KSocket if it is no longer needed.
+     * It is your task to delete the TDESocket if it is no longer needed.
      *
      * WARNING: this signal is always emitted, even if you don't connect
-     * anything to it. That would mean memory loss, because the KSockets
+     * anything to it. That would mean memory loss, because the TDESockets
      * created go to oblivion.
      * @param s the socket that accepted
      */
-    void accepted( KSocket*s );
+    void accepted( TDESocket*s );
 
 protected:
     bool init( unsigned short int );
@@ -339,10 +339,10 @@ protected:
     int sock;
 
 private:
-    KServerSocket(const KServerSocket&);
-    KServerSocket& operator=(const KServerSocket&);
+    TDEServerSocket(const TDEServerSocket&);
+    TDEServerSocket& operator=(const TDEServerSocket&);
 
-    KServerSocketPrivate *d;
+    TDEServerSocketPrivate *d;
 };
 
 #endif //Q_OS_UNIX
diff --git a/tdecore/ksockaddr.cpp b/tdecore/ksockaddr.cpp
index 899f32dba..cd2f9c93c 100644
--- a/tdecore/ksockaddr.cpp
+++ b/tdecore/ksockaddr.cpp
@@ -77,10 +77,10 @@
 
 
 /**
- * Class KSocketAddress
+ * Class TDESocketAddress
  */
 
-KSocketAddress::KSocketAddress(const sockaddr* sa, ksocklen_t size)
+TDESocketAddress::TDESocketAddress(const sockaddr* sa, ksocklen_t size)
 {
     if ( !sa )
         init();
@@ -94,44 +94,44 @@ KSocketAddress::KSocketAddress(const sockaddr* sa, ksocklen_t size)
     }
 }
 
-void KSocketAddress::init()
+void TDESocketAddress::init()
 {
   data = NULL;
   datasize = 0;
   owndata = false;
 }
 
-KSocketAddress::~KSocketAddress()
+TDESocketAddress::~TDESocketAddress()
 {
   if (owndata && data != NULL)
     free(data);
 }
 
-TQString KSocketAddress::pretty() const
+TQString TDESocketAddress::pretty() const
 {
   return i18n("<unknown socket>");
 }
 
-int KSocketAddress::family() const
+int TDESocketAddress::family() const
 {
   if (data != NULL)
     return data->sa_family;
   return AF_UNSPEC;
 }
 
-// This creates a new KSocketAddress with given sockaddr
-KSocketAddress* KSocketAddress::newAddress(const struct sockaddr* sa, ksocklen_t size)
+// This creates a new TDESocketAddress with given sockaddr
+TDESocketAddress* TDESocketAddress::newAddress(const struct sockaddr* sa, ksocklen_t size)
 {
   if (size == 0)
     {
-      kdWarning() << "KSocketAddress::newAddress called with size = 0!\n";
+      kdWarning() << "TDESocketAddress::newAddress called with size = 0!\n";
       return NULL;
     }
 
   // make sure we have the right stuff
   if (size < MIN_SOCKADDR_LEN)
     {
-      kdWarning() << "KSocketAddress::newAddress called with invalid size\n";
+      kdWarning() << "TDESocketAddress::newAddress called with invalid size\n";
       return NULL;
     }
 
@@ -153,10 +153,10 @@ KSocketAddress* KSocketAddress::newAddress(const struct sockaddr* sa, ksocklen_t
       return new KUnixSocketAddress((const sockaddr_un*)sa, size);
     }
 
-  return new KSocketAddress(sa, size);
+  return new TDESocketAddress(sa, size);
 }
 
-bool KSocketAddress::isEqual(const KSocketAddress& other) const
+bool TDESocketAddress::isEqual(const TDESocketAddress& other) const
 {
   switch(family())
   {
@@ -176,7 +176,7 @@ bool KSocketAddress::isEqual(const KSocketAddress& other) const
   return memcmp(data, other.data, datasize) == 0;
 }
 
-bool KSocketAddress::isCoreEqual(const KSocketAddress& other) const
+bool TDESocketAddress::isCoreEqual(const TDESocketAddress& other) const
 {
   switch(family())
   {
@@ -193,17 +193,17 @@ bool KSocketAddress::isCoreEqual(const KSocketAddress& other) const
   return false;
 }
 
-TQString KSocketAddress::nodeName() const
+TQString TDESocketAddress::nodeName() const
 {
   return TQString::null;
 }
 
-TQString KSocketAddress::serviceName() const
+TQString TDESocketAddress::serviceName() const
 {
   return TQString::null;
 }
 
-int KSocketAddress::ianaFamily(int af)
+int TDESocketAddress::ianaFamily(int af)
 {
   switch (af)
     {
@@ -218,7 +218,7 @@ int KSocketAddress::ianaFamily(int af)
     }
 }
 
-int KSocketAddress::fromIanaFamily(int iana)
+int TDESocketAddress::fromIanaFamily(int iana)
 {
   switch (iana)
     {
@@ -274,7 +274,7 @@ KInetSocketAddress::KInetSocketAddress() :
 }
 
 KInetSocketAddress::KInetSocketAddress(const KInetSocketAddress &other) :
-  KSocketAddress(), d(new KInetSocketAddressPrivate)
+  TDESocketAddress(), d(new KInetSocketAddressPrivate)
 {
   setAddress(other);
 }
@@ -313,7 +313,7 @@ KInetSocketAddress::~KInetSocketAddress()
 {
   delete d;
 
-  //  KSocketAddress::~KSocketAddress();
+  //  TDESocketAddress::~TDESocketAddress();
 }
 
 bool KInetSocketAddress::setAddress(const KInetSocketAddress &other)
@@ -626,7 +626,7 @@ ksocklen_t KInetSocketAddress::size() const
     return 0;
 }
 
-bool KInetSocketAddress::areEqualInet(const KSocketAddress &s1, const KSocketAddress &s2, bool coreOnly)
+bool KInetSocketAddress::areEqualInet(const TDESocketAddress &s1, const TDESocketAddress &s2, bool coreOnly)
 {
    if (s1.family() != s2.family())
       return false;
@@ -643,7 +643,7 @@ bool KInetSocketAddress::areEqualInet(const KSocketAddress &s1, const KSocketAdd
              (memcmp(&sin1->sin_addr, &sin2->sin_addr, sizeof(struct in_addr))  == 0);
 }
 
-bool KInetSocketAddress::areEqualInet6(const KSocketAddress &s1, const KSocketAddress &s2, bool coreOnly)
+bool KInetSocketAddress::areEqualInet6(const TDESocketAddress &s1, const TDESocketAddress &s2, bool coreOnly)
 {
 #ifdef AF_INET6
    if (s1.family() != s2.family())
@@ -688,7 +688,7 @@ void KInetSocketAddress::fromV4()
 # endif
 #endif
 
-  // data == KSocketAddress::data
+  // data == TDESocketAddress::data
   data = (sockaddr*)&d->sin;
   datasize = sizeof( sockaddr_in );	
 }
@@ -864,7 +864,7 @@ const sockaddr_un* KUnixSocketAddress::address() const
   return d->m_sun;
 }
 
-bool KUnixSocketAddress::areEqualUnix(const KSocketAddress &s1, const KSocketAddress &s2, bool /* coreOnly */)
+bool KUnixSocketAddress::areEqualUnix(const TDESocketAddress &s1, const TDESocketAddress &s2, bool /* coreOnly */)
 {
    if (s1.family() != s2.family())
       return false;   
@@ -881,14 +881,14 @@ bool KUnixSocketAddress::areEqualUnix(const KSocketAddress &s1, const KSocketAdd
    return (strcmp(sun1->sun_path, sun2->sun_path) == 0);
 }
 
-void KSocketAddress::virtual_hook( int, void* )
+void TDESocketAddress::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 void KInetSocketAddress::virtual_hook( int id, void* data )
-{ KSocketAddress::virtual_hook( id, data ); }
+{ TDESocketAddress::virtual_hook( id, data ); }
 
 void KUnixSocketAddress::virtual_hook( int id, void* data )
-{ KSocketAddress::virtual_hook( id, data ); }
+{ TDESocketAddress::virtual_hook( id, data ); }
 
 
 #include "ksockaddr.moc"
diff --git a/tdecore/ksockaddr.h b/tdecore/ksockaddr.h
index fd73e722a..d3eb62d0d 100644
--- a/tdecore/ksockaddr.h
+++ b/tdecore/ksockaddr.h
@@ -34,7 +34,7 @@ struct sockaddr;
 
 class KExtendedSocket;		// No need to define it fully
 
-class KSocketAddressPrivate;
+class TDESocketAddressPrivate;
 /**
  * A socket address.
  *
@@ -43,27 +43,27 @@ class KSocketAddressPrivate;
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @short a socket address.
  */
-class TDECORE_EXPORT KSocketAddress: public TQObject
+class TDECORE_EXPORT TDESocketAddress: public TQObject
 {
   Q_OBJECT
 protected:
   /**
    * Creates an empty class
    */
-  KSocketAddress() { init(); }
+  TDESocketAddress() { init(); }
 
   /**
    * Creates with given data
    * @param sa a sockaddr structure
    * @param size the size of @p sa
    */
-  KSocketAddress(const sockaddr* sa, ksocklen_t size);
+  TDESocketAddress(const sockaddr* sa, ksocklen_t size);
 
 public:
   /**
    * Destructor.
    */
-  virtual ~KSocketAddress();
+  virtual ~TDESocketAddress();
 
   /**
    * Returns a string representation of this socket.
@@ -112,15 +112,15 @@ public:
    * @param other	the other socket
    * @return true if both sockets are equal
    */
-  virtual bool isEqual(const KSocketAddress& other) const;
-  bool isEqual(const KSocketAddress* other) const
+  virtual bool isEqual(const TDESocketAddress& other) const;
+  bool isEqual(const TDESocketAddress* other) const
   { return isEqual(*other); }
 
   /**
    * Overloaded == operator.
    * @see isEqual()
    */
-  bool operator==(const KSocketAddress& other) const
+  bool operator==(const TDESocketAddress& other) const
   { return isEqual(other); }
 
   /**
@@ -133,7 +133,7 @@ public:
    * @param other	the other socket
    * @return true if the code part is equal
    */
-  bool isCoreEqual(const KSocketAddress& other) const;
+  bool isCoreEqual(const TDESocketAddress& other) const;
 
   /**
    * Some sockets may differ in such things as services or port numbers,
@@ -145,7 +145,7 @@ public:
    * @param other	the other socket
    * @return true if the code part is equal
    */
-  bool isCoreEqual(const KSocketAddress* other) const
+  bool isCoreEqual(const TDESocketAddress* other) const
   { return isCoreEqual(*other); }
 
   /**
@@ -174,18 +174,18 @@ protected:
 private:
   void init();
   /* No copy constructor */
-  KSocketAddress(KSocketAddress&);
-  KSocketAddress& operator=(KSocketAddress&);
+  TDESocketAddress(TDESocketAddress&);
+  TDESocketAddress& operator=(TDESocketAddress&);
 
 public:
   /**
-   * Creates a new KSocketAddress or descendant class from given
+   * Creates a new TDESocketAddress or descendant class from given
    * raw socket address.
    * @param sa		new socket address
    * @param size	new socket address's length
-   * @return the new KSocketAddress, or 0 if the function failed
+   * @return the new TDESocketAddress, or 0 if the function failed
    */
-  static KSocketAddress* newAddress(const struct sockaddr *sa, ksocklen_t size);
+  static TDESocketAddress* newAddress(const struct sockaddr *sa, ksocklen_t size);
 
   /**
    * Returns the IANA family number of the given address family.
@@ -206,7 +206,7 @@ public:
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  KSocketAddressPrivate* d;
+  TDESocketAddressPrivate* d;
 };
 
 /*
@@ -224,13 +224,13 @@ class KInetSocketAddressPrivate;
  *
  * This is an IPv4 or IPv6 address of the Internet
  *
- * This class inherits most of the functionality from KSocketAddress, but
+ * This class inherits most of the functionality from TDESocketAddress, but
  * is targeted specifically to Internet addresses
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @short an Internet socket address
  */
-class TDECORE_EXPORT KInetSocketAddress: public ::KSocketAddress
+class TDECORE_EXPORT KInetSocketAddress: public ::TDESocketAddress
 {
   Q_OBJECT
 public:
@@ -485,10 +485,10 @@ public:
    *                 the address)
    * @return true if the given addresses are equal.
    * @see areEqualInet6()
-   * @see KSocketAddress::isEqual()
-   * @see KSocketAddress::isCoreEqual()
+   * @see TDESocketAddress::isEqual()
+   * @see TDESocketAddress::isCoreEqual()
    */
-  static bool areEqualInet(const KSocketAddress &s1, const KSocketAddress &s2, bool coreOnly);
+  static bool areEqualInet(const TDESocketAddress &s1, const TDESocketAddress &s2, bool coreOnly);
 
   /**
    * Compares two IPv6 addresses.
@@ -498,10 +498,10 @@ public:
    *                 the address)
    * @return true if the given addresses are equal.
    * @see areEqualInet()
-   * @see KSocketAddress::isEqual()
-   * @see KSocketAddress::isCoreEqual()
+   * @see TDESocketAddress::isEqual()
+   * @see TDESocketAddress::isCoreEqual()
    */
-  static bool areEqualInet6(const KSocketAddress &s1, const KSocketAddress &s2, bool coreOnly);
+  static bool areEqualInet6(const TDESocketAddress &s1, const TDESocketAddress &s2, bool coreOnly);
 
   /* operators */
 
@@ -581,7 +581,7 @@ class KUnixSocketAddressPrivate;
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @short a Unix socket address
  */
-class TDECORE_EXPORT KUnixSocketAddress: public ::KSocketAddress
+class TDECORE_EXPORT KUnixSocketAddress: public ::TDESocketAddress
 {
   Q_OBJECT
 public:
@@ -665,10 +665,10 @@ public:
    * @param coreOnly true if only core parts should be compared (currently
    *                 unused)
    * @return true if the given addresses are equal.
-   * @see KSocketAddress::isEqual()
-   * @see KSocketAddress::isCoreEqual()
+   * @see TDESocketAddress::isEqual()
+   * @see TDESocketAddress::isCoreEqual()
    */
-  static bool areEqualUnix(const KSocketAddress &s1, const KSocketAddress &s2, bool coreOnly);
+  static bool areEqualUnix(const TDESocketAddress &s1, const TDESocketAddress &s2, bool coreOnly);
 
 private:
   void init();
diff --git a/tdecore/ksocks.cpp b/tdecore/ksocks.cpp
index 3de74bd88..eb00b1cec 100644
--- a/tdecore/ksocks.cpp
+++ b/tdecore/ksocks.cpp
@@ -213,7 +213,7 @@ KSocks *KSocks::self() {
   // Note that we don't use a static deleter here. It makes no sense and tends to cause crashes.
   if (!_me) {
      if (kapp) {
-        KConfigGroup cfg(kapp->config(), "Socks");
+        TDEConfigGroup cfg(kapp->config(), "Socks");
         _me = new KSocks(&cfg);
      } else {
         _disabled = true;
@@ -223,7 +223,7 @@ KSocks *KSocks::self() {
   return _me;
 }
 
-void KSocks::setConfig(KConfigBase *config)
+void KSocks::setConfig(TDEConfigBase *config)
 {
   // We can change the config from disabled to enabled
   // but not the other way around.
@@ -239,7 +239,7 @@ void KSocks::setConfig(KConfigBase *config)
 bool KSocks::activated() { return (_me != 0L); }
 
 
-KSocks::KSocks(KConfigBase *config) : _socksLib(0L), _st(0L) {
+KSocks::KSocks(TDEConfigBase *config) : _socksLib(0L), _st(0L) {
    _hasSocks = false;
    _useSocks = false;
 
diff --git a/tdecore/ksocks.h b/tdecore/ksocks.h
index 14067c0f3..b55829941 100644
--- a/tdecore/ksocks.h
+++ b/tdecore/ksocks.h
@@ -29,7 +29,7 @@
 class KSocksTable;
 class KSocksPrivate;
 class KLibrary;
-class KConfigBase;
+class TDEConfigBase;
 struct sockaddr;
 
 typedef unsigned ksocklen_t;
@@ -185,10 +185,10 @@ public:
     *  Set this before the first call to KSocks::self() and it will use
     *  @p config to read its configuration from.
     */
-   static void setConfig(KConfigBase *config);
+   static void setConfig(TDEConfigBase *config);
 
 private:
-   KSocks(KConfigBase *config);
+   KSocks(TDEConfigBase *config);
    ~KSocks();
 
    void stopSocks();
diff --git a/tdecore/kstandarddirs.cpp b/tdecore/kstandarddirs.cpp
index 85d6e4249..c902cd6f1 100644
--- a/tdecore/kstandarddirs.cpp
+++ b/tdecore/kstandarddirs.cpp
@@ -1534,13 +1534,13 @@ static TQStringList lookupProfiles(const TQString &mapFile)
 
 extern bool kde_kiosk_admin;
 
-bool KStandardDirs::addCustomized(KConfig *config)
+bool KStandardDirs::addCustomized(TDEConfig *config)
 {
     if (addedCustoms && !d->checkRestrictions) // there are already customized entries
         return false; // we just quit and hope they are the right ones
 
     // save the numbers of config directories. If this changes,
-    // we will return true to give KConfig a chance to reparse
+    // we will return true to give TDEConfig a chance to reparse
     uint configdirs = resourceDirs("config").count();
 
     // Remember original group
diff --git a/tdecore/kstandarddirs.h b/tdecore/kstandarddirs.h
index 8d026682c..b561c78d5 100644
--- a/tdecore/kstandarddirs.h
+++ b/tdecore/kstandarddirs.h
@@ -28,7 +28,7 @@
 #include <tqstringlist.h>
 #include <kglobal.h>
 
-class KConfig;
+class TDEConfig;
 class KStandardDirsPrivate;
 
 /**
@@ -427,7 +427,7 @@ public:
 	 * @return true if new config paths have been added
 	 * from @p config.
 	 **/
-	bool addCustomized(KConfig *config);
+	bool addCustomized(TDEConfig *config);
 
 	/**
 	 * This function is used internally by almost all other function as
diff --git a/tdecore/kstdaccel.cpp b/tdecore/kstdaccel.cpp
index fa3abd5af..5bda8ebf5 100644
--- a/tdecore/kstdaccel.cpp
+++ b/tdecore/kstdaccel.cpp
@@ -126,7 +126,7 @@ static KStdAccelInfo* infoPtr( StdAccel id )
 */
 static void initialize( StdAccel id )
 {
-	KConfigGroupSaver saver( TDEGlobal::config(), "Shortcuts" );
+	TDEConfigGroupSaver saver( TDEGlobal::config(), "Shortcuts" );
 	KStdAccelInfo* pInfo = infoPtr( id );
 
 	if( !pInfo ) {
diff --git a/tdecore/ktempdir.h b/tdecore/ktempdir.h
index f5b2f8026..de4b97f6c 100644
--- a/tdecore/ktempdir.h
+++ b/tdecore/ktempdir.h
@@ -133,7 +133,7 @@ public:
     *
     * @note This function is more meant for removing a directory
     * not created by the user. For user-created directories,
-    * using KIO::NetAccess::del is recommended instead,
+    * using TDEIO::NetAccess::del is recommended instead,
     * especially as it has user feedback for long operations.
     *
     * @param path Path of the directory to delete
diff --git a/tdecore/kuniqueapplication.cpp b/tdecore/kuniqueapplication.cpp
index 708a9efb0..d8b69eade 100644
--- a/tdecore/kuniqueapplication.cpp
+++ b/tdecore/kuniqueapplication.cpp
@@ -356,7 +356,7 @@ TDEInstance* KUniqueApplication::initHack( bool configUnique )
   TDEInstance* inst = new TDEInstance( TDECmdLineArgs::about );
   if (configUnique)
   {
-    KConfigGroupSaver saver( inst->config(), "KDE" );
+    TDEConfigGroupSaver saver( inst->config(), "KDE" );
     s_multipleInstances = inst->config()->readBoolEntry("MultipleInstances", false);
   }
   if( !start())
diff --git a/tdecore/kurldrag.h b/tdecore/kurldrag.h
index 45a0e5945..ccaf86e1a 100644
--- a/tdecore/kurldrag.h
+++ b/tdecore/kurldrag.h
@@ -95,7 +95,7 @@ public:
    * This is an alternative way of setting the metadata:
    * either use the constructor to pass it all at once, or use
    * drag->metaData()["key"] = data;
-   * @see KIO::TransferJob
+   * @see TDEIO::TransferJob
    */
   TQMap<TQString, TQString> &metaData() { return m_metaData; }
 
diff --git a/tdecore/network/kbufferedsocket.cpp b/tdecore/network/kbufferedsocket.cpp
index 3566bde93..1b08d121e 100644
--- a/tdecore/network/kbufferedsocket.cpp
+++ b/tdecore/network/kbufferedsocket.cpp
@@ -38,7 +38,7 @@ using namespace KNetwork::Internal;
 class KNetwork::KBufferedSocketPrivate
 {
 public:
-  mutable KSocketBuffer *input, *output;
+  mutable TDESocketBuffer *input, *output;
 
   KBufferedSocketPrivate()
   {
@@ -64,7 +64,7 @@ KBufferedSocket::~KBufferedSocket()
   delete d;
 }
 
-void KBufferedSocket::setSocketDevice(KSocketDevice* device)
+void KBufferedSocket::setSocketDevice(TDESocketDevice* device)
 {
   KStreamSocket::setSocketDevice(device);
   device->setBlocking(false);
@@ -134,7 +134,7 @@ TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
   return KStreamSocket::tqreadBlock(data, maxlen);
 }
 
-TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from)
+TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from)
 {
   from = peerAddress();
   return tqreadBlock(data, maxlen);
@@ -156,7 +156,7 @@ TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen)
   return KStreamSocket::peekBlock(data, maxlen);
 }
 
-TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from)
+TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from)
 {
   from = peerAddress();
   return peekBlock(data, maxlen);
@@ -193,7 +193,7 @@ TQT_TQIO_LONG KBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len
 }
 
 TQT_TQIO_LONG KBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG maxlen,
-				   const KSocketAddress&)
+				   const TDESocketAddress&)
 {
   // ignore the third parameter
   return tqwriteBlock(data, maxlen);
@@ -256,7 +256,7 @@ void KBufferedSocket::setInputBuffering(bool enable)
     }
   else if (d->input == 0L)
     {
-      d->input = new KSocketBuffer;
+      d->input = new TDESocketBuffer;
     }
 }
 
@@ -275,7 +275,7 @@ void KBufferedSocket::setOutputBuffering(bool enable)
     }
   else if (d->output == 0L)
     {
-      d->output = new KSocketBuffer;
+      d->output = new TDESocketBuffer;
     }
 }
 
diff --git a/tdecore/network/kbufferedsocket.h b/tdecore/network/kbufferedsocket.h
index 93bee08f3..158a5a434 100644
--- a/tdecore/network/kbufferedsocket.h
+++ b/tdecore/network/kbufferedsocket.h
@@ -52,7 +52,7 @@ class KBufferedSocketPrivate;
  *       imposed by Qt's TQSocketNotifier. If you want to use a socket
  *       in an auxiliary thread, please use KStreamSocket.
  *
- * @see KNetwork::KStreamSocket, KNetwork::KServerSocket
+ * @see KNetwork::KStreamSocket, KNetwork::TDEServerSocket
  * @author Thiago Macieira <thiago@kde.org>
  */
 class TDECORE_EXPORT KBufferedSocket: public KStreamSocket
@@ -79,7 +79,7 @@ public:
   /**
    * Be sure to catch new devices.
    */
-  virtual void setSocketDevice(KSocketDevice* device);
+  virtual void setSocketDevice(TDESocketDevice* device);
 
 protected:
   /**
@@ -122,7 +122,7 @@ public:
    *
    * The @p from parameter is always set to @ref peerAddress()
    */
-  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from);
+  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from);
 
   /**
    * Peeks data from the socket.
@@ -135,7 +135,7 @@ public:
    *
    * The @p from parameter is always set to @ref peerAddress()
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from);
+  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress &from);
 
   /**
    * Writes data to the socket.
@@ -148,7 +148,7 @@ public:
    *
    * The @p to parameter is discarded.
    */
-  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to);
+  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to);
 
   /**
    * Catch changes.
diff --git a/tdecore/network/kclientsocketbase.cpp b/tdecore/network/kclientsocketbase.cpp
index 780a5ec71..eb8e4883b 100644
--- a/tdecore/network/kclientsocketbase.cpp
+++ b/tdecore/network/kclientsocketbase.cpp
@@ -83,7 +83,7 @@ void KClientSocketBase::setState(SocketState state)
 bool KClientSocketBase::setSocketOptions(int opts)
 {
   TQMutexLocker locker(mutex());
-  KSocketBase::setSocketOptions(opts); // call parent
+  TDESocketBase::setSocketOptions(opts); // call parent
 
   // don't create the device unnecessarily
   if (hasDevice())
@@ -323,7 +323,7 @@ TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
   return retval;
 }
 
-TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from)
+TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from)
 {
   resetError();
   TQ_LONG retval = socketDevice()->tqreadBlock(data, maxlen, from);
@@ -347,7 +347,7 @@ TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from)
+TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from)
 {
   resetError();
   TQ_LONG retval = socketDevice()->peekBlock(data, maxlen, from);
@@ -371,7 +371,7 @@ TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG l
   return retval;
 }
 
-TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to)
+TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to)
 {
   resetError();
   TQ_LONG retval = socketDevice()->tqwriteBlock(data, len, to);
@@ -383,12 +383,12 @@ TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG l
   return retval;
 }
 
-KSocketAddress KClientSocketBase::localAddress() const
+TDESocketAddress KClientSocketBase::localAddress() const
 {
   return socketDevice()->localAddress();
 }
 
-KSocketAddress KClientSocketBase::peerAddress() const
+TDESocketAddress KClientSocketBase::peerAddress() const
 {
   return socketDevice()->peerAddress();
 }
diff --git a/tdecore/network/kclientsocketbase.h b/tdecore/network/kclientsocketbase.h
index 59da43511..68c45dd28 100644
--- a/tdecore/network/kclientsocketbase.h
+++ b/tdecore/network/kclientsocketbase.h
@@ -115,7 +115,7 @@ public:
 
 protected:
   /**
-   * Sets the socket options. Reimplemented from KSocketBase.
+   * Sets the socket options. Reimplemented from TDESocketBase.
    */
   virtual bool setSocketOptions(int opts);
 
@@ -160,7 +160,7 @@ public:
    *
    * This is useful, for instance, when IP addresses are in
    * their string representation (such as "1.2.3.4") or come
-   * from other sources like @ref KSocketAddress.
+   * from other sources like @ref TDESocketAddress.
    *
    * @param enable	whether to enable
    */
@@ -186,7 +186,7 @@ public:
    * emitted (only once, even if we're doing a double lookup).
    * If the lookup failed (for any of the two lookups) the 
    * @ref gotError signal will be emitted with the appropriate
-   * error condition (see @ref KSocketBase::SocketError).
+   * error condition (see @ref TDESocketBase::SocketError).
    *
    * This function returns true on success and false on error. Note that
    * this is not the lookup result!
@@ -216,7 +216,7 @@ public:
 		    const TQString& service = TQString::null) = 0;
 
   /**
-   * Reimplemented from KSocketBase. Connect this socket to this
+   * Reimplemented from TDESocketBase. Connect this socket to this
    * specific address.
    *
    * Unlike @ref bind(const TQString&, const TQString&) above, this function
@@ -258,7 +258,7 @@ public:
 
   /**
    * @overload
-   * Reimplemented from KSocketBase.
+   * Reimplemented from TDESocketBase.
    */
   virtual bool connect(const KResolverEntry& address);
 
@@ -300,7 +300,7 @@ public:
 
   /**
    * Returns the number of bytes available on this socket.
-   * Reimplemented from KSocketBase.
+   * Reimplemented from TDESocketBase.
    */
 #ifdef USE_QT3
   virtual TQ_LONG bytesAvailable() const;
@@ -310,52 +310,52 @@ public:
 #endif
 
   /**
-   * Waits for more data. Reimplemented from KSocketBase.
+   * Waits for more data. Reimplemented from TDESocketBase.
    */
   virtual TQ_LONG waitForMore(int msecs, bool *timeout = 0L);
 
   /**
-   * Reads data from a socket. Reimplemented from KSocketBase.
+   * Reads data from a socket. Reimplemented from TDESocketBase.
    */
   virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen);
 
   /**
    * @overload
-   * Reads data from a socket. Reimplemented from KSocketBase.
+   * Reads data from a socket. Reimplemented from TDESocketBase.
    */
-  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from);
+  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from);
 
   /**
-   * Peeks data from the socket. Reimplemented from KSocketBase.
+   * Peeks data from the socket. Reimplemented from TDESocketBase.
    */
   virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen);
 
   /**
    * @overload
-   * Peeks data from the socket. Reimplemented from KSocketBase.
+   * Peeks data from the socket. Reimplemented from TDESocketBase.
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from);
+  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress &from);
 
   /**
-   * Writes data to the socket. Reimplemented from KSocketBase.
+   * Writes data to the socket. Reimplemented from TDESocketBase.
    */
   virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len);
 
   /**
    * @overload
-   * Writes data to the socket. Reimplemented from KSocketBase.
+   * Writes data to the socket. Reimplemented from TDESocketBase.
    */
-  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to);
+  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to);
 
   /**
-   * Returns the local socket address. Reimplemented from KSocketBase.
+   * Returns the local socket address. Reimplemented from TDESocketBase.
    */
-  virtual KSocketAddress localAddress() const;
+  virtual TDESocketAddress localAddress() const;
 
   /**
-   * Returns the peer socket address. Reimplemented from KSocketBase.
+   * Returns the peer socket address. Reimplemented from TDESocketBase.
    */
-  virtual KSocketAddress peerAddress() const;
+  virtual TDESocketAddress peerAddress() const;
 
   /**
    * Returns true if the readyRead signal is set to be emitted.
diff --git a/tdecore/network/kdatagramsocket.cpp b/tdecore/network/kdatagramsocket.cpp
index c5a1562a4..ac8e526ee 100644
--- a/tdecore/network/kdatagramsocket.cpp
+++ b/tdecore/network/kdatagramsocket.cpp
@@ -153,7 +153,7 @@ KDatagramPacket KDatagramSocket::receive()
     }
 
   TQByteArray data(size);
-  KSocketAddress address;
+  TDESocketAddress address;
   
   // now do the reading
   size = tqreadBlock(data.data(), size, address);
@@ -170,7 +170,7 @@ TQ_LONG KDatagramSocket::send(const KDatagramPacket& packet)
   return tqwriteBlock(packet.data(), packet.size(), packet.address());
 }
 
-TQ_LONG KDatagramSocket::tqwriteBlock(const char *data, TQ_ULONG len, const KSocketAddress& to)
+TQ_LONG KDatagramSocket::tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to)
 {
   if (to.family() != AF_UNSPEC)
     {
diff --git a/tdecore/network/kdatagramsocket.h b/tdecore/network/kdatagramsocket.h
index c51fea1ef..fd12a0d97 100644
--- a/tdecore/network/kdatagramsocket.h
+++ b/tdecore/network/kdatagramsocket.h
@@ -51,7 +51,7 @@ class KResolverEntry;
 class TDECORE_EXPORT KDatagramPacket
 {
   TQByteArray m_data;
-  KSocketAddress m_address;
+  TDESocketAddress m_address;
 
 public:
   /**
@@ -78,14 +78,14 @@ public:
   /**
    * Constructs the datagram with the specified content and address.
    */
-  KDatagramPacket(const TQByteArray& content, const KSocketAddress& addr)
+  KDatagramPacket(const TQByteArray& content, const TDESocketAddress& addr)
     : m_data(content), m_address(addr)
   { }
 
   /**
    * Constructs the datagram with the specified content and address.
    */
-  KDatagramPacket(const char *content, uint length, const KSocketAddress& addr)
+  KDatagramPacket(const char *content, uint length, const TDESocketAddress& addr)
     : m_address(addr)
   { setData(content, length); }
 
@@ -134,13 +134,13 @@ public:
   /**
    * Returns the socket address
    */
-  const KSocketAddress& address() const
+  const TDESocketAddress& address() const
   { return m_address; }
 
   /**
    * Sets the address stored to the given value.
    */
-  void setAddress(const KSocketAddress& addr)
+  void setAddress(const TDESocketAddress& addr)
   { m_address = addr; }
 
   /**
@@ -241,7 +241,7 @@ public:
   /**
    * Writes data to the socket. Reimplemented from KClientSocketBase.
    */
-  virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len, const KSocketAddress& to);
+  virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to);
 
   /**
    * Receives one datagram from the stream. The reading process is guaranteed
diff --git a/tdecore/network/khttpproxysocketdevice.cpp b/tdecore/network/khttpproxysocketdevice.cpp
index 42d65326b..e4529f28a 100644
--- a/tdecore/network/khttpproxysocketdevice.cpp
+++ b/tdecore/network/khttpproxysocketdevice.cpp
@@ -45,15 +45,15 @@ public:
   KResolverEntry proxy;
   TQCString request;
   TQCString reply;
-  KSocketAddress peer;
+  TDESocketAddress peer;
 
   KHttpProxySocketDevicePrivate()
     : proxy(KHttpProxySocketDevice::defaultProxy)
   { }
 };
 
-KHttpProxySocketDevice::KHttpProxySocketDevice(const KSocketBase* parent)
-  : KSocketDevice(parent), d(new KHttpProxySocketDevicePrivate)
+KHttpProxySocketDevice::KHttpProxySocketDevice(const TDESocketBase* parent)
+  : TDESocketDevice(parent), d(new KHttpProxySocketDevicePrivate)
 {
 }
 
@@ -66,7 +66,7 @@ KHttpProxySocketDevice::KHttpProxySocketDevice(const KResolverEntry& proxy)
 KHttpProxySocketDevice::~KHttpProxySocketDevice()
 {
   // nothing special to be done during closing
-  // KSocketDevice::~KSocketDevice closes the socket
+  // TDESocketDevice::~TDESocketDevice closes the socket
 
   delete d;
 }
@@ -90,27 +90,27 @@ void KHttpProxySocketDevice::setProxyServer(const KResolverEntry& proxy)
 void KHttpProxySocketDevice::close()
 {
   d->reply = d->request = TQCString();
-  d->peer = KSocketAddress();
-  KSocketDevice::close();
+  d->peer = TDESocketAddress();
+  TDESocketDevice::close();
 }
 
-KSocketAddress KHttpProxySocketDevice::peerAddress() const
+TDESocketAddress KHttpProxySocketDevice::peerAddress() const
 {
   if (isOpen())
     return d->peer;
-  return KSocketAddress();
+  return TDESocketAddress();
 }
 
-KSocketAddress KHttpProxySocketDevice::externalAddress() const
+TDESocketAddress KHttpProxySocketDevice::externalAddress() const
 {
-  return KSocketAddress();
+  return TDESocketAddress();
 }
 
 bool KHttpProxySocketDevice::connect(const KResolverEntry& address)
 {
   if (d->proxy.family() == AF_UNSPEC)
     // no proxy server set !
-    return KSocketDevice::connect(address);
+    return TDESocketDevice::connect(address);
 
   if (isOpen())
     {
@@ -148,7 +148,7 @@ bool KHttpProxySocketDevice::connect(const TQString& node, const TQString& servi
   if (m_sockfd == -1)
     {
       // must create the socket
-      if (!KSocketDevice::connect(d->proxy))
+      if (!TDESocketDevice::connect(d->proxy))
 	return false;		// also unable to contact proxy server
       setState(0);		// unset open flag
 
@@ -170,7 +170,7 @@ bool KHttpProxySocketDevice::connect(const TQString& node, const TQString& servi
 bool KHttpProxySocketDevice::parseServerReply()
 {
   // make sure we're connected
-  if (!KSocketDevice::connect(d->proxy))
+  if (!TDESocketDevice::connect(d->proxy))
     if (error() == InProgress)
       return true;
     else if (error() != NoError)
diff --git a/tdecore/network/khttpproxysocketdevice.h b/tdecore/network/khttpproxysocketdevice.h
index 903d7aa6f..dc5faef93 100644
--- a/tdecore/network/khttpproxysocketdevice.h
+++ b/tdecore/network/khttpproxysocketdevice.h
@@ -35,18 +35,18 @@ class KHttpProxySocketDevicePrivate;
  * @class KHttpProxySocketDevice khttpproxysocketdevice.h khttproxysocketdevice.h
  * @brief The low-level backend for HTTP proxying.
  *
- * This class derives from @ref KSocketDevice and implements the necessary
+ * This class derives from @ref TDESocketDevice and implements the necessary
  * calls to make a connection through an HTTP proxy.
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class TDECORE_EXPORT KHttpProxySocketDevice: public KSocketDevice
+class TDECORE_EXPORT KHttpProxySocketDevice: public TDESocketDevice
 {
 public:
   /**
    * Constructor.
    */
-  KHttpProxySocketDevice(const KSocketBase* = 0L);
+  KHttpProxySocketDevice(const TDESocketBase* = 0L);
 
   /**
    * Constructor with proxy server's address.
@@ -92,13 +92,13 @@ public:
   /**
    * Return the peer address.
    */
-  virtual KSocketAddress peerAddress() const;
+  virtual TDESocketAddress peerAddress() const;
 
   /**
    * Return the externally visible address. We can't tell what that address is,
    * so this function always returns an empty object.
    */
-  virtual KSocketAddress externalAddress() const;
+  virtual TDESocketAddress externalAddress() const;
 
 private:
   /**
diff --git a/tdecore/network/kmulticastsocket.h b/tdecore/network/kmulticastsocket.h
index 848e64491..8fe413283 100644
--- a/tdecore/network/kmulticastsocket.h
+++ b/tdecore/network/kmulticastsocket.h
@@ -78,14 +78,14 @@ public:
    * @param group	the multicast group to join
    * @returns true on success
    */
-  virtual bool joinGroup(const KSocketAddress& group);
+  virtual bool joinGroup(const TDESocketAddress& group);
 
   /**
    * @overload
    * Joins a multicast group. This function also specifies the network interface
    * to be used.
    */
-  virtual bool joinGroup(const KSocketAddress& group, 
+  virtual bool joinGroup(const TDESocketAddress& group, 
 			 const KNetworkInterface& iface);
 
   /**
@@ -95,13 +95,13 @@ public:
    * @param group	the group to leave
    * @returns true on successful leaving the group
    */
-  virtual bool leaveGroup(const KSocketAddress& group);
+  virtual bool leaveGroup(const TDESocketAddress& group);
 
   /**
    * @overload
    * Leaves a multicast group.
    */
-  virtual bool leaveGroup(const KSocketAddress& group,
+  virtual bool leaveGroup(const TDESocketAddress& group,
 			  const KNetworkInterface& iface);
 
 private:
diff --git a/tdecore/network/kmulticastsocketdevice.h b/tdecore/network/kmulticastsocketdevice.h
index ffb567ff1..a24ba326a 100644
--- a/tdecore/network/kmulticastsocketdevice.h
+++ b/tdecore/network/kmulticastsocketdevice.h
@@ -42,13 +42,13 @@ class KMulticastSocketImplPrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KMulticastSocketImpl: public KSocketDevice
+class KMulticastSocketImpl: public TDESocketDevice
 {
 public:
   /**
    * Constructor.
    */
-  KMulticastSocketImpl(const KSocketBase* = 0L);
+  KMulticastSocketImpl(const TDESocketBase* = 0L);
 
   /**
    * Destructor
@@ -117,14 +117,14 @@ public:
    * @param group	the multicast group to join
    * @returns true on success
    */
-  virtual bool joinGroup(const KSocketAddress& group);
+  virtual bool joinGroup(const TDESocketAddress& group);
 
   /**
    * @overload
    * Joins a multicast group. This function also specifies the network interface
    * to be used.
    */
-  virtual bool joinGroup(const KSocketAddress& group, 
+  virtual bool joinGroup(const TDESocketAddress& group, 
 			 const KNetworkInterface& iface);
 
   /**
@@ -134,13 +134,13 @@ public:
    * @param group	the group to leave
    * @returns true on successful leaving the group
    */
-  virtual bool leaveGroup(const KSocketAddress& group);
+  virtual bool leaveGroup(const TDESocketAddress& group);
 
   /**
    * @overload
    * Leaves a multicast group.
    */
-  virtual bool leaveGroup(const KSocketAddress& group,
+  virtual bool leaveGroup(const TDESocketAddress& group,
 			  const KNetworkInterface& iface);
 private:
   KMulticastSocketImplPrivate *d;
diff --git a/tdecore/network/kresolver.cpp b/tdecore/network/kresolver.cpp
index a6ca8e45c..1c32e80ec 100644
--- a/tdecore/network/kresolver.cpp
+++ b/tdecore/network/kresolver.cpp
@@ -75,7 +75,7 @@ using namespace KNetwork::Internal;
 class KNetwork::KResolverEntryPrivate: public TQShared
 {
 public:
-  KSocketAddress addr;
+  TDESocketAddress addr;
   int socktype;
   int protocol;
   TQString canonName;
@@ -93,7 +93,7 @@ KResolverEntry::KResolverEntry() :
 }
 
 // constructor with stuff
-KResolverEntry::KResolverEntry(const KSocketAddress& addr, int socktype, int protocol,
+KResolverEntry::KResolverEntry(const TDESocketAddress& addr, int socktype, int protocol,
 			       const TQString& canonName, const TQCString& encodedName) :
   d(new KResolverEntryPrivate)
 {
@@ -110,7 +110,7 @@ KResolverEntry::KResolverEntry(const struct sockaddr* sa, TQ_UINT16 salen, int s
 			       const TQCString& encodedName) :
   d(new KResolverEntryPrivate)
 {
-  d->addr = KSocketAddress(sa, salen);
+  d->addr = TDESocketAddress(sa, salen);
   d->socktype = socktype;
   d->protocol = protocol;
   d->canonName = canonName;
@@ -135,9 +135,9 @@ KResolverEntry::~KResolverEntry()
 }
 
 // returns the socket address
-KSocketAddress KResolverEntry::address() const
+TDESocketAddress KResolverEntry::address() const
 {
-  return d ? d->addr : KSocketAddress();
+  return d ? d->addr : TDESocketAddress();
 }
 
 // returns the length
diff --git a/tdecore/network/kresolver.h b/tdecore/network/kresolver.h
index 5e20e174a..3de19acd3 100644
--- a/tdecore/network/kresolver.h
+++ b/tdecore/network/kresolver.h
@@ -73,10 +73,10 @@ public:
   KResolverEntry();
 
   /**
-   * Constructs a new KResolverEntry from a KSocketAddress
+   * Constructs a new KResolverEntry from a TDESocketAddress
    * and other data.
    *
-   * The KSocketAddress @p addr parameter will be deep-copied.
+   * The TDESocketAddress @p addr parameter will be deep-copied.
    *
    * @param addr	the address that was resolved
    * @param socktype	the socket type of the resolved address
@@ -84,7 +84,7 @@ public:
    * @param canonName	the canonical name of the resolved hostname
    * @param encodedName	the ASCII-compatible encoding of the hostname
    */
-  KResolverEntry(const KSocketAddress& addr, int socktype, int protocol,
+  KResolverEntry(const TDESocketAddress& addr, int socktype, int protocol,
 		const TQString& canonName = TQString::null,
 		const TQCString& encodedName = TQCString());
 
@@ -92,7 +92,7 @@ public:
    * Constructs a new KResolverEntry from raw forms of
    * socket addresses and other data.
    *
-   * This constructor instead creates an internal KSocketAddress object.
+   * This constructor instead creates an internal TDESocketAddress object.
    *
    * @param sa		the sockaddr structure containing the raw address
    * @param salen	the length of the sockaddr structure
@@ -123,7 +123,7 @@ public:
   /**
    * Retrieves the socket address associated with this entry.
    */
-  KSocketAddress address() const;
+  TDESocketAddress address() const;
 
   /**
    * Retrieves the length of the socket address structure.
diff --git a/tdecore/network/kreverseresolver.cpp b/tdecore/network/kreverseresolver.cpp
index 20ec41b1d..fc172c2ff 100644
--- a/tdecore/network/kreverseresolver.cpp
+++ b/tdecore/network/kreverseresolver.cpp
@@ -55,7 +55,7 @@ namespace
   class ReverseThread: public KResolverWorkerBase
   {
   public:
-    ReverseThread(const KSocketAddress& addr, int flags)
+    ReverseThread(const TDESocketAddress& addr, int flags)
       : m_addr(addr), m_flags(flags), m_parent(0L)
     { }
 
@@ -68,7 +68,7 @@ namespace
     virtual bool postprocess();
 
     // input:
-    KSocketAddress m_addr;
+    TDESocketAddress m_addr;
     int m_flags;
     KReverseResolver *m_parent;
 
@@ -99,18 +99,18 @@ class KNetwork::KReverseResolverPrivate
 public:
   TQString node;
   TQString service;
-  KSocketAddress addr;
+  TDESocketAddress addr;
   int flags;
 
   ReverseThread* worker;
   bool success;
 
-  inline KReverseResolverPrivate(const KSocketAddress& _addr)
+  inline KReverseResolverPrivate(const TDESocketAddress& _addr)
     : addr(_addr), worker(0L), success(false)
   { }
 };
 
-KReverseResolver::KReverseResolver(const KSocketAddress& addr, int flags,
+KReverseResolver::KReverseResolver(const TDESocketAddress& addr, int flags,
 				   TQObject *parent, const char* name)
   : TQObject(parent, name), d(new KReverseResolverPrivate(addr))
 {
@@ -148,7 +148,7 @@ TQString KReverseResolver::service() const
   return d->service;
 }
 
-const KSocketAddress& KReverseResolver::address() const
+const TDESocketAddress& KReverseResolver::address() const
 {
   return d->addr;
 }
@@ -190,7 +190,7 @@ bool KReverseResolver::event(TQEvent *e)
   return true;
 }
 
-bool KReverseResolver::resolve(const KSocketAddress& addr, TQString& node,
+bool KReverseResolver::resolve(const TDESocketAddress& addr, TQString& node,
 			       TQString& serv, int flags)
 {
   ReverseThread th(addr, flags);
@@ -206,7 +206,7 @@ bool KReverseResolver::resolve(const KSocketAddress& addr, TQString& node,
 bool KReverseResolver::resolve(const struct sockaddr* sa, TQ_UINT16 salen,
 			       TQString& node, TQString& serv, int flags)
 {
-  return resolve(KSocketAddress(sa, salen), node, serv, flags);
+  return resolve(TDESocketAddress(sa, salen), node, serv, flags);
 }
 
 bool ReverseThread::run()
diff --git a/tdecore/network/kreverseresolver.h b/tdecore/network/kreverseresolver.h
index 21a17b0a5..4a3fa4bdd 100644
--- a/tdecore/network/kreverseresolver.h
+++ b/tdecore/network/kreverseresolver.h
@@ -88,7 +88,7 @@ public:
    * @param addr	the address to resolve
    * @param flags	the flags to use, see @ref Flags
    */
-  KReverseResolver(const KSocketAddress& addr, int flags = 0,
+  KReverseResolver(const TDESocketAddress& addr, int flags = 0,
 		   TQObject * = 0L, const char * = 0L);
 
   /**
@@ -128,7 +128,7 @@ public:
   /**
    * Returns the socket address which was subject to resolution.
    */
-  const KSocketAddress& address() const;
+  const TDESocketAddress& address() const;
 
   /**
    * Starts the resolution. This function returns 'true'
@@ -165,7 +165,7 @@ public:
    * @return true if the resolution succeeded, false if not
    * @see ReverseFlags for the possible values for @p flags
    */
-  static bool resolve(const KSocketAddress& addr, TQString& node, 
+  static bool resolve(const TDESocketAddress& addr, TQString& node, 
 		      TQString& serv, int flags = 0);
 
   /**
diff --git a/tdecore/network/kserversocket.cpp b/tdecore/network/kserversocket.cpp
index 007258f6b..d5a1b90bb 100644
--- a/tdecore/network/kserversocket.cpp
+++ b/tdecore/network/kserversocket.cpp
@@ -37,7 +37,7 @@
 
 using namespace KNetwork;
 
-class KNetwork::KServerSocketPrivate
+class KNetwork::TDEServerSocketPrivate
 {
 public:
   KResolver resolver;
@@ -49,7 +49,7 @@ public:
 
   bool bindWhenFound : 1, listenWhenBound : 1, useKBufferedSocket : 1;
 
-  KServerSocketPrivate()
+  TDEServerSocketPrivate()
     : state(None), timeout(0), bindWhenFound(false), listenWhenBound(false),
       useKBufferedSocket(true)
   { 
@@ -58,56 +58,56 @@ public:
   }
 };
 
-KServerSocket::KServerSocket(TQObject* parent, const char *name)
-  : TQObject(parent, name), d(new KServerSocketPrivate)
+TDEServerSocket::TDEServerSocket(TQObject* parent, const char *name)
+  : TQObject(parent, name), d(new TDEServerSocketPrivate)
 {
   TQObject::connect(&d->resolver, TQT_SIGNAL(finished(KResolverResults)), 
 		   this, TQT_SLOT(lookupFinishedSlot()));
 }
 
-KServerSocket::KServerSocket(const TQString& service, TQObject* parent, const char *name)
-  : TQObject(parent, name), d(new KServerSocketPrivate)
+TDEServerSocket::TDEServerSocket(const TQString& service, TQObject* parent, const char *name)
+  : TQObject(parent, name), d(new TDEServerSocketPrivate)
 {
   TQObject::connect(&d->resolver, TQT_SIGNAL(finished(KResolverResults)), 
 		   this, TQT_SLOT(lookupFinishedSlot()));
   d->resolver.setServiceName(service);
 }
 
-KServerSocket::KServerSocket(const TQString& node, const TQString& service,
+TDEServerSocket::TDEServerSocket(const TQString& node, const TQString& service,
 			     TQObject* parent, const char* name)
-  : TQObject(parent, name), d(new KServerSocketPrivate)
+  : TQObject(parent, name), d(new TDEServerSocketPrivate)
 {
   TQObject::connect(&d->resolver, TQT_SIGNAL(finished(KResolverResults)), 
 		   this, TQT_SLOT(lookupFinishedSlot()));
   setAddress(node, service);
 }
 
-KServerSocket::~KServerSocket()
+TDEServerSocket::~TDEServerSocket()
 {
   close();
   delete d;
 }
 
-bool KServerSocket::setSocketOptions(int opts)
+bool TDEServerSocket::setSocketOptions(int opts)
 {
   TQMutexLocker locker(mutex());
-  KSocketBase::setSocketOptions(opts); // call parent
+  TDESocketBase::setSocketOptions(opts); // call parent
   bool result = socketDevice()->setSocketOptions(opts); // and set the implementation
   copyError();
   return result;
 }
 
-KResolver& KServerSocket::resolver() const
+KResolver& TDEServerSocket::resolver() const
 {
   return d->resolver;
 }
 
-const KResolverResults& KServerSocket::resolverResults() const
+const KResolverResults& TDEServerSocket::resolverResults() const
 {
   return d->resolverResults;
 }
 
-void KServerSocket::setResolutionEnabled(bool enable)
+void TDEServerSocket::setResolutionEnabled(bool enable)
 {
   if (enable)
     d->resolver.setFlags(d->resolver.flags() & ~KResolver::NoResolve);
@@ -115,41 +115,41 @@ void KServerSocket::setResolutionEnabled(bool enable)
     d->resolver.setFlags(d->resolver.flags() | KResolver::NoResolve);
 }
 
-void KServerSocket::setFamily(int families)
+void TDEServerSocket::setFamily(int families)
 {
   d->resolver.setFamily(families);
 }
 
-void KServerSocket::setAddress(const TQString& service)
+void TDEServerSocket::setAddress(const TQString& service)
 {
   d->resolver.setNodeName(TQString::null);
   d->resolver.setServiceName(service);
   d->resolverResults.empty();
-  if (d->state <= KServerSocketPrivate::LookupDone)
-    d->state = KServerSocketPrivate::None;
+  if (d->state <= TDEServerSocketPrivate::LookupDone)
+    d->state = TDEServerSocketPrivate::None;
 }
 
-void KServerSocket::setAddress(const TQString& node, const TQString& service)
+void TDEServerSocket::setAddress(const TQString& node, const TQString& service)
 {
   d->resolver.setNodeName(node);
   d->resolver.setServiceName(service);
   d->resolverResults.empty();
-  if (d->state <= KServerSocketPrivate::LookupDone)
-    d->state = KServerSocketPrivate::None;
+  if (d->state <= TDEServerSocketPrivate::LookupDone)
+    d->state = TDEServerSocketPrivate::None;
 }
 
-void KServerSocket::setTimeout(int msec)
+void TDEServerSocket::setTimeout(int msec)
 {
   d->timeout = msec;
 }
 
-bool KServerSocket::lookup()
+bool TDEServerSocket::lookup()
 {
   setError(NoError);
   if (d->resolver.isRunning() && !blocking())
     return true;		// already doing lookup
 
-  if (d->state >= KServerSocketPrivate::LookupDone)
+  if (d->state >= TDEServerSocketPrivate::LookupDone)
     return true;		// results are already available
 
   // make sure we have at least one parameter for lookup
@@ -179,13 +179,13 @@ bool KServerSocket::lookup()
   return true;
 }
 
-bool KServerSocket::bind(const KResolverEntry& address)
+bool TDEServerSocket::bind(const KResolverEntry& address)
 {
   if (socketDevice()->bind(address))
     {
       setError(NoError);
 
-      d->state = KServerSocketPrivate::Bound;
+      d->state = TDEServerSocketPrivate::Bound;
       emit bound(address);
       return true;
     }
@@ -193,30 +193,30 @@ bool KServerSocket::bind(const KResolverEntry& address)
   return false;
 }
 
-bool KServerSocket::bind(const TQString& node, const TQString& service)
+bool TDEServerSocket::bind(const TQString& node, const TQString& service)
 {
   setAddress(node, service);
   return bind();
 }
 
-bool KServerSocket::bind(const TQString& service)
+bool TDEServerSocket::bind(const TQString& service)
 {
   setAddress(service);
   return bind();
 }
 
-bool KServerSocket::bind()
+bool TDEServerSocket::bind()
 {
-  if (d->state >= KServerSocketPrivate::Bound)
+  if (d->state >= TDEServerSocketPrivate::Bound)
     return true;
 
-  if (d->state < KServerSocketPrivate::LookupDone)
+  if (d->state < TDEServerSocketPrivate::LookupDone)
     {
       if (!blocking())
 	{
 	  d->bindWhenFound = true;
 	  bool ok = lookup();	// will call doBind
-	  if (d->state >= KServerSocketPrivate::Bound)
+	  if (d->state >= TDEServerSocketPrivate::Bound)
 	    d->bindWhenFound = false;
 	  return ok;
 	}
@@ -229,19 +229,19 @@ bool KServerSocket::bind()
   return doBind();
 }
 
-bool KServerSocket::listen(int backlog)
+bool TDEServerSocket::listen(int backlog)
 {
   // WARNING
   // this function has to be reentrant
   // due to the mechanisms used for binding, this function might
   // end up calling itself
 
-  if (d->state == KServerSocketPrivate::Listening)
+  if (d->state == TDEServerSocketPrivate::Listening)
     return true;		// already listening
 
   d->backlog = backlog;
 
-  if (d->state < KServerSocketPrivate::Bound)
+  if (d->state < TDEServerSocketPrivate::Bound)
     {
       // we must bind
       // note that we can end up calling ourselves here
@@ -252,7 +252,7 @@ bool KServerSocket::listen(int backlog)
 	  return false;
 	}
 
-      if (d->state < KServerSocketPrivate::Bound)
+      if (d->state < TDEServerSocketPrivate::Bound)
 	// asynchronous lookup in progress...
 	// we can't be blocking here anyways
 	return true;
@@ -260,29 +260,29 @@ bool KServerSocket::listen(int backlog)
       d->listenWhenBound = false;
     }
 
-  if (d->state < KServerSocketPrivate::Listening)
+  if (d->state < TDEServerSocketPrivate::Listening)
     return doListen();
 
   return true;
 }
 
-void KServerSocket::close()
+void TDEServerSocket::close()
 {
   socketDevice()->close();
   if (d->resolver.isRunning())
     d->resolver.cancel(false);
-  d->state = KServerSocketPrivate::None;
+  d->state = TDEServerSocketPrivate::None;
   emit closed();
 }
 
-void KServerSocket::setAcceptBuffered(bool enable)
+void TDEServerSocket::setAcceptBuffered(bool enable)
 {
   d->useKBufferedSocket = enable;
 }
 
-KActiveSocketBase* KServerSocket::accept()
+KActiveSocketBase* TDEServerSocket::accept()
 {
-  if (d->state < KServerSocketPrivate::Listening)
+  if (d->state < TDEServerSocketPrivate::Listening)
     {
       if (!blocking())
 	{
@@ -310,7 +310,7 @@ KActiveSocketBase* KServerSocket::accept()
     }
 
   // we're listening here
-  KSocketDevice* accepted = socketDevice()->accept();
+  TDESocketDevice* accepted = socketDevice()->accept();
   if (!accepted)
     {
       // error happened during accept
@@ -334,19 +334,19 @@ KActiveSocketBase* KServerSocket::accept()
   return streamsocket;
 }
 
-KSocketAddress KServerSocket::localAddress() const
+TDESocketAddress TDEServerSocket::localAddress() const
 {
   return socketDevice()->localAddress();
 }
 
-KSocketAddress KServerSocket::externalAddress() const
+TDESocketAddress TDEServerSocket::externalAddress() const
 {
   return socketDevice()->externalAddress();
 }
 
-void KServerSocket::lookupFinishedSlot()
+void TDEServerSocket::lookupFinishedSlot()
 {
-  if (d->resolver.isRunning() || d->state > KServerSocketPrivate::LookupDone)
+  if (d->resolver.isRunning() || d->state > TDEServerSocketPrivate::LookupDone)
     return;
 
   if (d->resolver.status() < 0)
@@ -354,25 +354,25 @@ void KServerSocket::lookupFinishedSlot()
       setError(LookupFailure);
       emit gotError(LookupFailure);
       d->bindWhenFound = d->listenWhenBound = false;
-      d->state = KServerSocketPrivate::None;
+      d->state = TDEServerSocketPrivate::None;
       return;
     }
 
   // lookup succeeded
   d->resolverResults = d->resolver.results();
-  d->state = KServerSocketPrivate::LookupDone;
+  d->state = TDEServerSocketPrivate::LookupDone;
   emit hostFound();
 
   if (d->bindWhenFound)
     doBind();
 }
 
-void KServerSocket::copyError()
+void TDEServerSocket::copyError()
 {
   setError(socketDevice()->error());
 }
 
-bool KServerSocket::doBind()
+bool TDEServerSocket::doBind()
 {
   d->bindWhenFound = false;
   // loop through the results and bind to the first that works
@@ -393,7 +393,7 @@ bool KServerSocket::doBind()
   return false;
 }
 
-bool KServerSocket::doListen()
+bool TDEServerSocket::doListen()
 {
   if (!socketDevice()->listen(d->backlog))
     {
@@ -405,7 +405,7 @@ bool KServerSocket::doListen()
   // set up ready accept signal
   TQObject::connect(socketDevice()->readNotifier(), TQT_SIGNAL(activated(int)),
 		   this, TQT_SIGNAL(readyAccept()));
-  d->state = KServerSocketPrivate::Listening;
+  d->state = TDEServerSocketPrivate::Listening;
   return true;
 }
 
diff --git a/tdecore/network/kserversocket.h b/tdecore/network/kserversocket.h
index 4f1af33b9..6821a886a 100644
--- a/tdecore/network/kserversocket.h
+++ b/tdecore/network/kserversocket.h
@@ -30,14 +30,14 @@
 
 namespace KNetwork {
 
-class KSocketDevice;
+class TDESocketDevice;
 class KStreamSocket; 
 class KResolver;
 class KResolverResults;
 
-class KServerSocketPrivate;
+class TDEServerSocketPrivate;
 /**
- * @class KServerSocket kserversocket.h kserversocket.h
+ * @class TDEServerSocket kserversocket.h kserversocket.h
  * @brief A server socket for accepting connections.
  *
  * This class provides functionality for creating a socket to
@@ -49,7 +49,7 @@ class KServerSocketPrivate;
  * A typical example would look like:
  * \code
  *   TQString service = "http";
- *   KServerSocket *ss = new KServerSocket(service);
+ *   TDEServerSocket *ss = new TDEServerSocket(service);
  *   connect(ss, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept()));
  *   connect(ss, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotSocketError(int)));
  *   ss->listen();
@@ -70,14 +70,14 @@ class KServerSocketPrivate;
  *
  * For another example of usage, this below code attempts to make a connection on any port within a range:
  * \code
- *   KServerSocket *ss = new KServerSocket();
+ *   TDEServerSocket *ss = new TDEServerSocket();
  *   ss->setFamily(KResolver::InetFamily);
  *   bool found = false;
  *   for( unsigned int port = firstport; port <= lastport; ++port) {
  *     ss->setAddress( TQString::number( port ) );
  *     bool success = ss->listen();
  *     if( found = ( success && ss->error() == 
- *                              KSocketBase::NoError ) )
+ *                              TDESocketBase::NoError ) )
  *       break;
  *     ss->close();
  *   }
@@ -98,13 +98,13 @@ class KServerSocketPrivate;
  * KNetwork::KBufferedSocket (default). If you want to accept a
  * non-buffered socket, you must first call setAcceptBuffered.
  *
- * @warning If you use KServerSocket in an auxiliary (non-GUI) thread,
+ * @warning If you use TDEServerSocket in an auxiliary (non-GUI) thread,
  *          you need to accept only KNetwork::KStreamSocket objects.
  *
  * @see KNetwork::KStreamSocket, KNetwork::KBufferedSocket
  * @author Thiago Macieira <thiago@kde.org>
  */
-class TDECORE_EXPORT KServerSocket: public TQObject, public KPassiveSocketBase
+class TDECORE_EXPORT TDEServerSocket: public TQObject, public KPassiveSocketBase
 {
   Q_OBJECT
   
@@ -119,7 +119,7 @@ public:
    * @param parent		the parent TQObject object
    * @param name		the name of this object
    */
-  KServerSocket(TQObject* parent = 0L, const char *name = 0L);
+  TDEServerSocket(TQObject* parent = 0L, const char *name = 0L);
 
   /**
    * Construct this object specifying the service to listen on.
@@ -138,7 +138,7 @@ public:
    * @param parent		the parent TQObject object
    * @param name		the name of this object
    */
-  KServerSocket(const TQString& service, TQObject* parent = 0L, const char *name = 0L);
+  TDEServerSocket(const TQString& service, TQObject* parent = 0L, const char *name = 0L);
 
   /**
    * Construct this object specifying the node and service names to listen on.
@@ -158,7 +158,7 @@ public:
    * @param parent		the parent TQObject object
    * @param name		the name of this object
    */
-  KServerSocket(const TQString& node, const TQString& service,
+  TDEServerSocket(const TQString& node, const TQString& service,
 		TQObject* parent = 0L, const char *name = 0L);
 
   /**
@@ -167,11 +167,11 @@ public:
    * Note, however, that accepted sockets do not get closed when this
    * object closes.
    */
-  ~KServerSocket();
+  ~TDEServerSocket();
 
 protected:
   /**
-   * Sets the socket options. Reimplemented from KSocketBase.
+   * Sets the socket options. Reimplemented from TDESocketBase.
    */
   virtual bool setSocketOptions(int opts);
 
@@ -201,7 +201,7 @@ public:
    *
    * This is useful, for instance, when IP addresses are in
    * their string representation (such as "1.2.3.4") or come
-   * from other sources like @ref KSocketAddress.
+   * from other sources like @ref TDESocketAddress.
    *
    * @param enable	whether to enable
    */
@@ -268,7 +268,7 @@ public:
    * emitted (only once, even if we're doing a double lookup).
    * If the lookup failed (for any of the two lookups) the 
    * @ref gotError signal will be emitted with the appropriate
-   * error condition (see @ref KSocketBase::SocketError).
+   * error condition (see @ref TDESocketBase::SocketError).
    *
    * This function returns true on success and false on error. Note that
    * this is not the lookup result!
@@ -306,7 +306,7 @@ public:
   virtual bool bind();
 
   /**
-   * Connect this socket to this specific address. Reimplemented from KSocketBase.
+   * Connect this socket to this specific address. Reimplemented from TDESocketBase.
    *
    * Unlike @ref bind(const TQString&, const TQString&) above, this function
    * really does bind the socket. No lookup is performed. The @ref bound signal
@@ -369,12 +369,12 @@ public:
   /**
    * Returns this socket's local address.
    */
-  virtual KSocketAddress localAddress() const;
+  virtual TDESocketAddress localAddress() const;
 
   /**
    * Returns this socket's externally-visible address if know.
    */
-  virtual KSocketAddress externalAddress() const;
+  virtual TDESocketAddress externalAddress() const;
 
 private slots:
   void lookupFinishedSlot();
@@ -425,10 +425,10 @@ private:
   bool doListen();
 
 private:
-  KServerSocket(const KServerSocket&);
-  KServerSocket& operator=(const KServerSocket&);
+  TDEServerSocket(const TDEServerSocket&);
+  TDEServerSocket& operator=(const TDEServerSocket&);
 
-  KServerSocketPrivate *d;
+  TDEServerSocketPrivate *d;
 };
 
 }				// namespace KNetwork
diff --git a/tdecore/network/ksockssocketdevice.cpp b/tdecore/network/ksockssocketdevice.cpp
index 6a60ce0a3..c1649c340 100644
--- a/tdecore/network/ksockssocketdevice.cpp
+++ b/tdecore/network/ksockssocketdevice.cpp
@@ -43,15 +43,15 @@ using namespace KNetwork;
 
 // constructor
 // nothing to do
-KSocksSocketDevice::KSocksSocketDevice(const KSocketBase* obj)
-  : KSocketDevice(obj)
+KSocksSocketDevice::KSocksSocketDevice(const TDESocketBase* obj)
+  : TDESocketDevice(obj)
 {
 }
 
 // constructor with argument
 // nothing to do
 KSocksSocketDevice::KSocksSocketDevice(int fd)
-  : KSocketDevice(fd)
+  : TDESocketDevice(fd)
 {
 }
 
@@ -67,7 +67,7 @@ int KSocksSocketDevice::capabilities() const
   return 0;			// can do everything!
 }
 
-// From here on, the code is almost exactly a copy of KSocketDevice
+// From here on, the code is almost exactly a copy of TDESocketDevice
 // the differences are the use of KSocks where appropriate
 
 bool KSocksSocketDevice::bind(const KResolverEntry& address)
@@ -190,7 +190,7 @@ KSocksSocketDevice* KSocksSocketDevice::accept()
   return new KSocksSocketDevice(newfd);
 }
 
-static int socks_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false)
+static int socks_read_common(int sockfd, char *data, TQ_ULONG maxlen, TDESocketAddress* from, ssize_t &retval, bool peek = false)
 {
   kde_socklen_t len;
   if (from)
@@ -204,9 +204,9 @@ static int socks_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAdd
   if (retval == -1)
     {
       if (errno == EAGAIN || errno == EWOULDBLOCK)
-	return KSocketDevice::WouldBlock;
+	return TDESocketDevice::WouldBlock;
       else
-	return KSocketDevice::UnknownError;
+	return TDESocketDevice::UnknownError;
     }
 
   if (from)
@@ -235,7 +235,7 @@ TQ_LONG KSocksSocketDevice::tqreadBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KSocksSocketDevice::tqreadBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from)
+TQ_LONG KSocksSocketDevice::tqreadBlock(char *data, TQ_ULONG maxlen, TDESocketAddress &from)
 {
   resetError();
   if (m_sockfd == -1)
@@ -277,7 +277,7 @@ TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from)
+TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from)
 {
   resetError();
   if (m_sockfd == -1)
@@ -300,10 +300,10 @@ TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddres
 
 TQ_LONG KSocksSocketDevice::tqwriteBlock(const char *data, TQ_ULONG len)
 {
-  return tqwriteBlock(data, len, KSocketAddress());
+  return tqwriteBlock(data, len, TDESocketAddress());
 }
 
-TQ_LONG KSocksSocketDevice::tqwriteBlock(const char *data, TQ_ULONG len, const KSocketAddress& to)
+TQ_LONG KSocksSocketDevice::tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to)
 {
   resetError();
   if (m_sockfd == -1)
@@ -325,17 +325,17 @@ TQ_LONG KSocksSocketDevice::tqwriteBlock(const char *data, TQ_ULONG len, const K
   return retval;
 }
 
-KSocketAddress KSocksSocketDevice::localAddress() const
+TDESocketAddress KSocksSocketDevice::localAddress() const
 {
   if (m_sockfd == -1)
-    return KSocketAddress();	// not open, empty value
+    return TDESocketAddress();	// not open, empty value
 
   kde_socklen_t len;
-  KSocketAddress localAddress;
+  TDESocketAddress localAddress;
   localAddress.setLength(len = 32);	// arbitrary value
   if (KSocks::self()->getsockname(m_sockfd, localAddress.address(), &len) == -1)
     // error!
-    return KSocketAddress();
+    return TDESocketAddress();
 
   if (len <= localAddress.length())
     {
@@ -349,22 +349,22 @@ KSocketAddress KSocksSocketDevice::localAddress() const
   localAddress.setLength(len);
   if (KSocks::self()->getsockname(m_sockfd, localAddress.address(), &len) == -1)
     // error!
-    return KSocketAddress();
+    return TDESocketAddress();
 
   return localAddress;
 }
 
-KSocketAddress KSocksSocketDevice::peerAddress() const
+TDESocketAddress KSocksSocketDevice::peerAddress() const
 {
   if (m_sockfd == -1)
-    return KSocketAddress();	// not open, empty value
+    return TDESocketAddress();	// not open, empty value
 
   kde_socklen_t len;
-  KSocketAddress peerAddress;
+  TDESocketAddress peerAddress;
   peerAddress.setLength(len = 32);	// arbitrary value
   if (KSocks::self()->getpeername(m_sockfd, peerAddress.address(), &len) == -1)
     // error!
-    return KSocketAddress();
+    return TDESocketAddress();
 
   if (len <= peerAddress.length())
     {
@@ -378,15 +378,15 @@ KSocketAddress KSocksSocketDevice::peerAddress() const
   peerAddress.setLength(len);
   if (KSocks::self()->getpeername(m_sockfd, peerAddress.address(), &len) == -1)
     // error!
-    return KSocketAddress();
+    return TDESocketAddress();
 
   return peerAddress;
 }
 
-KSocketAddress KSocksSocketDevice::externalAddress() const
+TDESocketAddress KSocksSocketDevice::externalAddress() const
 {
   // return empty, indicating unknown external address
-  return KSocketAddress();
+  return TDESocketAddress();
 }
 
 bool KSocksSocketDevice::poll(bool *input, bool *output, bool *exception,
@@ -474,13 +474,13 @@ void KSocksSocketDevice::initSocks()
   init = true;
 
   if (KSocks::self()->hasSocks())
-    delete KSocketDevice::setDefaultImpl(new KSocketDeviceFactory<KSocksSocketDevice>);
+    delete TDESocketDevice::setDefaultImpl(new TDESocketDeviceFactory<KSocksSocketDevice>);
 }
 
 #if 0
 static bool register()
 {
-  KSocketDevice::addNewImpl(new KSocketDeviceFactory<KSocksSocketDevice>, 0);
+  TDESocketDevice::addNewImpl(new TDESocketDeviceFactory<KSocksSocketDevice>, 0);
 }
 
 static bool register = registered();
diff --git a/tdecore/network/ksockssocketdevice.h b/tdecore/network/ksockssocketdevice.h
index 5c93b6d8c..2a83c0adc 100644
--- a/tdecore/network/ksockssocketdevice.h
+++ b/tdecore/network/ksockssocketdevice.h
@@ -28,7 +28,7 @@ namespace KNetwork {
  * @class KSocksSocketDevice ksockssocketdevice.h ksockssocketdevice.h
  * @brief The low-level class for SOCKS proxying.
  *
- * This class reimplements several functions from @ref KSocketDevice in order
+ * This class reimplements several functions from @ref TDESocketDevice in order
  * to implement SOCKS support.
  *
  * This works by using KSocks.
@@ -37,13 +37,13 @@ namespace KNetwork {
  *
  * @warning This code is untested!
  */
-class TDECORE_EXPORT KSocksSocketDevice: public KSocketDevice
+class TDECORE_EXPORT KSocksSocketDevice: public TDESocketDevice
 {
 public:
   /** 
    * Constructor.
    */
-  KSocksSocketDevice(const KSocketBase* = 0L);
+  KSocksSocketDevice(const TDESocketBase* = 0L);
 
   /**
    * Construct from a file descriptor.
@@ -84,34 +84,34 @@ public:
    * Overrides reading.
    */
   virtual TQ_LONG tqreadBlock(char *data, TQ_ULONG maxlen);
-  virtual TQ_LONG tqreadBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from);
+  virtual TQ_LONG tqreadBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from);
 
   /**
    * Overrides peeking.
    */
   virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen);
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from);
+  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from);
 
   /**
    * Overrides writing.
    */
   virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len);
-  virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len, const KSocketAddress& to);
+  virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to);
 
   /**
    * Overrides getting socket address.
    */
-  virtual KSocketAddress localAddress() const;
+  virtual TDESocketAddress localAddress() const;
 
   /**
    * Overrides getting peer address.
    */
-  virtual KSocketAddress peerAddress() const;
+  virtual TDESocketAddress peerAddress() const;
 
   /**
    * Overrides getting external address.
    */
-  virtual KSocketAddress externalAddress() const;
+  virtual TDESocketAddress externalAddress() const;
 
   /**
    * Overrides polling.
@@ -121,7 +121,7 @@ public:
 
 private:
   static void initSocks();
-  friend class KSocketDevice;
+  friend class TDESocketDevice;
 };
 
 }				// namespace KNetwork
diff --git a/tdecore/network/kstreamsocket.h b/tdecore/network/kstreamsocket.h
index ab90e923a..d077296c1 100644
--- a/tdecore/network/kstreamsocket.h
+++ b/tdecore/network/kstreamsocket.h
@@ -34,7 +34,7 @@ namespace KNetwork {
 
 class KResolverEntry;
 class KResolverResults;
-class KServerSocket;
+class TDEServerSocket;
 class KBufferedSocket;
 
 class KStreamSocketPrivate;
@@ -91,7 +91,7 @@ class KStreamSocketPrivate;
  *  }
  * \endcode
  *
- * @see KNetwork::KBufferedSocket, KNetwork::KServerSocket
+ * @see KNetwork::KBufferedSocket, KNetwork::TDEServerSocket
  * @author Thiago Macieira <thiago@kde.org>
  */
 class TDECORE_EXPORT KStreamSocket: public KClientSocketBase
@@ -241,7 +241,7 @@ private:
 
   KStreamSocketPrivate *d;
 
-  friend class KServerSocket;
+  friend class TDEServerSocket;
   friend class KBufferedSocket;
 };
 
diff --git a/tdecore/network/tdesocketaddress.cpp b/tdecore/network/tdesocketaddress.cpp
index d1234044b..ff97699c8 100644
--- a/tdecore/network/tdesocketaddress.cpp
+++ b/tdecore/network/tdesocketaddress.cpp
@@ -238,7 +238,7 @@ struct our_sockaddr_in6
 #define MIN_SOCKADDR_UN_LEN	(sizeof(TQ_UINT16) + sizeof(char))
 
 
-class KNetwork::KSocketAddressData
+class KNetwork::TDESocketAddressData
 {
 public:
   /*
@@ -249,7 +249,7 @@ public:
   class QMixSocketAddressRef : public KInetSocketAddress, public KUnixSocketAddress
   {
   public:
-    QMixSocketAddressRef(KSocketAddressData* d)
+    QMixSocketAddressRef(TDESocketAddressData* d)
       : KInetSocketAddress(d), KUnixSocketAddress(d)
     {
     }
@@ -265,7 +265,7 @@ public:
   } addr;
   TQ_UINT16 curlen, reallen;
 
-  KSocketAddressData()
+  TDESocketAddressData()
     : ref(this)
   {
     addr.generic = 0L;
@@ -273,7 +273,7 @@ public:
     invalidate();
   }
 
-  ~KSocketAddressData()
+  ~TDESocketAddressData()
   {
     if (addr.generic != 0L)
       free(addr.generic);
@@ -343,7 +343,7 @@ public:
 };
 
 // create duplicates of
-void KSocketAddressData::dup(const sockaddr* sa, TQ_UINT16 len, bool clear)
+void TDESocketAddressData::dup(const sockaddr* sa, TQ_UINT16 len, bool clear)
 {
   if (len < MIN_SOCKADDR_LEN)
     {
@@ -405,30 +405,30 @@ void KSocketAddressData::dup(const sockaddr* sa, TQ_UINT16 len, bool clear)
 }
 
 // default constructor
-KSocketAddress::KSocketAddress()
-  : d(new KSocketAddressData)
+TDESocketAddress::TDESocketAddress()
+  : d(new TDESocketAddressData)
 {
 }
 
 // constructor from binary data
-KSocketAddress::KSocketAddress(const sockaddr *sa, TQ_UINT16 len)
-  : d(new KSocketAddressData)
+TDESocketAddress::TDESocketAddress(const sockaddr *sa, TQ_UINT16 len)
+  : d(new TDESocketAddressData)
 {
   setAddress(sa, len);
 }
 
-KSocketAddress::KSocketAddress(const KSocketAddress& other)
-  : d(new(KSocketAddressData))
+TDESocketAddress::TDESocketAddress(const TDESocketAddress& other)
+  : d(new(TDESocketAddressData))
 {
   *this = other;
 }
 
-KSocketAddress::KSocketAddress(KSocketAddressData *d2)
+TDESocketAddress::TDESocketAddress(TDESocketAddressData *d2)
   : d(d2)
 {
 }
 
-KSocketAddress::~KSocketAddress()
+TDESocketAddress::~TDESocketAddress()
 {
   // prevent double-deletion, since we're already being deleted
   if (d)
@@ -439,7 +439,7 @@ KSocketAddress::~KSocketAddress()
     }
 }
 
-KSocketAddress& KSocketAddress::operator =(const KSocketAddress& other)
+TDESocketAddress& TDESocketAddress::operator =(const TDESocketAddress& other)
 {
   if (other.d && !other.d->invalid())
     d->dup(other.d->addr.generic, other.d->reallen);
@@ -448,21 +448,21 @@ KSocketAddress& KSocketAddress::operator =(const KSocketAddress& other)
   return *this;
 }
 
-const sockaddr* KSocketAddress::address() const
+const sockaddr* TDESocketAddress::address() const
 {
   if (d->invalid())
     return 0L;
   return d->addr.generic;
 }
 
-sockaddr* KSocketAddress::address()
+sockaddr* TDESocketAddress::address()
 {
   if (d->invalid())
     return 0L;
   return d->addr.generic;
 }
 
-KSocketAddress& KSocketAddress::setAddress(const sockaddr* sa, TQ_UINT16 len)
+TDESocketAddress& TDESocketAddress::setAddress(const sockaddr* sa, TQ_UINT16 len)
 {
   if (sa != 0L && len >= MIN_SOCKADDR_LEN)
     d->dup(sa, len);
@@ -472,28 +472,28 @@ KSocketAddress& KSocketAddress::setAddress(const sockaddr* sa, TQ_UINT16 len)
   return *this;
 }
 
-TQ_UINT16 KSocketAddress::length() const
+TQ_UINT16 TDESocketAddress::length() const
 {
   if (d->invalid())
     return 0;
   return d->reallen;
 }
 
-KSocketAddress& KSocketAddress::setLength(TQ_UINT16 len)
+TDESocketAddress& TDESocketAddress::setLength(TQ_UINT16 len)
 {
   d->dup((sockaddr*)0L, len, false);
 
   return *this;
 }
 
-int KSocketAddress::family() const
+int TDESocketAddress::family() const
 {
   if (d->invalid())
     return AF_UNSPEC;
   return d->addr.generic->sa_family;
 }
 
-KSocketAddress& KSocketAddress::setFamily(int family)
+TDESocketAddress& TDESocketAddress::setFamily(int family)
 {
   if (d->invalid())
     d->dup((sockaddr*)0L, MIN_SOCKADDR_LEN);
@@ -502,7 +502,7 @@ KSocketAddress& KSocketAddress::setFamily(int family)
   return *this;
 }
 
-bool KSocketAddress::operator ==(const KSocketAddress& other) const
+bool TDESocketAddress::operator ==(const TDESocketAddress& other) const
 {
   // if this is invalid, it's only equal if the other one is invalid as well
   if (d->invalid())
@@ -559,7 +559,7 @@ bool KSocketAddress::operator ==(const KSocketAddress& other) const
   return false;		// not equal in any other case
 }
 
-TQString KSocketAddress::nodeName() const
+TQString TDESocketAddress::nodeName() const
 {
   if (d->invalid())
     return TQString::null;
@@ -585,7 +585,7 @@ TQString KSocketAddress::nodeName() const
   return TQString::null;
 }
 
-TQString KSocketAddress::serviceName() const
+TQString TDESocketAddress::serviceName() const
 {
   if (d->invalid())
     return TQString::null;
@@ -605,7 +605,7 @@ TQString KSocketAddress::serviceName() const
   return TQString::null;
 }
 
-TQString KSocketAddress::toString() const
+TQString TDESocketAddress::toString() const
 {
   if (d->invalid())
     return TQString::null;
@@ -627,27 +627,27 @@ TQString KSocketAddress::toString() const
   return fmt.arg(nodeName()).arg(serviceName());
 }
 
-KInetSocketAddress& KSocketAddress::asInet()
+KInetSocketAddress& TDESocketAddress::asInet()
 {
   return d->ref;
 }
 
-KInetSocketAddress KSocketAddress::asInet() const
+KInetSocketAddress TDESocketAddress::asInet() const
 {
   return d->ref;
 }
 
-KUnixSocketAddress& KSocketAddress::asUnix()
+KUnixSocketAddress& TDESocketAddress::asUnix()
 {
   return d->ref;
 }
 
-KUnixSocketAddress KSocketAddress::asUnix() const
+KUnixSocketAddress TDESocketAddress::asUnix() const
 {
   return d->ref;
 }
 
-int KSocketAddress::ianaFamily(int af)
+int TDESocketAddress::ianaFamily(int af)
 {
   switch (af)
     {
@@ -664,7 +664,7 @@ int KSocketAddress::ianaFamily(int af)
     }
 }
 
-int KSocketAddress::fromIanaFamily(int iana)
+int TDESocketAddress::fromIanaFamily(int iana)
 {
   switch (iana)
     {
@@ -688,7 +688,7 @@ KInetSocketAddress::KInetSocketAddress()
 
 // binary data constructor
 KInetSocketAddress::KInetSocketAddress(const sockaddr* sa, TQ_UINT16 len)
-  : KSocketAddress(sa, len)
+  : TDESocketAddress(sa, len)
 {
   if (!d->invalid())
     update();
@@ -703,21 +703,21 @@ KInetSocketAddress::KInetSocketAddress(const KIpAddress& host, TQ_UINT16 port)
 
 // copy constructor
 KInetSocketAddress::KInetSocketAddress(const KInetSocketAddress& other)
-  : KSocketAddress(other)
+  : TDESocketAddress(other)
 {
 }
 
 // special copy constructor
-KInetSocketAddress::KInetSocketAddress(const KSocketAddress& other)
-  : KSocketAddress(other)
+KInetSocketAddress::KInetSocketAddress(const TDESocketAddress& other)
+  : TDESocketAddress(other)
 {
   if (!d->invalid())
     update();
 }
 
 // special constructor
-KInetSocketAddress::KInetSocketAddress(KSocketAddressData *d)
-  : KSocketAddress(d)
+KInetSocketAddress::KInetSocketAddress(TDESocketAddressData *d)
+  : TDESocketAddress(d)
 {
 }
 
@@ -730,7 +730,7 @@ KInetSocketAddress::~KInetSocketAddress()
 // copy operator
 KInetSocketAddress& KInetSocketAddress::operator =(const KInetSocketAddress& other)
 {
-  KSocketAddress::operator =(other);
+  TDESocketAddress::operator =(other);
   return *this;
 }
 
@@ -905,14 +905,14 @@ KUnixSocketAddress::KUnixSocketAddress()
 }
 
 KUnixSocketAddress::KUnixSocketAddress(const sockaddr* sa, TQ_UINT16 len)
-  : KSocketAddress(sa, len)
+  : TDESocketAddress(sa, len)
 {
   if (!d->invalid() && d->addr.un->sun_family != AF_UNIX)
     d->invalidate();
 }
 
 KUnixSocketAddress::KUnixSocketAddress(const KUnixSocketAddress& other)
-  : KSocketAddress(other)
+  : TDESocketAddress(other)
 {
 }
 
@@ -921,8 +921,8 @@ KUnixSocketAddress::KUnixSocketAddress(const TQString& pathname)
   setPathname(pathname);
 }
 
-KUnixSocketAddress::KUnixSocketAddress(KSocketAddressData* d)
-  : KSocketAddress(d)
+KUnixSocketAddress::KUnixSocketAddress(TDESocketAddressData* d)
+  : TDESocketAddress(d)
 {
 }
 
@@ -932,7 +932,7 @@ KUnixSocketAddress::~KUnixSocketAddress()
 
 KUnixSocketAddress& KUnixSocketAddress::operator =(const KUnixSocketAddress& other)
 {
-  KSocketAddress::operator =(other);
+  TDESocketAddress::operator =(other);
   return *this;
 }
 
diff --git a/tdecore/network/tdesocketaddress.h b/tdecore/network/tdesocketaddress.h
index 885bb77cb..100e05fb2 100644
--- a/tdecore/network/tdesocketaddress.h
+++ b/tdecore/network/tdesocketaddress.h
@@ -38,7 +38,7 @@ struct sockaddr_un;
 namespace KNetwork {
 
 class KIpAddress;
-class KSocketAddress;
+class TDESocketAddress;
 class KInetSocketAddress;
 class KUnixSocketAddress;
 
@@ -412,15 +412,15 @@ public:
 };
 
 
-class KSocketAddressData;
-/** @class KSocketAddress tdesocketaddress.h tdesocketaddress.h
+class TDESocketAddressData;
+/** @class TDESocketAddress tdesocketaddress.h tdesocketaddress.h
  *  @brief A generic socket address.
  *
  * This class holds one generic socket address.
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class TDECORE_EXPORT KSocketAddress
+class TDECORE_EXPORT TDESocketAddress
 {
 public:
   /**
@@ -428,7 +428,7 @@ public:
    *
    * Creates an empty object
    */
-  KSocketAddress();
+  TDESocketAddress();
 
   /**
    * Creates this object with the given data.
@@ -437,7 +437,7 @@ public:
    * @param sa		the socket address structure
    * @param len		the socket address length
    */
-  KSocketAddress(const sockaddr* sa, TQ_UINT16 len);
+  TDESocketAddress(const sockaddr* sa, TQ_UINT16 len);
 
   /**
    * Copy constructor. This creates a copy of the other
@@ -447,12 +447,12 @@ public:
    *
    * @param other	the object to copy from
    */
-  KSocketAddress(const KSocketAddress& other);
+  TDESocketAddress(const TDESocketAddress& other);
 
   /**
    * Destructor. Frees any associated resources.
    */
-  virtual ~KSocketAddress();
+  virtual ~TDESocketAddress();
 
   /**
    * Performs a shallow copy of the other object into this one.
@@ -460,7 +460,7 @@ public:
    *
    * @param other	the object to copy from
    */
-  KSocketAddress& operator =(const KSocketAddress& other);
+  TDESocketAddress& operator =(const TDESocketAddress& other);
 
   /**
    * Returns the socket address structure, to be passed down to
@@ -490,7 +490,7 @@ public:
    * @param sa		the socket address structure
    * @param len		the socket address length
    */
-  KSocketAddress& setAddress(const sockaddr *sa, TQ_UINT16 len);
+  TDESocketAddress& setAddress(const sockaddr *sa, TQ_UINT16 len);
 
   /**
    * Returns the socket address structure, to be passed down to
@@ -517,14 +517,14 @@ public:
    * the family:
    *
    * \code
-   *   KSocketAddress qsa;
+   *   TDESocketAddress qsa;
    *   [...]
    *   qsa.setFamily(AF_UNSPEC).setLength(newlen);
    * \endcode
    *
    * @param len		the new length
    */
-  KSocketAddress& setLength(TQ_UINT16 len);
+  TDESocketAddress& setLength(TQ_UINT16 len);
 
   /**
    * Returns the family of this address.
@@ -540,7 +540,7 @@ public:
    *
    * @param family	the new family to set
    */
-  virtual KSocketAddress& setFamily(int family);
+  virtual TDESocketAddress& setFamily(int family);
 
   /**
    * Returns the IANA family number of this address.
@@ -558,7 +558,7 @@ public:
    * @param other	the other socket
    * @return true if both sockets are equal
    */
-  bool operator ==(const KSocketAddress& other) const;
+  bool operator ==(const TDESocketAddress& other) const;
 
   /**
    * Returns the node name of this socket.
@@ -615,11 +615,11 @@ public:
 protected:
   /// @internal
   /// private data
-  KSocketAddressData *d;
+  TDESocketAddressData *d;
 
   /// @internal
   /// extra constructor
-  KSocketAddress(KSocketAddressData* d);
+  TDESocketAddress(TDESocketAddressData* d);
 
 public:				// static
   /**
@@ -648,9 +648,9 @@ public:				// static
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class TDECORE_EXPORT KInetSocketAddress: public KSocketAddress
+class TDECORE_EXPORT KInetSocketAddress: public TDESocketAddress
 {
-  friend class KSocketAddress;
+  friend class TDESocketAddress;
 public:
   /**
    * Public constructor. Creates an empty object.
@@ -693,7 +693,7 @@ public:
    *
    * @param other	the other object
    */
-  KInetSocketAddress(const KSocketAddress& other);
+  KInetSocketAddress(const TDESocketAddress& other);
 
   /**
    * Destroys this object.
@@ -817,7 +817,7 @@ public:
 protected:
   /// @internal
   /// extra constructor
-  KInetSocketAddress(KSocketAddressData* d);
+  KInetSocketAddress(TDESocketAddressData* d);
 
 private:
   void update();
@@ -837,9 +837,9 @@ private:
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class TDECORE_EXPORT KUnixSocketAddress: public KSocketAddress
+class TDECORE_EXPORT KUnixSocketAddress: public TDESocketAddress
 {
-  friend class KSocketAddress;
+  friend class TDESocketAddress;
 public:
   /**
    * Default constructor. Creates an empty object.
@@ -904,7 +904,7 @@ public:
 protected:
   /// @internal
   /// extra constructor
-  KUnixSocketAddress(KSocketAddressData* d);
+  KUnixSocketAddress(TDESocketAddressData* d);
 };
 
 }				// namespace KNetwork
diff --git a/tdecore/network/tdesocketbase.cpp b/tdecore/network/tdesocketbase.cpp
index 9be0d6e52..0eb31bbc1 100644
--- a/tdecore/network/tdesocketbase.cpp
+++ b/tdecore/network/tdesocketbase.cpp
@@ -31,24 +31,24 @@
 
 using namespace KNetwork;
 
-class KNetwork::KSocketBasePrivate
+class KNetwork::TDESocketBasePrivate
 {
 public:
   int socketOptions;
   int socketError;
   int capabilities;
 
-  mutable KSocketDevice* device;
+  mutable TDESocketDevice* device;
 
   TQMutex mutex;
 
-  KSocketBasePrivate()
+  TDESocketBasePrivate()
     : mutex(true)		// create recursive
   { }
 };
 
-KSocketBase::KSocketBase()
-  : d(new KSocketBasePrivate)
+TDESocketBase::TDESocketBase()
+  : d(new TDESocketBasePrivate)
 {
   d->socketOptions = Blocking;
   d->socketError = 0;
@@ -56,64 +56,64 @@ KSocketBase::KSocketBase()
   d->capabilities = 0;
 }
 
-KSocketBase::~KSocketBase()
+TDESocketBase::~TDESocketBase()
 {
   delete d->device;
   delete d;
 }
 
-bool KSocketBase::setSocketOptions(int opts)
+bool TDESocketBase::setSocketOptions(int opts)
 {
   d->socketOptions = opts;
   return true;
 }
 
-int KSocketBase::socketOptions() const
+int TDESocketBase::socketOptions() const
 {
   return d->socketOptions;
 }
 
-bool KSocketBase::setBlocking(bool enable)
+bool TDESocketBase::setBlocking(bool enable)
 {
   return setSocketOptions((socketOptions() & ~Blocking) | (enable ? Blocking : 0));
 }
 
-bool KSocketBase::blocking() const
+bool TDESocketBase::blocking() const
 {
   return socketOptions() & Blocking;
 }
 
-bool KSocketBase::setAddressReuseable(bool enable)
+bool TDESocketBase::setAddressReuseable(bool enable)
 {
   return setSocketOptions((socketOptions() & ~AddressReuseable) | (enable ? AddressReuseable : 0));
 }
 
-bool KSocketBase::addressReuseable() const
+bool TDESocketBase::addressReuseable() const
 {
   return socketOptions() & AddressReuseable;
 }
 
-bool KSocketBase::setIPv6Only(bool enable)
+bool TDESocketBase::setIPv6Only(bool enable)
 {
   return setSocketOptions((socketOptions() & ~IPv6Only) | (enable ? IPv6Only : 0));
 }
 
-bool KSocketBase::isIPv6Only() const
+bool TDESocketBase::isIPv6Only() const
 {
   return socketOptions() & IPv6Only;
 }
 
-bool KSocketBase::setBroadcast(bool enable)
+bool TDESocketBase::setBroadcast(bool enable)
 {
   return setSocketOptions((socketOptions() & ~Broadcast) | (enable ? Broadcast : 0));
 }
 
-bool KSocketBase::broadcast() const
+bool TDESocketBase::broadcast() const
 {
   return socketOptions() & Broadcast;
 }
 
-KSocketDevice* KSocketBase::socketDevice() const
+TDESocketDevice* TDESocketBase::socketDevice() const
 {
   if (d->device)
     return d->device;
@@ -123,47 +123,47 @@ KSocketDevice* KSocketBase::socketDevice() const
   if (d->device)
     return d->device;
 
-  KSocketBase* that = const_cast<KSocketBase*>(this);
-  KSocketDevice* dev = 0;
+  TDESocketBase* that = const_cast<TDESocketBase*>(this);
+  TDESocketDevice* dev = 0;
   if (d->capabilities)
-    dev = KSocketDevice::createDefault(that, d->capabilities);
+    dev = TDESocketDevice::createDefault(that, d->capabilities);
   if (!dev)
-    dev = KSocketDevice::createDefault(that);
+    dev = TDESocketDevice::createDefault(that);
   that->setSocketDevice(dev);
   return d->device;
 }
 
-void KSocketBase::setSocketDevice(KSocketDevice* device)
+void TDESocketBase::setSocketDevice(TDESocketDevice* device)
 {
   TQMutexLocker locker(mutex());
   if (d->device == 0L)
     d->device = device;
 }
 
-int KSocketBase::setRequestedCapabilities(int add, int remove)
+int TDESocketBase::setRequestedCapabilities(int add, int remove)
 {
   d->capabilities |= add;
   d->capabilities &= ~remove;
   return d->capabilities;
 }
 
-bool KSocketBase::hasDevice() const
+bool TDESocketBase::hasDevice() const
 {
   return d->device != 0L;
 }
 
-void KSocketBase::setError(SocketError error)
+void TDESocketBase::setError(SocketError error)
 {
   d->socketError = error;
 }
 
-KSocketBase::SocketError KSocketBase::error() const
+TDESocketBase::SocketError TDESocketBase::error() const
 {
-  return static_cast<KSocketBase::SocketError>(d->socketError);
+  return static_cast<TDESocketBase::SocketError>(d->socketError);
 }
 
 // static
-TQString KSocketBase::errorString(KSocketBase::SocketError code)
+TQString TDESocketBase::errorString(TDESocketBase::SocketError code)
 {
   TQString reason;
   switch (code)
@@ -256,7 +256,7 @@ TQString KSocketBase::errorString(KSocketBase::SocketError code)
 }
 
 // static
-bool KSocketBase::isFatalError(int code)
+bool TDESocketBase::isFatalError(int code)
 {
   switch (code)
     {
@@ -270,12 +270,12 @@ bool KSocketBase::isFatalError(int code)
   return true;
 }
 
-void KSocketBase::unsetSocketDevice()
+void TDESocketBase::unsetSocketDevice()
 {
   d->device = 0L;
 }
 
-TQMutex* KSocketBase::mutex() const
+TQMutex* TDESocketBase::mutex() const
 {
   return &d->mutex;
 }
@@ -308,13 +308,13 @@ int KActiveSocketBase::putch(int ch)
 
 void KActiveSocketBase::setError(int status, SocketError error)
 {
-  KSocketBase::setError(error);
+  TDESocketBase::setError(error);
   setStatus(status);
 }
 
 void KActiveSocketBase::resetError()
 {
-  KSocketBase::setError(NoError);
+  TDESocketBase::setError(NoError);
   resetStatus();
 }
 
diff --git a/tdecore/network/tdesocketbase.h b/tdecore/network/tdesocketbase.h
index 48ae15e05..bd0828408 100644
--- a/tdecore/network/tdesocketbase.h
+++ b/tdecore/network/tdesocketbase.h
@@ -80,10 +80,10 @@ class TQMutex;
 namespace KNetwork {
 
 class KResolverEntry;
-class KSocketDevice;
+class TDESocketDevice;
 
-class KSocketBasePrivate;
-/** @class KSocketBase tdesocketbase.h tdesocketbase.h
+class TDESocketBasePrivate;
+/** @class TDESocketBase tdesocketbase.h tdesocketbase.h
  *  @brief Basic socket functionality.
  *
  * This class provides the basic socket functionlity for descended classes.
@@ -94,7 +94,7 @@ class KSocketBasePrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class TDECORE_EXPORT KSocketBase
+class TDECORE_EXPORT TDESocketBase
 {
 public:
   /**
@@ -175,12 +175,12 @@ public:
   /**
    * Default constructor.
    */
-  KSocketBase();
+  TDESocketBase();
 
   /**
    * Destructor.
    */
-  virtual ~KSocketBase();
+  virtual ~TDESocketBase();
 
   /*
    * The following functions are shared by all descended classes and will have
@@ -316,7 +316,7 @@ public:
    * This function creates the device if none has been set
    * using the default factory.
    */
-  KSocketDevice* socketDevice() const;
+  TDESocketDevice* socketDevice() const;
 
   /**
    * Sets the socket implementation to be used on this socket.
@@ -331,7 +331,7 @@ public:
    * This function is called by @ref socketDevice above when the socket is
    * first created.
    */
-  virtual void setSocketDevice(KSocketDevice* device);
+  virtual void setSocketDevice(TDESocketDevice* device);
 
   /**
    * Sets the internally requested capabilities for a socket device.
@@ -341,16 +341,16 @@ public:
    * implementation. By using this function, derived classes can request
    * that a backend with those capabilities be created when necessary.
    *
-   * For the possible flags, see @ref KSocketDevice::Capabilities. However, note
+   * For the possible flags, see @ref TDESocketDevice::Capabilities. However, note
    * that only the Can* flags make sense in this context.
    *
    * @note Since socketDevice must always return a valid backend object, it
    *       is is possible that the created device does not conform to all
    *       requirements requested. Implementations sensitive to this fact
    *       should test the object returned by @ref socketDevice (through
-   *       @ref KSocketDevice::capabilities, for instance) the availability.
+   *       @ref TDESocketDevice::capabilities, for instance) the availability.
    *
-   * @param add		mask of @ref KSocketDevice::Capabilities to add
+   * @param add		mask of @ref TDESocketDevice::Capabilities to add
    * @param remove	mask of bits to remove from the requirements
    * @return the current mask of requested capabilities
    */
@@ -420,15 +420,15 @@ public:
 
 private:
   /// @internal
-  /// called by KSocketDevice
+  /// called by TDESocketDevice
   void unsetSocketDevice();
 
-  KSocketBase(const KSocketBase&);
-  KSocketBase& operator =(const KSocketBase&);
+  TDESocketBase(const TDESocketBase&);
+  TDESocketBase& operator =(const TDESocketBase&);
 
-  KSocketBasePrivate *d;
+  TDESocketBasePrivate *d;
 
-  friend class KSocketDevice;
+  friend class TDESocketDevice;
 };
 
 /**
@@ -440,7 +440,7 @@ private:
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class TDECORE_EXPORT KActiveSocketBase: public TQIODevice, virtual public KSocketBase
+class TDECORE_EXPORT KActiveSocketBase: public TQIODevice, virtual public TDESocketBase
 {
 public:
   /**
@@ -575,7 +575,7 @@ public:
    * @param from		the address of the sender will be stored here
    * @returns the actual number of bytes read
    */
-  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from) = 0;
+  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from) = 0;
 
   /**
    * Peeks the data in the socket.
@@ -602,7 +602,7 @@ public:
    * @param from		the address of the sender will be stored here
    * @returns the actual number of bytes copied into @p data
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from) = 0;
+  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from) = 0;
 
   /**
    * Writes the given data to the socket.
@@ -623,7 +623,7 @@ public:
    * @param to			the address to send to
    * @returns the number of bytes actually sent
    */
-  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to) = 0;
+  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to) = 0;
 
   /**
    * Reads one character from the socket.
@@ -647,14 +647,14 @@ public:
   /**
    * Returns this socket's local address.
    */
-  virtual KSocketAddress localAddress() const = 0;
+  virtual TDESocketAddress localAddress() const = 0;
 
   /**
    * Return this socket's peer address, if we are connected.
    * If the address cannot be retrieved, the returned object will contain
    * an invalid address.
    */
-  virtual KSocketAddress peerAddress() const = 0;
+  virtual TDESocketAddress peerAddress() const = 0;
 
   // FIXME KDE 4.0:
   // enable this function
@@ -662,7 +662,7 @@ public:
   /**
    * Returns this socket's externally-visible address, if known.
    */
-  virtual KSocketAddress externalAddress() const = 0;
+  virtual TDESocketAddress externalAddress() const = 0;
 #endif
 
 protected:
@@ -689,7 +689,7 @@ protected:
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class TDECORE_EXPORT KPassiveSocketBase: virtual public KSocketBase
+class TDECORE_EXPORT KPassiveSocketBase: virtual public TDESocketBase
 {
 public:
   /**
@@ -754,12 +754,12 @@ public:
   /**
    * Returns this socket's local address.
    */
-  virtual KSocketAddress localAddress() const = 0;
+  virtual TDESocketAddress localAddress() const = 0;
 
   /**
    * Returns this socket's externally-visible address if known.
    */
-  virtual KSocketAddress externalAddress() const = 0;
+  virtual TDESocketAddress externalAddress() const = 0;
 
 private:
   KPassiveSocketBase(const KPassiveSocketBase&);
diff --git a/tdecore/network/tdesocketbuffer.cpp b/tdecore/network/tdesocketbuffer.cpp
index 0ba18b77b..52988d344 100644
--- a/tdecore/network/tdesocketbuffer.cpp
+++ b/tdecore/network/tdesocketbuffer.cpp
@@ -33,23 +33,23 @@
 using namespace KNetwork;
 using namespace KNetwork::Internal;
 
-KSocketBuffer::KSocketBuffer(TQ_LONG size)
+TDESocketBuffer::TDESocketBuffer(TQ_LONG size)
   : m_mutex(true), m_offset(0), m_size(size), m_length(0)
 {
 }
 
-KSocketBuffer::KSocketBuffer(const KSocketBuffer& other)
+TDESocketBuffer::TDESocketBuffer(const TDESocketBuffer& other)
   : KIOBufferBase(other), m_mutex(true)
 {
   *this = other;
 }
 
-KSocketBuffer::~KSocketBuffer()
+TDESocketBuffer::~TDESocketBuffer()
 {
   // TQValueList takes care of deallocating memory
 }
 
-KSocketBuffer& KSocketBuffer::operator=(const KSocketBuffer& other)
+TDESocketBuffer& TDESocketBuffer::operator=(const TDESocketBuffer& other)
 {
   TQMutexLocker locker1(&m_mutex);
   TQMutexLocker locker2(&other.m_mutex);
@@ -64,7 +64,7 @@ KSocketBuffer& KSocketBuffer::operator=(const KSocketBuffer& other)
   return *this;
 }
 
-bool KSocketBuffer::canReadLine() const
+bool TDESocketBuffer::canReadLine() const
 {
   TQMutexLocker locker(&m_mutex);
 
@@ -85,7 +85,7 @@ bool KSocketBuffer::canReadLine() const
   return false;			// not found
 }
 
-TQCString KSocketBuffer::readLine()
+TQCString TDESocketBuffer::readLine()
 {
   if (!canReadLine())
     return TQCString();		// empty
@@ -120,17 +120,17 @@ TQCString KSocketBuffer::readLine()
   return result;
 }
 
-TQ_LONG KSocketBuffer::length() const
+TQ_LONG TDESocketBuffer::length() const
 {
   return m_length;
 }
 
-TQ_LONG KSocketBuffer::size() const
+TQ_LONG TDESocketBuffer::size() const
 {
   return m_size;
 }
 
-bool KSocketBuffer::setSize(TQ_LONG size)
+bool TDESocketBuffer::setSize(TQ_LONG size)
 {
   m_size = size;
   if (size == -1 || m_length < m_size)
@@ -147,7 +147,7 @@ bool KSocketBuffer::setSize(TQ_LONG size)
   return (m_length - m_size) == consumeBuffer(0L, m_length - m_size, true);
 }
 
-TQ_LONG KSocketBuffer::feedBuffer(const char *data, TQ_LONG len)
+TQ_LONG TDESocketBuffer::feedBuffer(const char *data, TQ_LONG len)
 {
   if (data == 0L || len == 0)
     return 0;			// nothing to write
@@ -168,7 +168,7 @@ TQ_LONG KSocketBuffer::feedBuffer(const char *data, TQ_LONG len)
   return len;
 }
 
-TQ_LONG KSocketBuffer::consumeBuffer(char *destbuffer, TQ_LONG maxlen, bool discard)
+TQ_LONG TDESocketBuffer::consumeBuffer(char *destbuffer, TQ_LONG maxlen, bool discard)
 {
   if (maxlen == 0 || isEmpty())
     return 0;
@@ -220,7 +220,7 @@ TQ_LONG KSocketBuffer::consumeBuffer(char *destbuffer, TQ_LONG maxlen, bool disc
   return copied;
 }
 
-void KSocketBuffer::clear()
+void TDESocketBuffer::clear()
 {
   TQMutexLocker locker(&m_mutex);
   m_list.clear();
@@ -228,7 +228,7 @@ void KSocketBuffer::clear()
   m_length = 0;
 }
 
-TQ_LONG KSocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len)
+TQ_LONG TDESocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len)
 {
   if (len == 0 || isEmpty())
     return 0;
@@ -293,7 +293,7 @@ TQ_LONG KSocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len)
   return written;
 }
 
-TQ_LONG KSocketBuffer::receiveFrom(KActiveSocketBase* dev, TQ_LONG len)
+TQ_LONG TDESocketBuffer::receiveFrom(KActiveSocketBase* dev, TQ_LONG len)
 {
   if (len == 0 || isFull())
     return 0;
diff --git a/tdecore/network/tdesocketbuffer_p.h b/tdecore/network/tdesocketbuffer_p.h
index b2c5dc6b2..be71f462e 100644
--- a/tdecore/network/tdesocketbuffer_p.h
+++ b/tdecore/network/tdesocketbuffer_p.h
@@ -38,14 +38,14 @@ class KActiveSocketBase;
 
 /**
  * @internal
- * @class KSocketBuffer tdesocketbuffer_p.h tdesocketbuffer_p.h
+ * @class TDESocketBuffer tdesocketbuffer_p.h tdesocketbuffer_p.h
  * @brief generic socket buffering code
  *
  * This class implements generic buffering used by @ref KBufferedSocket.
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KSocketBuffer: public KIOBufferBase
+class TDESocketBuffer: public KIOBufferBase
 {
 public:
   /**
@@ -53,22 +53,22 @@ public:
    *
    * @param size	the maximum size of the buffer
    */
-  KSocketBuffer(TQ_LONG size = -1);
+  TDESocketBuffer(TQ_LONG size = -1);
 
   /**
    * Copy constructor.
    */
-  KSocketBuffer(const KSocketBuffer& other);
+  TDESocketBuffer(const TDESocketBuffer& other);
 
   /**
    * Virtual destructor. Frees the buffer and discards its contents.
    */
-  virtual ~KSocketBuffer();
+  virtual ~TDESocketBuffer();
 
   /**
    * Assignment operator.
    */
-  KSocketBuffer& operator=(const KSocketBuffer& other);
+  TDESocketBuffer& operator=(const TDESocketBuffer& other);
 
   /**
    * Returns true if a line can be read from the buffer.
diff --git a/tdecore/network/tdesocketdevice.cpp b/tdecore/network/tdesocketdevice.cpp
index 064b66b08..e4802bb7c 100644
--- a/tdecore/network/tdesocketdevice.cpp
+++ b/tdecore/network/tdesocketdevice.cpp
@@ -60,14 +60,14 @@
 
 using namespace KNetwork;
 
-class KNetwork::KSocketDevicePrivate
+class KNetwork::TDESocketDevicePrivate
 {
 public:
   mutable TQSocketNotifier *input, *output, *exception;
-  KSocketAddress local, peer;
+  TDESocketAddress local, peer;
   int af;
 
-  inline KSocketDevicePrivate()
+  inline TDESocketDevicePrivate()
   {
     input = output = exception = 0L;
     af = 0;
@@ -75,16 +75,16 @@ public:
 };
 
 
-KSocketDevice::KSocketDevice(const KSocketBase* parent)
-  : m_sockfd(-1), d(new KSocketDevicePrivate)
+TDESocketDevice::TDESocketDevice(const TDESocketBase* parent)
+  : m_sockfd(-1), d(new TDESocketDevicePrivate)
 {
   setSocketDevice(this);
   if (parent)
     setSocketOptions(parent->socketOptions());
 }
 
-KSocketDevice::KSocketDevice(int fd)
-  : m_sockfd(fd), d(new KSocketDevicePrivate)
+TDESocketDevice::TDESocketDevice(int fd)
+  : m_sockfd(fd), d(new TDESocketDevicePrivate)
 {
   setState(IO_Open);
   setFlags(IO_Sequential | IO_Raw | IO_ReadWrite);
@@ -92,26 +92,26 @@ KSocketDevice::KSocketDevice(int fd)
   d->af = localAddress().family();
 }
 
-KSocketDevice::KSocketDevice(bool, const KSocketBase* parent)
-  : m_sockfd(-1), d(new KSocketDevicePrivate)
+TDESocketDevice::TDESocketDevice(bool, const TDESocketBase* parent)
+  : m_sockfd(-1), d(new TDESocketDevicePrivate)
 {
   // do not set parent
   if (parent)
     setSocketOptions(parent->socketOptions());
 }
 
-KSocketDevice::~KSocketDevice()
+TDESocketDevice::~TDESocketDevice()
 {
   close();			// deletes the notifiers
   unsetSocketDevice(); 		// prevent double deletion
   delete d;
 }
 
-bool KSocketDevice::setSocketOptions(int opts)
+bool TDESocketDevice::setSocketOptions(int opts)
 {
   // must call parent
   TQMutexLocker locker(mutex());
-  KSocketBase::setSocketOptions(opts);
+  TDESocketBase::setSocketOptions(opts);
 
   if (m_sockfd == -1)
     return true;		// flags are stored
@@ -171,13 +171,13 @@ bool KSocketDevice::setSocketOptions(int opts)
   return true;			// all went well
 }
 
-bool KSocketDevice::open(TQ_OpenMode)
+bool TDESocketDevice::open(TQ_OpenMode)
 {
   resetError();
   return false;
 }
 
-void KSocketDevice::close()
+void TDESocketDevice::close()
 {
   resetError();
   if (m_sockfd != -1)
@@ -198,7 +198,7 @@ void KSocketDevice::close()
   m_sockfd = -1;
 }
 
-bool KSocketDevice::create(int family, int type, int protocol)
+bool TDESocketDevice::create(int family, int type, int protocol)
 {
   resetError();
 
@@ -224,12 +224,12 @@ bool KSocketDevice::create(int family, int type, int protocol)
   return true;		// successfully created
 }
 
-bool KSocketDevice::create(const KResolverEntry& address)
+bool TDESocketDevice::create(const KResolverEntry& address)
 {
   return create(address.family(), address.socketType(), address.protocol());
 }
 
-bool KSocketDevice::bind(const KResolverEntry& address)
+bool TDESocketDevice::bind(const KResolverEntry& address)
 {
   resetError();
 
@@ -252,7 +252,7 @@ bool KSocketDevice::bind(const KResolverEntry& address)
   return true;
 }
 
-bool KSocketDevice::listen(int backlog)
+bool TDESocketDevice::listen(int backlog)
 {
   if (m_sockfd != -1)
     {
@@ -273,7 +273,7 @@ bool KSocketDevice::listen(int backlog)
   return false;
 }
 
-bool KSocketDevice::connect(const KResolverEntry& address)
+bool TDESocketDevice::connect(const KResolverEntry& address)
 {
   resetError();
 
@@ -306,7 +306,7 @@ bool KSocketDevice::connect(const KResolverEntry& address)
   return true;			// all is well
 }
 
-KSocketDevice* KSocketDevice::accept()
+TDESocketDevice* TDESocketDevice::accept()
 {
   if (m_sockfd == -1)
     {
@@ -327,17 +327,17 @@ KSocketDevice* KSocketDevice::accept()
       return NULL;
     }
 
-  return new KSocketDevice(newfd);
+  return new TDESocketDevice(newfd);
 }
 
-bool KSocketDevice::disconnect()
+bool TDESocketDevice::disconnect()
 {
   resetError();
 
   if (m_sockfd == -1)
     return false;		// can't create
 
-  KSocketAddress address;
+  TDESocketAddress address;
   address.setFamily(AF_UNSPEC);
   if (kde_connect(m_sockfd, address.address(), address.length()) == -1)
     {
@@ -365,10 +365,10 @@ bool KSocketDevice::disconnect()
 }
 
 #ifdef USE_QT3
-TQ_LONG KSocketDevice::bytesAvailable() const
+TQ_LONG TDESocketDevice::bytesAvailable() const
 #endif
 #ifdef USE_QT4
-qint64 KSocketDevice::bytesAvailable() const
+qint64 TDESocketDevice::bytesAvailable() const
 #endif
 {
   if (m_sockfd == -1)
@@ -381,7 +381,7 @@ qint64 KSocketDevice::bytesAvailable() const
   return nchars;
 }
 
-TQ_LONG KSocketDevice::waitForMore(int msecs, bool *timeout)
+TQ_LONG TDESocketDevice::waitForMore(int msecs, bool *timeout)
 {
   if (m_sockfd == -1)
     return -1;			// there won't ever be anything to read...
@@ -393,7 +393,7 @@ TQ_LONG KSocketDevice::waitForMore(int msecs, bool *timeout)
   return bytesAvailable();
 }
 
-static int do_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false)
+static int do_read_common(int sockfd, char *data, TQ_ULONG maxlen, TDESocketAddress* from, ssize_t &retval, bool peek = false)
 {
   socklen_t len;
   if (from)
@@ -407,19 +407,19 @@ static int do_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAddres
   if (retval == -1)
     {
       if (errno == EAGAIN || errno == EWOULDBLOCK)
-	return KSocketDevice::WouldBlock;
+	return TDESocketDevice::WouldBlock;
       else
-	return KSocketDevice::UnknownError;
+	return TDESocketDevice::UnknownError;
     }
   if (retval == 0)
-    return KSocketDevice::RemotelyDisconnected;
+    return TDESocketDevice::RemotelyDisconnected;
 
   if (from)
     from->setLength(len);
   return 0;
 }
 
-TQT_TQIO_LONG KSocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
+TQT_TQIO_LONG TDESocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
 {
   resetError();
   if (m_sockfd == -1)
@@ -440,7 +440,7 @@ TQT_TQIO_LONG KSocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
   return retval;
 }
 
-TQT_TQIO_LONG KSocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress &from)
+TQT_TQIO_LONG TDESocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress &from)
 {
   resetError();
   if (m_sockfd == -1)
@@ -461,7 +461,7 @@ TQT_TQIO_LONG KSocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSoc
   return retval;
 }
 
-TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen)
+TQ_LONG TDESocketDevice::peekBlock(char *data, TQ_ULONG maxlen)
 {
   resetError();
   if (m_sockfd == -1)
@@ -482,7 +482,7 @@ TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from)
+TQ_LONG TDESocketDevice::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from)
 {
   resetError();
   if (m_sockfd == -1)
@@ -503,12 +503,12 @@ TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& fr
   return retval;
 }
 
-TQT_TQIO_LONG KSocketDevice::tqwriteBlock(const char *data, TQT_TQIO_ULONG len)
+TQT_TQIO_LONG TDESocketDevice::tqwriteBlock(const char *data, TQT_TQIO_ULONG len)
 {
-  return tqwriteBlock(data, len, KSocketAddress());
+  return tqwriteBlock(data, len, TDESocketAddress());
 }
 
-TQT_TQIO_LONG KSocketDevice::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to)
+TQT_TQIO_LONG TDESocketDevice::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to)
 {
   resetError();
   if (m_sockfd == -1)
@@ -532,20 +532,20 @@ TQT_TQIO_LONG KSocketDevice::tqwriteBlock(const char *data, TQT_TQIO_ULONG len,
   return retval;
 }
 
-KSocketAddress KSocketDevice::localAddress() const
+TDESocketAddress TDESocketDevice::localAddress() const
 {
   if (m_sockfd == -1)
-    return KSocketAddress();	// not open, empty value
+    return TDESocketAddress();	// not open, empty value
 
   if (d->local.family() != AF_UNSPEC)
     return d->local;
 
   socklen_t len;
-  KSocketAddress localAddress;
+  TDESocketAddress localAddress;
   localAddress.setLength(len = 32);	// arbitrary value
   if (kde_getsockname(m_sockfd, localAddress.address(), &len) == -1)
     // error!
-    return d->local = KSocketAddress();
+    return d->local = TDESocketAddress();
 
 #ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
   len = localAddress.address()->sa_len;
@@ -563,25 +563,25 @@ KSocketAddress KSocketDevice::localAddress() const
   localAddress.setLength(len);
   if (kde_getsockname(m_sockfd, localAddress.address(), &len) == -1)
     // error!
-    return d->local = KSocketAddress();
+    return d->local = TDESocketAddress();
 
   return d->local = localAddress;
 }
 
-KSocketAddress KSocketDevice::peerAddress() const
+TDESocketAddress TDESocketDevice::peerAddress() const
 {
   if (m_sockfd == -1)
-    return KSocketAddress();	// not open, empty value
+    return TDESocketAddress();	// not open, empty value
 
   if (d->peer.family() != AF_UNSPEC)
     return d->peer;
 
   socklen_t len;
-  KSocketAddress peerAddress;
+  TDESocketAddress peerAddress;
   peerAddress.setLength(len = 32);	// arbitrary value
   if (kde_getpeername(m_sockfd, peerAddress.address(), &len) == -1)
     // error!
-    return d->peer = KSocketAddress();
+    return d->peer = TDESocketAddress();
 
 #ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
   len = peerAddress.address()->sa_len;
@@ -599,19 +599,19 @@ KSocketAddress KSocketDevice::peerAddress() const
   peerAddress.setLength(len);
   if (kde_getpeername(m_sockfd, peerAddress.address(), &len) == -1)
     // error!
-    return d->peer = KSocketAddress();
+    return d->peer = TDESocketAddress();
 
   return d->peer = peerAddress;
 }
 
-KSocketAddress KSocketDevice::externalAddress() const
+TDESocketAddress TDESocketDevice::externalAddress() const
 {
   // for normal sockets, the externally visible address is the same
   // as the local address
   return localAddress();
 }
 
-TQSocketNotifier* KSocketDevice::readNotifier() const
+TQSocketNotifier* TDESocketDevice::readNotifier() const
 {
   if (d->input)
     return d->input;
@@ -629,7 +629,7 @@ TQSocketNotifier* KSocketDevice::readNotifier() const
   return d->input = createNotifier(TQSocketNotifier::Read);
 }
 
-TQSocketNotifier* KSocketDevice::writeNotifier() const
+TQSocketNotifier* TDESocketDevice::writeNotifier() const
 {
   if (d->output)
     return d->output;
@@ -647,7 +647,7 @@ TQSocketNotifier* KSocketDevice::writeNotifier() const
   return d->output = createNotifier(TQSocketNotifier::Write);
 }
 
-TQSocketNotifier* KSocketDevice::exceptionNotifier() const
+TQSocketNotifier* TDESocketDevice::exceptionNotifier() const
 {
   if (d->exception)
     return d->exception;
@@ -665,7 +665,7 @@ TQSocketNotifier* KSocketDevice::exceptionNotifier() const
   return d->exception = createNotifier(TQSocketNotifier::Exception);
 }
 
-bool KSocketDevice::poll(bool *input, bool *output, bool *exception,
+bool TDESocketDevice::poll(bool *input, bool *output, bool *exception,
 			 int timeout, bool* timedout)
 {
   if (m_sockfd == -1)
@@ -787,13 +787,13 @@ bool KSocketDevice::poll(bool *input, bool *output, bool *exception,
 #endif
 }
 
-bool KSocketDevice::poll(int timeout, bool *timedout)
+bool TDESocketDevice::poll(int timeout, bool *timedout)
 {
   bool input, output, exception;
   return poll(&input, &output, &exception, timeout, timedout);
 }
 
-TQSocketNotifier* KSocketDevice::createNotifier(TQSocketNotifier::Type type) const
+TQSocketNotifier* TDESocketDevice::createNotifier(TQSocketNotifier::Type type) const
 {
   if (m_sockfd == -1)
     return 0L;
@@ -836,14 +836,14 @@ namespace
   };
 }
 
-static KSocketDeviceFactoryBase* defaultImplFactory;
+static TDESocketDeviceFactoryBase* defaultImplFactory;
 static TQMutex defaultImplFactoryMutex;
-typedef TQMap<int, KSocketDeviceFactoryBase* > factoryMap;
+typedef TQMap<int, TDESocketDeviceFactoryBase* > factoryMap;
 static factoryMap factories;
  
-KSocketDevice* KSocketDevice::createDefault(KSocketBase* parent)
+TDESocketDevice* TDESocketDevice::createDefault(TDESocketBase* parent)
 {
-  KSocketDevice* device = dynamic_cast<KSocketDevice*>(parent);
+  TDESocketDevice* device = dynamic_cast<TDESocketDevice*>(parent);
   if (device != 0L)
     return device;
 
@@ -853,12 +853,12 @@ KSocketDevice* KSocketDevice::createDefault(KSocketBase* parent)
     return defaultImplFactory->create(parent);
 
   // the really default
-  return new KSocketDevice(parent);
+  return new TDESocketDevice(parent);
 }
 
-KSocketDevice* KSocketDevice::createDefault(KSocketBase* parent, int capabilities)
+TDESocketDevice* TDESocketDevice::createDefault(TDESocketBase* parent, int capabilities)
 {
-  KSocketDevice* device = dynamic_cast<KSocketDevice*>(parent);
+  TDESocketDevice* device = dynamic_cast<TDESocketDevice*>(parent);
   if (device != 0L)
     return device;
 
@@ -872,16 +872,16 @@ KSocketDevice* KSocketDevice::createDefault(KSocketBase* parent, int capabilitie
   return 0L;			// no default
 }
 
-KSocketDeviceFactoryBase*
-KSocketDevice::setDefaultImpl(KSocketDeviceFactoryBase* factory)
+TDESocketDeviceFactoryBase*
+TDESocketDevice::setDefaultImpl(TDESocketDeviceFactoryBase* factory)
 {
   TQMutexLocker locker(&defaultImplFactoryMutex);
-  KSocketDeviceFactoryBase* old = defaultImplFactory;
+  TDESocketDeviceFactoryBase* old = defaultImplFactory;
   defaultImplFactory = factory;
   return old;
 }
 
-void KSocketDevice::addNewImpl(KSocketDeviceFactoryBase* factory, int capabilities)
+void TDESocketDevice::addNewImpl(TDESocketDeviceFactoryBase* factory, int capabilities)
 {
   TQMutexLocker locker(&defaultImplFactoryMutex);
   if (factories.contains(capabilities))
diff --git a/tdecore/network/tdesocketdevice.h b/tdecore/network/tdesocketdevice.h
index 10856716d..52fe18709 100644
--- a/tdecore/network/tdesocketdevice.h
+++ b/tdecore/network/tdesocketdevice.h
@@ -30,32 +30,32 @@
 
 namespace KNetwork {
 
-class KSocketDevice;
-class KSocketDeviceFactoryBase;
+class TDESocketDevice;
+class TDESocketDeviceFactoryBase;
 
-class KSocketDevicePrivate;
-/** @class KSocketDevice tdesocketdevice.h tdesocketdevice.h
+class TDESocketDevicePrivate;
+/** @class TDESocketDevice tdesocketdevice.h tdesocketdevice.h
  *  @brief Low-level socket functionality.
  *
  * This class provides low-level socket functionality. 
  *
  * Most users will prefer "cooked" interfaces like those of @ref KStreamSocket or
- * @ref KServerSocket.
+ * @ref TDEServerSocket.
  *
  * Descended classes from this one provide some other kinds of socket functionality,
  * like proxying or specific socket types.
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class TDECORE_EXPORT KSocketDevice: public KActiveSocketBase, public KPassiveSocketBase
+class TDECORE_EXPORT TDESocketDevice: public KActiveSocketBase, public KPassiveSocketBase
 {
 public:
   /**
    * Capabilities for the socket implementation.
    *
-   * KSocketDevice-derived classes can implement certain capabilities that are not
+   * TDESocketDevice-derived classes can implement certain capabilities that are not
    * available in the default class. These capabilities are described by these flags.
-   * The default KSocketDevice class has none of these capabilities.
+   * The default TDESocketDevice class has none of these capabilities.
    *
    * For the negative capabilities (inabilities, the CanNot* forms), when a capability 
    * is not present, the implementation will default to the original behaviour.
@@ -101,7 +101,7 @@ public:
    * The parameter is used to specify which socket this object is used as
    * a device for.
    */
-  explicit KSocketDevice(const KSocketBase* = 0L);
+  explicit TDESocketDevice(const TDESocketBase* = 0L);
 
   /**
    * Constructs a new object around an already-open socket.
@@ -109,12 +109,12 @@ public:
    * Note: you should write programs that create sockets through
    * the classes whenever possible.
    */
-  explicit KSocketDevice(int fd);
+  explicit TDESocketDevice(int fd);
 
   /**
    * Destructor. This closes the socket if it's open.
    */
-  virtual ~KSocketDevice();
+  virtual ~TDESocketDevice();
 
   /**
    * Returns the file descriptor for this socket.
@@ -186,9 +186,9 @@ public:
 
   /**
    * Accepts a new incoming connection.
-   * Note: this function returns a socket of type KSocketDevice.
+   * Note: this function returns a socket of type TDESocketDevice.
    */
-  virtual KSocketDevice* accept();
+  virtual TDESocketDevice* accept();
 
   /**
    * Disconnects this socket.
@@ -221,7 +221,7 @@ public:
   /**
    * Reads data and the source address from this socket.
    */
-  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from);
+  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from);
 
   /**
    * Peeks data in the socket.
@@ -231,7 +231,7 @@ public:
   /**
    * Peeks the data in the socket and the source address.
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from);
+  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from);
 
   /**
    * Writes data to the socket.
@@ -241,18 +241,18 @@ public:
   /**
    * Writes the given data to the given destination address.
    */
-  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to);
+  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to);
 
   /**
    * Returns this socket's local address.
    */
-  virtual KSocketAddress localAddress() const;
+  virtual TDESocketAddress localAddress() const;
 
   /**
    * Returns this socket's peer address. If this implementation does proxying
    * of some sort, this is the real external address, not the proxy's address.
    */
-  virtual KSocketAddress peerAddress() const;
+  virtual TDESocketAddress peerAddress() const;
 
   /**
    * Returns this socket's externally visible local address.
@@ -265,10 +265,10 @@ public:
    * addresses different from the local socket values. The default implementation
    * returns the same value as @ref localAddress.
    *
-   * @note This function may return an empty KSocketAddress. In that case, the
+   * @note This function may return an empty TDESocketAddress. In that case, the
    *       externally visible address could/can not be determined.
    */
-  virtual KSocketAddress externalAddress() const;
+  virtual TDESocketAddress externalAddress() const;
 
   /**
    * Returns a socket notifier for input on this socket.
@@ -337,7 +337,7 @@ protected:
    *
    * @param parent	the parent, if any
    */
-  KSocketDevice(bool, const KSocketBase* parent = 0L);
+  TDESocketDevice(bool, const TDESocketBase* parent = 0L);
 
   /**
    * Creates a socket notifier of the given type.
@@ -358,16 +358,16 @@ protected:
 
 public:
   /**
-   * Creates a new default KSocketDevice object given
+   * Creates a new default TDESocketDevice object given
    * the parent object.
    *
    * The capabilities flag indicates the desired capabilities the object being
    * created should possess. Those capabilities are not guaranteed: if no factory
    * can provide such an object, a default object will be created.
    *
-   * @param parent	the KSocketBase parent
+   * @param parent	the TDESocketBase parent
    */
-  static KSocketDevice* createDefault(KSocketBase* parent);
+  static TDESocketDevice* createDefault(TDESocketBase* parent);
 
   /**
    * @overload
@@ -377,40 +377,40 @@ public:
    * @param parent		the parent
    * @param capabilities	the requested capabilities
    */
-  static KSocketDevice* createDefault(KSocketBase* parent, int capabilities);
+  static TDESocketDevice* createDefault(TDESocketBase* parent, int capabilities);
 
   /**
-   * Sets the default KSocketDevice implementation to use and
+   * Sets the default TDESocketDevice implementation to use and
    * return the old factory.
    *
    * @param factory	the factory object for the implementation
    */
-  static KSocketDeviceFactoryBase* setDefaultImpl(KSocketDeviceFactoryBase* factory);
+  static TDESocketDeviceFactoryBase* setDefaultImpl(TDESocketDeviceFactoryBase* factory);
 
   /**
-   * Adds a factory of KSocketDevice objects to the list, along with its
+   * Adds a factory of TDESocketDevice objects to the list, along with its
    * capabilities flag.
    */
-  static void addNewImpl(KSocketDeviceFactoryBase* factory, int capabilities);
+  static void addNewImpl(TDESocketDeviceFactoryBase* factory, int capabilities);
 
 private:
-  KSocketDevice(const KSocketDevice&);
-  KSocketDevice& operator=(const KSocketDevice&);
+  TDESocketDevice(const TDESocketDevice&);
+  TDESocketDevice& operator=(const TDESocketDevice&);
 
-  KSocketDevicePrivate *d;
+  TDESocketDevicePrivate *d;
 };
 
 /** @internal
  * This class provides functionality for creating and registering
  *  socket implementations.
  */
-class KSocketDeviceFactoryBase
+class TDESocketDeviceFactoryBase
 {
 public:
-  KSocketDeviceFactoryBase() {}
-  virtual ~KSocketDeviceFactoryBase() {}
+  TDESocketDeviceFactoryBase() {}
+  virtual ~TDESocketDeviceFactoryBase() {}
 
-  virtual KSocketDevice* create(KSocketBase*) const = 0;
+  virtual TDESocketDevice* create(TDESocketBase*) const = 0;
 };
 
 /**
@@ -418,13 +418,13 @@ public:
  * socket implementations.
  */
 template<class Impl>
-class KSocketDeviceFactory: public KSocketDeviceFactoryBase
+class TDESocketDeviceFactory: public TDESocketDeviceFactoryBase
 {
 public:
-  KSocketDeviceFactory() {}
-  virtual ~KSocketDeviceFactory() {}
+  TDESocketDeviceFactory() {}
+  virtual ~TDESocketDeviceFactory() {}
 
-  virtual KSocketDevice* create(KSocketBase* parent) const
+  virtual TDESocketDevice* create(TDESocketBase* parent) const
   { return new Impl(parent); }
 };
 
diff --git a/tdecore/networkbackends/network-manager/network-manager.cpp b/tdecore/networkbackends/network-manager/network-manager.cpp
index 7c253ee34..206e75737 100644
--- a/tdecore/networkbackends/network-manager/network-manager.cpp
+++ b/tdecore/networkbackends/network-manager/network-manager.cpp
@@ -4828,7 +4828,7 @@ TDENetworkVPNTypeList TDENetworkConnectionManager_BackendNM::availableVPNTypes()
 		// read in all available Services
 		for (TQStringList::Iterator i = services.begin (); i != services.end (); ++i) {
 			TQString service = NM_PLUGIN_SERVICE_DIR + TQString ("/") + *i;
-			KConfig* kconfig = new KConfig (service, true, true, "config");
+			TDEConfig* kconfig = new TDEConfig (service, true, true, "config");
 			kconfig->setGroup ("VPN Connection");
 
 			TQString serviceName = kconfig->readEntry("name", TQString());
diff --git a/tdecore/tdehardwaredevices.cpp b/tdecore/tdehardwaredevices.cpp
index 372f779c1..bd5ee6ec6 100644
--- a/tdecore/tdehardwaredevices.cpp
+++ b/tdecore/tdehardwaredevices.cpp
@@ -1217,7 +1217,7 @@ bool TDERootSystemDevice::canPowerOff() {
 	// Can we power down this system?
 	// This should probably be checked via DCOP and therefore interface with KDM
 
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->reparseConfiguration(); // config may have changed in the KControl module
 	
 	config->setGroup("General" );
@@ -2766,7 +2766,7 @@ TDEDiskDeviceType::TDEDiskDeviceType classifyDiskType(udev_device* dev, const TQ
 
 	// KStandardDirs::kde_default
 
-typedef TQMap<TQString, TQString> KConfigMap;
+typedef TQMap<TQString, TQString> TDEConfigMap;
 
 TQString readUdevAttribute(udev_device* dev, TQString attr) {
 	return TQString(udev_device_get_property_value(dev, attr.ascii()));
@@ -3070,7 +3070,7 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDeviceByExternalRules(udev_
 		TQString hardware_info_directory;
 	
 		// Scan the hardware_info_directory for configuration files
-		// For each one, open it with KConfig() and apply its rules to classify the device
+		// For each one, open it with TDEConfig() and apply its rules to classify the device
 		// FIXME
 		// Should this also scan up to <n> subdirectories for the files?  That feature might end up being too expensive...
 
@@ -3092,10 +3092,10 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDeviceByExternalRules(udev_
 						bool match = true;
 		
 						// Open the rules file
-						KConfig rulesFile(fi->absFilePath(), true, false);
+						TDEConfig rulesFile(fi->absFilePath(), true, false);
 						rulesFile.setGroup("Conditions");
-						KConfigMap conditionmap = rulesFile.entryMap("Conditions");
-						KConfigMap::Iterator cndit;
+						TDEConfigMap conditionmap = rulesFile.entryMap("Conditions");
+						TDEConfigMap::Iterator cndit;
 						for (cndit = conditionmap.begin(); cndit != conditionmap.end(); ++cndit) {
 							TQStringList conditionList = TQStringList::split(',', cndit.data(), false);
 							bool atleastonematch = false;
diff --git a/tdecore/tests/kconfigtest.cpp b/tdecore/tests/kconfigtest.cpp
index 384a328cc..e4768119c 100644
--- a/tdecore/tests/kconfigtest.cpp
+++ b/tdecore/tests/kconfigtest.cpp
@@ -22,7 +22,7 @@
 
 #include <kconfig.h>
 
-class KConfigTest : public KUnitTest::Tester
+class TDEConfigTest : public KUnitTest::Tester
 {
 public:
     void allTests();
@@ -31,8 +31,8 @@ private:
     void revertEntries();
 };
 
-KUNITTEST_MODULE( kunittest_kconfig, "KConfigTest" )
-KUNITTEST_MODULE_REGISTER_TESTER( KConfigTest )
+KUNITTEST_MODULE( kunittest_kconfig, "TDEConfigTest" )
+KUNITTEST_MODULE_REGISTER_TESTER( TDEConfigTest )
 
 // test data
 #define BOOLENTRY1 true
@@ -50,9 +50,9 @@ KUNITTEST_MODULE_REGISTER_TESTER( KConfigTest )
 #define DATETIMEENTRY TQDateTime( TQDate( 2002, 06, 23 ), TQTime( 12, 55, 40 ) )
 #define STRINGLISTENTRY TQStringList( "Hello," )
 
-void KConfigTest::writeConfigFile()
+void TDEConfigTest::writeConfigFile()
 {
-  KConfig sc( "kconfigtest" );
+  TDEConfig sc( "kconfigtest" );
 
   sc.setGroup("AAA");
   sc.writeEntry("stringEntry1", STRINGENTRY1, true, true);
@@ -86,10 +86,10 @@ void KConfigTest::writeConfigFile()
 }
 
 // ### TODO: call this, and test the state of things afterwards
-void KConfigTest::revertEntries()
+void TDEConfigTest::revertEntries()
 {
   tqWarning("Reverting entries");
-  KConfig sc( "kconfigtest" );
+  TDEConfig sc( "kconfigtest" );
 
   sc.setGroup("Hello");
   sc.revertToDefault( "boolEntry1");
@@ -105,13 +105,13 @@ void KConfigTest::revertEntries()
   sc.sync();
 }
 
-void KConfigTest::allTests()
+void TDEConfigTest::allTests()
 {
   writeConfigFile();
 
-  KConfig sc2( "kconfigtest" );
+  TDEConfig sc2( "kconfigtest" );
 
-  KConfigGroup sc3( &sc2, "AAA");
+  TDEConfigGroup sc3( &sc2, "AAA");
   bool bImmutable = sc3.entryIsImmutable("stringEntry1");
 
   CHECK( bImmutable, false );
diff --git a/tdecore/tests/kconfigtestgui.cpp b/tdecore/tests/kconfigtestgui.cpp
index 6f8c6e0e0..776082bfb 100644
--- a/tdecore/tests/kconfigtestgui.cpp
+++ b/tdecore/tests/kconfigtestgui.cpp
@@ -23,7 +23,7 @@
 //
 // configtest.cpp: libKDEcore example
 //
-// demonstrates use of KConfig class
+// demonstrates use of TDEConfig class
 //
 // adapted from Qt widgets demo
 
@@ -56,10 +56,10 @@
 #endif
 
 //
-// Construct the KConfigTestView with buttons
+// Construct the TDEConfigTestView with buttons
 //
 
-KConfigTestView::KConfigTestView( TQWidget *parent, const char *name )
+TDEConfigTestView::TDEConfigTestView( TQWidget *parent, const char *name )
     : TQDialog( parent, name ),
       pConfig( 0L ),
       pFile( 0L ),
@@ -67,7 +67,7 @@ KConfigTestView::KConfigTestView( TQWidget *parent, const char *name )
 {
   // Set the window caption/title
 
-  setCaption( "KConfig test" );
+  setCaption( "TDEConfig test" );
 
   // Label and edit for the app config file
   pAppFileLabel = new TQLabel( this, "appconfiglabel" );
@@ -123,18 +123,18 @@ KConfigTestView::KConfigTestView( TQWidget *parent, const char *name )
   pQuitButton->setGeometry( 340, 60, 60, 60 );
   connect( pQuitButton, TQT_SIGNAL(clicked()), tqApp, TQT_SLOT(quit()) );
 
-  // create a default KConfig object in order to be able to start right away
-  pConfig = new KConfig( TQString::null );
+  // create a default TDEConfig object in order to be able to start right away
+  pConfig = new TDEConfig( TQString::null );
 }
 
-KConfigTestView::~KConfigTestView()
+TDEConfigTestView::~TDEConfigTestView()
 {
     delete pConfig;
     delete pFile;
     delete pStream;
 }
 
-void KConfigTestView::appConfigEditReturnPressed()
+void TDEConfigTestView::appConfigEditReturnPressed()
 {
     // if there already was a config object, delete it and its associated data
     delete pConfig;
@@ -146,12 +146,12 @@ void KConfigTestView::appConfigEditReturnPressed()
 
   // create a new config object
   if( !pAppFileEdit->text().isEmpty() )
-	  pConfig = new KConfig( pAppFileEdit->text() );
+	  pConfig = new TDEConfig( pAppFileEdit->text() );
 
   pInfoLabel2->setText( "New config object created." );
 }
 
-void KConfigTestView::groupEditReturnPressed()
+void TDEConfigTestView::groupEditReturnPressed()
 {
   pConfig->setGroup( pGroupEdit->text() );
   // according to the Qt doc, this is begging for trouble, but for a
@@ -162,7 +162,7 @@ void KConfigTestView::groupEditReturnPressed()
   pInfoLabel2->setText( aText );
 }
 
-void KConfigTestView::keyEditReturnPressed()
+void TDEConfigTestView::keyEditReturnPressed()
 {
   TQString aValue = pConfig->readEntry( pKeyEdit->text() );
   // just checking aValue.isNull() would be easier here, but this is
@@ -181,7 +181,7 @@ void KConfigTestView::keyEditReturnPressed()
     }
 }
 
-void KConfigTestView::writeButtonClicked()
+void TDEConfigTestView::writeButtonClicked()
 {
   pConfig->writeEntry( pKeyEdit->text(), TQString( pValueEdit->text() ) );
   pInfoLabel2->setText( "Entry written" );
@@ -194,7 +194,7 @@ int main( int argc, char **argv )
 {
   TDEApplication a( argc, argv, "bla" );
 
-  KConfigTestView *w = new KConfigTestView();
+  TDEConfigTestView *w = new TDEConfigTestView();
   a.setMainWidget( w );
   return w->exec();
 }
diff --git a/tdecore/tests/kconfigtestgui.h b/tdecore/tests/kconfigtestgui.h
index 7655c8142..f5bbfd659 100644
--- a/tdecore/tests/kconfigtestgui.h
+++ b/tdecore/tests/kconfigtestgui.h
@@ -36,15 +36,15 @@
 #include <kconfig.h>
 
 //
-// KConfigTestView contains lots of Qt widgets.
+// TDEConfigTestView contains lots of Qt widgets.
 //
 
-class KConfigTestView : public TQDialog
+class TDEConfigTestView : public TQDialog
 {
   Q_OBJECT
 public:
-  KConfigTestView( TQWidget *parent=0, const char *name=0 );
-  ~KConfigTestView();
+  TDEConfigTestView( TQWidget *parent=0, const char *name=0 );
+  ~TDEConfigTestView();
 
 private slots:
   void appConfigEditReturnPressed();
@@ -64,7 +64,7 @@ private:
   TQLabel* pInfoLabel1, *pInfoLabel2;
   TQPushButton* pQuitButton;
 
-  KConfig* pConfig;
+  TDEConfig* pConfig;
   TQFile* pFile;
   TQTextStream* pStream;
 };
diff --git a/tdecore/tests/kresolvertest.cpp b/tdecore/tests/kresolvertest.cpp
index c5640dc09..6e1a3080f 100644
--- a/tdecore/tests/kresolvertest.cpp
+++ b/tdecore/tests/kresolvertest.cpp
@@ -213,7 +213,7 @@ bool testKernel()
 
   printf("succeeded\n");
 
-  KSocketAddress *ksin = KExtendedSocket::localAddress(sock);
+  TDESocketAddress *ksin = KExtendedSocket::localAddress(sock);
   if (ksin != NULL)
     {
       printf("\tWe got socket %s\n", (const char*)ksin->pretty().latin1());
diff --git a/tdecore/tests/ksocktest.cpp b/tdecore/tests/ksocktest.cpp
index 48420acfc..e038cbd2c 100644
--- a/tdecore/tests/ksocktest.cpp
+++ b/tdecore/tests/ksocktest.cpp
@@ -100,7 +100,7 @@ main(int argc, char *argv[])
 
    printf("FD %d\n", sock2->fd());
 
-   KSocketAddress* addr = KExtendedSocket::peerAddress( sock2->fd() );
+   TDESocketAddress* addr = KExtendedSocket::peerAddress( sock2->fd() );
    check( "peerAddress:", addr->nodeName().latin1(), "213.203.58.36" );
 
    check( "isEqual:", addr->isEqual(KInetSocketAddress("213.203.58.36", 80)) ? "TRUE" : "FALSE", "TRUE");
diff --git a/tdecore/tests/kstddirstest.cpp b/tdecore/tests/kstddirstest.cpp
index 973402ffc..fa7191cce 100644
--- a/tdecore/tests/kstddirstest.cpp
+++ b/tdecore/tests/kstddirstest.cpp
@@ -8,7 +8,7 @@ int main(int argc, char **argv)
 {
   TDEApplication a(argc, argv, "whatever", false);
   KStandardDirs t;
-  KConfig config; // to add custom entries - a bit tricky :/
+  TDEConfig config; // to add custom entries - a bit tricky :/
 
   TQStringList list;
   TQString s;