81 files changed, 107 insertions, 108 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 680ae05d..93f62f04 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,7 +80,7 @@ option( BUILD_KFAXVIEW "Build kfaxview" ${BUILD_ALL} )
 option( BUILD_TDEFILE_PLUGINS "Build tdefile-plugins" ${BUILD_ALL} )
 option( BUILD_KGAMMA "Build kgamma" ${BUILD_ALL} )
 option( BUILD_KGHOSTVIEW "Build kghostview" ${BUILD_ALL} )
-option( BUILD_KICONEDIT "Build kiconedit" ${BUILD_ALL} )
+option( BUILD_TDEICONEDIT "Build tdeiconedit" ${BUILD_ALL} )
 option( BUILD_KMRML "Build kmrml" ${BUILD_ALL} )
 option( BUILD_KOLOURPAINT "Build kolourpaint" ${BUILD_ALL} )
 option( BUILD_KOOKA "Build kooka" ${BUILD_ALL} )
@@ -133,7 +133,7 @@ tde_conditional_add_subdirectory( BUILD_KFAXVIEW kfaxview )
 tde_conditional_add_subdirectory( BUILD_TDEFILE_PLUGINS tdefile-plugins )
 tde_conditional_add_subdirectory( BUILD_KGAMMA kgamma )
 tde_conditional_add_subdirectory( BUILD_KGHOSTVIEW kghostview )
-tde_conditional_add_subdirectory( BUILD_KICONEDIT kiconedit )
+tde_conditional_add_subdirectory( BUILD_TDEICONEDIT tdeiconedit )
 tde_conditional_add_subdirectory( BUILD_KMRML kmrml )
 tde_conditional_add_subdirectory( BUILD_KOLOURPAINT kolourpaint )
 tde_conditional_add_subdirectory( BUILD_KOOKA kooka )
diff --git a/README b/README
index d27e6b1d..38df853d 100644
--- a/README
+++ b/README
@@ -38,7 +38,7 @@ tdegraphics is a collection of graphic oriented applications:
 * kghostview
     Program (and embeddable KPart) to display *.pdf and *.ps
 
-* kiconedit
+* tdeiconedit
     An icon editor.
 
 * kmrml
diff --git a/doc/kiconedit/CMakeLists.txt b/doc/tdeiconedit/CMakeLists.txt
index 3322b562..198859a5 100644
--- a/doc/kiconedit/CMakeLists.txt
+++ b/doc/tdeiconedit/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION kiconedit )
+tde_create_handbook( DESTINATION tdeiconedit )
diff --git a/doc/kiconedit/Makefile.am b/doc/tdeiconedit/Makefile.am
index 085981d9..085981d9 100644
--- a/doc/kiconedit/Makefile.am
+++ b/doc/tdeiconedit/Makefile.am
diff --git a/doc/kiconedit/index.docbook b/doc/tdeiconedit/index.docbook
index 16f41f4c..9dd1ad61 100644
--- a/doc/kiconedit/index.docbook
+++ b/doc/tdeiconedit/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&kiconedit;">
+  <!ENTITY kappname "&tdeiconedit;">
   <!ENTITY package "tdegraphics">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
   <!ENTITY % addindex "IGNORE">
@@ -8,7 +8,7 @@
 
 <book lang="&language;">
 <bookinfo>
-<title>The &kiconedit; Manual</title>
+<title>The &tdeiconedit; Manual</title>
 <authorgroup>
 <author>
 <firstname>Thomas</firstname>
@@ -40,7 +40,7 @@
 
 <abstract>
 <para>
-&kiconedit; is designed to help create icons for &kde; using the
+&tdeiconedit; is designed to help create icons for &kde; using the
 standard icon palette.
 </para>
 </abstract>
@@ -61,7 +61,7 @@ standard icon palette.
 &Thomas.Tanghus.mail;</attribution>
 
 <para>
-&kiconedit; is designed to help create icons for &kde; using the
+&tdeiconedit; is designed to help create icons for &kde; using the
 standard icon palette.
 </para>
 
@@ -501,7 +501,7 @@ from.</action>
 </term>
 <listitem>
 <para>
-<action>Close</action> &kiconedit;.
+<action>Close</action> &tdeiconedit;.
 </para>
 </listitem>
 </varlistentry>
@@ -930,7 +930,7 @@ Draw a line.
 <term><menuchoice><guimenu>Settings</guimenu>
 <guimenuitem>Configure Shortcuts...</guimenuitem>
 </menuchoice></term>
-<listitem><para>Opens a dialog where you can customize &kiconedit;'s
+<listitem><para>Opens a dialog where you can customize &tdeiconedit;'s
 keyboard shortcuts.</para></listitem>
 </varlistentry>
 
@@ -938,12 +938,12 @@ keyboard shortcuts.</para></listitem>
 <term>
 <menuchoice>
 <guimenu>Settings</guimenu>
-<guimenuitem>Configure &kiconedit;...</guimenuitem>
+<guimenuitem>Configure &tdeiconedit;...</guimenuitem>
 </menuchoice>
 </term>
 <listitem>
 <para>
-Opens the &kiconedit; <link linkend="configuration">configuration
+Opens the &tdeiconedit; <link linkend="configuration">configuration
 dialog</link> configuration dialog, described separately.
 </para>
 </listitem>
@@ -966,17 +966,17 @@ dialog</link> configuration dialog, described separately.
 <title>Configuration</title>
 
 <sect1>
-<title>Configuring &kiconedit;</title>
+<title>Configuring &tdeiconedit;</title>
 <para>Selecting the <menuchoice><guimenu>Settings</guimenu>
-<guimenuitem>Configure &kiconedit;...</guimenuitem></menuchoice> menu item will
+<guimenuitem>Configure &tdeiconedit;...</guimenuitem></menuchoice> menu item will
 open a configuration dialog with the tree tabs <guilabel>Icon Templates</guilabel>,
 <guilabel>Background</guilabel> and <guilabel>Icon Grid</guilabel>.</para>
 
 <screenshot>
-<screeninfo>&kiconedit; configuration dialog</screeninfo>
+<screeninfo>&tdeiconedit; configuration dialog</screeninfo>
 <mediaobject>
-<imageobject><imagedata fileref="kiconedit-configuration.png" format="PNG"/></imageobject>
-<textobject><phrase>&kiconedit; configuration dialog</phrase></textobject>
+<imageobject><imagedata fileref="tdeiconedit-configuration.png" format="PNG"/></imageobject>
+<textobject><phrase>&tdeiconedit; configuration dialog</phrase></textobject>
 </mediaobject>
 </screenshot>
 
@@ -1008,7 +1008,7 @@ and <guilabel>Color 2:</guilabel> of the checkerboard.</para>
 <title>Credits and Licenses</title>
 
 <para>
-&kiconedit;
+&tdeiconedit;
 </para>
 
 <para>
@@ -1046,7 +1046,7 @@ XMLGUI, Lots of fixes and cleanup</para></listitem>
 <title>Installation</title>
 
 <sect1 id="how-to-obtain-the-icon-editor">
-<title>How to obtain &kiconedit;</title>
+<title>How to obtain &tdeiconedit;</title>
 
 &install.intro.documentation;
 
diff --git a/doc/kiconedit/kiconedit-configuration.png b/doc/tdeiconedit/tdeiconedit-configuration.png
index 100a68cb..100a68cb 100644
--- a/doc/kiconedit/kiconedit-configuration.png
+++ b/doc/tdeiconedit/tdeiconedit-configuration.png
diff --git a/kiconedit/Makefile.am b/kiconedit/Makefile.am
deleted file mode 100644
index 2ba3505b..00000000
--- a/kiconedit/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-INCLUDES = $(all_includes)
-SUBDIRS = pics
-
-bin_PROGRAMS = kiconedit
-
-kiconedit_SOURCES = utils.cpp main.cpp kiconedit.cpp kicongrid.cpp \
-    kiconcolors.cpp kcolorgrid.cpp palettetoolbar.cpp\
-    kicon.cpp kresize.cpp knew.cpp properties.cpp \
-    kiconeditslots.cpp kiconconfig.cpp 
-
-kiconedit_METASOURCES = AUTO
-
-# the library search path. 
-kiconedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-kiconedit_LDADD = $(LIB_TDEFILE) -ltdeprint
-
-DISTCLEANFILES = *~ .deps/* .libs/*
-
-rcdir = $(kde_datadir)/kiconedit
-rc_DATA = kiconeditui.rc
-
-xdg_apps_DATA = kiconedit.desktop
-
-messages: rc.cpp
-	$(XGETTEXT) rc.cpp $(kiconedit_SOURCES) -o $(podir)/kiconedit.pot
-
diff --git a/kiconedit/AUTHORS b/tdeiconedit/AUTHORS
index dd2047ae..dd2047ae 100644
--- a/kiconedit/AUTHORS
+++ b/tdeiconedit/AUTHORS
diff --git a/kiconedit/CMakeLists.txt b/tdeiconedit/CMakeLists.txt
index 285760ce..4faa13c5 100644
--- a/kiconedit/CMakeLists.txt
+++ b/tdeiconedit/CMakeLists.txt
@@ -25,18 +25,18 @@ link_directories(
 
 #### other data #################################
 
-install( FILES kiconedit.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES kiconeditui.rc DESTINATION ${DATA_INSTALL_DIR}/kiconedit )
+install( FILES tdeiconedit.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES tdeiconeditui.rc DESTINATION ${DATA_INSTALL_DIR}/tdeiconedit )
 
 
-#### kiconedit (executable) #####################
+#### tdeiconedit (executable) #####################
 
-tde_add_executable( kiconedit AUTOMOC
+tde_add_executable( tdeiconedit AUTOMOC
   SOURCES
-    utils.cpp main.cpp kiconedit.cpp kicongrid.cpp
-    kiconcolors.cpp kcolorgrid.cpp palettetoolbar.cpp
-    kicon.cpp kresize.cpp knew.cpp properties.cpp
-    kiconeditslots.cpp kiconconfig.cpp
+    utils.cpp main.cpp tdeiconedit.cpp tdeicongrid.cpp
+    tdeiconcolors.cpp kcolorgrid.cpp palettetoolbar.cpp
+    tdeicon.cpp kresize.cpp knew.cpp properties.cpp
+    tdeiconeditslots.cpp tdeiconconfig.cpp
   LINK tdeio-shared tdeprint-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/tdeiconedit/Makefile.am b/tdeiconedit/Makefile.am
new file mode 100644
index 00000000..2fd37a01
--- /dev/null
+++ b/tdeiconedit/Makefile.am
@@ -0,0 +1,26 @@
+INCLUDES = $(all_includes)
+SUBDIRS = pics
+
+bin_PROGRAMS = tdeiconedit
+
+tdeiconedit_SOURCES = utils.cpp main.cpp tdeiconedit.cpp tdeicongrid.cpp \
+    tdeiconcolors.cpp kcolorgrid.cpp palettetoolbar.cpp\
+    tdeicon.cpp kresize.cpp knew.cpp properties.cpp \
+    tdeiconeditslots.cpp tdeiconconfig.cpp 
+
+tdeiconedit_METASOURCES = AUTO
+
+# the library search path. 
+tdeiconedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdeiconedit_LDADD = $(LIB_TDEFILE) -ltdeprint
+
+DISTCLEANFILES = *~ .deps/* .libs/*
+
+rcdir = $(kde_datadir)/tdeiconedit
+rc_DATA = tdeiconeditui.rc
+
+xdg_apps_DATA = tdeiconedit.desktop
+
+messages: rc.cpp
+	$(XGETTEXT) rc.cpp $(tdeiconedit_SOURCES) -o $(podir)/tdeiconedit.pot
+
diff --git a/kiconedit/NEWS b/tdeiconedit/NEWS
index 5f5b23fe..5f5b23fe 100644
--- a/kiconedit/NEWS
+++ b/tdeiconedit/NEWS
diff --git a/kiconedit/kcolorgrid.cpp b/tdeiconedit/kcolorgrid.cpp
index 65d766c9..131d5a9f 100644
--- a/kiconedit/kcolorgrid.cpp
+++ b/tdeiconedit/kcolorgrid.cpp
@@ -1,5 +1,5 @@
 /*
-    kiconedit - a small graphics drawing program for creating KDE icons
+    tdeiconedit - a small graphics drawing program for creating KDE icons
     Copyright (C) 1998  Thomas Tanghus (tanghus@kde.org)
 
     This program is free software; you can redistribute it and/or
diff --git a/kiconedit/kcolorgrid.h b/tdeiconedit/kcolorgrid.h
index 15c69bc6..a116f74b 100644
--- a/kiconedit/kcolorgrid.h
+++ b/tdeiconedit/kcolorgrid.h
@@ -1,5 +1,5 @@
 /*
-    kiconedit - a small graphics drawing program for creating KDE icons
+    tdeiconedit - a small graphics drawing program for creating KDE icons
     Copyright (C) 1998  Thomas Tanghus (tanghus@kde.org)
 
     This program is free software; you can redistribute it and/or
diff --git a/kiconedit/knew.cpp b/tdeiconedit/knew.cpp
index 2536816f..2536816f 100644
--- a/kiconedit/knew.cpp
+++ b/tdeiconedit/knew.cpp
diff --git a/kiconedit/knew.h b/tdeiconedit/knew.h
index faae9684..faae9684 100644
--- a/kiconedit/knew.h
+++ b/tdeiconedit/knew.h
diff --git a/kiconedit/kresize.cpp b/tdeiconedit/kresize.cpp
index b7007238..b7007238 100644
--- a/kiconedit/kresize.cpp
+++ b/tdeiconedit/kresize.cpp
diff --git a/kiconedit/kresize.h b/tdeiconedit/kresize.h
index fcfb18c3..fcfb18c3 100644
--- a/kiconedit/kresize.h
+++ b/tdeiconedit/kresize.h
diff --git a/kiconedit/main.cpp b/tdeiconedit/main.cpp
index a9739af8..5b28bcd8 100644
--- a/kiconedit/main.cpp
+++ b/tdeiconedit/main.cpp
@@ -27,7 +27,7 @@
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 
-#include "kiconedit.h"
+#include "tdeiconedit.h"
 #include "config.h"
 #include "properties.h"
 
@@ -42,7 +42,7 @@ static TDECmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-  TDEAboutData aboutData( "kiconedit", I18N_NOOP("TDEIconEdit"),
+  TDEAboutData aboutData( "tdeiconedit", I18N_NOOP("TDEIconEdit"),
     VERSION, description, TDEAboutData::License_GPL,
     "(c) 1998, Thomas Tanghus");
 
@@ -70,7 +70,7 @@ int main(int argc, char **argv)
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     for(int i = 0; i < args->count(); i++)
     {
-        TDEIconEdit *ki = new TDEIconEdit(args->url(i), "kiconedit");
+        TDEIconEdit *ki = new TDEIconEdit(args->url(i), "tdeiconedit");
         TQ_CHECK_PTR(ki);
     }
 
diff --git a/kiconedit/palettetoolbar.cpp b/tdeiconedit/palettetoolbar.cpp
index 0e3520db..5e61cb48 100644
--- a/kiconedit/palettetoolbar.cpp
+++ b/tdeiconedit/palettetoolbar.cpp
@@ -1,5 +1,5 @@
 /*
-    kiconedit - a small graphics drawing program for the KDE
+    tdeiconedit - a small graphics drawing program for the KDE
     Copyright ( C ) 1998  Thomas Tanghus (  tanghus@kde.org )
     Copyright ( C ) 2002  Nadeem Hasan (  nhasan@kde.org )
 
@@ -27,7 +27,7 @@
 #include <tdelocale.h>
 #include <kdebug.h>
 
-#include "kiconcolors.h"
+#include "tdeiconcolors.h"
 #include "palettetoolbar.h"
 
 PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name )
diff --git a/kiconedit/palettetoolbar.h b/tdeiconedit/palettetoolbar.h
index d9a60b40..3945331a 100644
--- a/kiconedit/palettetoolbar.h
+++ b/tdeiconedit/palettetoolbar.h
@@ -1,5 +1,5 @@
 /*
-    kiconedit - a small graphics drawing program for the KDE
+    tdeiconedit - a small graphics drawing program for the KDE
     Copyright ( C ) 1998  Thomas Tanghus ( tanghus@kde.org )
     Copyright ( C ) 2002  Nadeem Hasan ( nhasan@kde.org )
 
diff --git a/kiconedit/pics/CMakeLists.txt b/tdeiconedit/pics/CMakeLists.txt
index 0f0977fb..e4d1a99a 100644
--- a/kiconedit/pics/CMakeLists.txt
+++ b/tdeiconedit/pics/CMakeLists.txt
@@ -12,4 +12,4 @@
 add_subdirectory( icons )
 add_subdirectory( toolbar )
 
-tde_install_icons( kiconedit )
+tde_install_icons( tdeiconedit )
diff --git a/kiconedit/pics/Makefile.am b/tdeiconedit/pics/Makefile.am
index 1a0b167e..d1b91e7d 100644
--- a/kiconedit/pics/Makefile.am
+++ b/tdeiconedit/pics/Makefile.am
@@ -1,5 +1,5 @@
 
 SUBDIRS = icons toolbar 
 
-KDE_ICON = kiconedit
+KDE_ICON = tdeiconedit
 
diff --git a/kiconedit/pics/hi16-app-kiconedit.png b/tdeiconedit/pics/hi16-app-tdeiconedit.png
index ff16bcae..ff16bcae 100644
--- a/kiconedit/pics/hi16-app-kiconedit.png
+++ b/tdeiconedit/pics/hi16-app-tdeiconedit.png
diff --git a/kiconedit/pics/hi22-app-kiconedit.png b/tdeiconedit/pics/hi22-app-tdeiconedit.png
index 8bb080c7..8bb080c7 100644
--- a/kiconedit/pics/hi22-app-kiconedit.png
+++ b/tdeiconedit/pics/hi22-app-tdeiconedit.png
diff --git a/kiconedit/pics/hi32-app-kiconedit.png b/tdeiconedit/pics/hi32-app-tdeiconedit.png
index 604b17dd..604b17dd 100644
--- a/kiconedit/pics/hi32-app-kiconedit.png
+++ b/tdeiconedit/pics/hi32-app-tdeiconedit.png
diff --git a/kiconedit/pics/hi48-app-kiconedit.png b/tdeiconedit/pics/hi48-app-tdeiconedit.png
index b95bffae..b95bffae 100644
--- a/kiconedit/pics/hi48-app-kiconedit.png
+++ b/tdeiconedit/pics/hi48-app-tdeiconedit.png
diff --git a/kiconedit/pics/icons/CMakeLists.txt b/tdeiconedit/pics/icons/CMakeLists.txt
index 04aa1f5d..31ee65bf 100644
--- a/kiconedit/pics/icons/CMakeLists.txt
+++ b/tdeiconedit/pics/icons/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-install( FILES source.png standard.png compressed.png DESTINATION ${DATA_INSTALL_DIR}/kiconedit/pics )
+install( FILES source.png standard.png compressed.png DESTINATION ${DATA_INSTALL_DIR}/tdeiconedit/pics )
diff --git a/kiconedit/pics/icons/Makefile.am b/tdeiconedit/pics/icons/Makefile.am
index 4acb372f..ee985d89 100644
--- a/kiconedit/pics/icons/Makefile.am
+++ b/tdeiconedit/pics/icons/Makefile.am
@@ -2,4 +2,4 @@ pics_DATA = source.png \
 	standard.png \
 	compressed.png
 
-picsdir = $(kde_datadir)/kiconedit/pics
+picsdir = $(kde_datadir)/tdeiconedit/pics
diff --git a/kiconedit/pics/icons/compressed.png b/tdeiconedit/pics/icons/compressed.png
index c919f3bf..c919f3bf 100644
--- a/kiconedit/pics/icons/compressed.png
+++ b/tdeiconedit/pics/icons/compressed.png
diff --git a/kiconedit/pics/icons/source.png b/tdeiconedit/pics/icons/source.png
index 8351e380..8351e380 100644
--- a/kiconedit/pics/icons/source.png
+++ b/tdeiconedit/pics/icons/source.png
diff --git a/kiconedit/pics/icons/standard.png b/tdeiconedit/pics/icons/standard.png
index df1e8318..df1e8318 100644
--- a/kiconedit/pics/icons/standard.png
+++ b/tdeiconedit/pics/icons/standard.png
diff --git a/kiconedit/pics/logo.xpm b/tdeiconedit/pics/logo.xpm
index 97dab29d..97dab29d 100644
--- a/kiconedit/pics/logo.xpm
+++ b/tdeiconedit/pics/logo.xpm
diff --git a/kiconedit/pics/toolbar/CMakeLists.txt b/tdeiconedit/pics/toolbar/CMakeLists.txt
index 8d44094b..d73cdf45 100644
--- a/kiconedit/pics/toolbar/CMakeLists.txt
+++ b/tdeiconedit/pics/toolbar/CMakeLists.txt
@@ -16,5 +16,5 @@ install( FILES
     selectrect.png selectcircle.png fill-cursor.xpm grid.png pointer.png
     aim.png aim-cursor.xpm window_new.png grayscale.png kdepalette.png
     transform.png eraser-cursor.xpm colorpicker-cursor.xpm
-  DESTINATION ${DATA_INSTALL_DIR}/kiconedit/pics
+  DESTINATION ${DATA_INSTALL_DIR}/tdeiconedit/pics
 )
diff --git a/kiconedit/pics/toolbar/Makefile.am b/tdeiconedit/pics/toolbar/Makefile.am
index 8e3cb6e2..362dd41a 100644
--- a/kiconedit/pics/toolbar/Makefile.am
+++ b/tdeiconedit/pics/toolbar/Makefile.am
@@ -25,4 +25,4 @@ toolbar_DATA =	fileclose.png \
 
 
 
-toolbardir = $(kde_datadir)/kiconedit/pics
+toolbardir = $(kde_datadir)/tdeiconedit/pics
diff --git a/kiconedit/pics/toolbar/aim-cursor.xpm b/tdeiconedit/pics/toolbar/aim-cursor.xpm
index ecef295f..ecef295f 100644
--- a/kiconedit/pics/toolbar/aim-cursor.xpm
+++ b/tdeiconedit/pics/toolbar/aim-cursor.xpm
diff --git a/kiconedit/pics/toolbar/aim.png b/tdeiconedit/pics/toolbar/aim.png
index ed0088a7..ed0088a7 100644
--- a/kiconedit/pics/toolbar/aim.png
+++ b/tdeiconedit/pics/toolbar/aim.png
diff --git a/kiconedit/pics/toolbar/airbrush-cursor.xpm b/tdeiconedit/pics/toolbar/airbrush-cursor.xpm
index 2fd8314d..2fd8314d 100644
--- a/kiconedit/pics/toolbar/airbrush-cursor.xpm
+++ b/tdeiconedit/pics/toolbar/airbrush-cursor.xpm
diff --git a/kiconedit/pics/toolbar/areaselect.png b/tdeiconedit/pics/toolbar/areaselect.png
index de3fe8fb..de3fe8fb 100644
--- a/kiconedit/pics/toolbar/areaselect.png
+++ b/tdeiconedit/pics/toolbar/areaselect.png
diff --git a/kiconedit/pics/toolbar/circle.png b/tdeiconedit/pics/toolbar/circle.png
index ccb5c9db..ccb5c9db 100644
--- a/kiconedit/pics/toolbar/circle.png
+++ b/tdeiconedit/pics/toolbar/circle.png
diff --git a/kiconedit/pics/toolbar/colorpicker-cursor.xpm b/tdeiconedit/pics/toolbar/colorpicker-cursor.xpm
index 8edc155e..8edc155e 100644
--- a/kiconedit/pics/toolbar/colorpicker-cursor.xpm
+++ b/tdeiconedit/pics/toolbar/colorpicker-cursor.xpm
diff --git a/kiconedit/pics/toolbar/ellipse.png b/tdeiconedit/pics/toolbar/ellipse.png
index 658b944d..658b944d 100644
--- a/kiconedit/pics/toolbar/ellipse.png
+++ b/tdeiconedit/pics/toolbar/ellipse.png
diff --git a/kiconedit/pics/toolbar/eraser-cursor.xpm b/tdeiconedit/pics/toolbar/eraser-cursor.xpm
index 12c07f11..12c07f11 100644
--- a/kiconedit/pics/toolbar/eraser-cursor.xpm
+++ b/tdeiconedit/pics/toolbar/eraser-cursor.xpm
diff --git a/kiconedit/pics/toolbar/fileclose.png b/tdeiconedit/pics/toolbar/fileclose.png
index 906b2ec5..906b2ec5 100644
--- a/kiconedit/pics/toolbar/fileclose.png
+++ b/tdeiconedit/pics/toolbar/fileclose.png
diff --git a/kiconedit/pics/toolbar/fill-cursor.xpm b/tdeiconedit/pics/toolbar/fill-cursor.xpm
index d5ca3034..d5ca3034 100644
--- a/kiconedit/pics/toolbar/fill-cursor.xpm
+++ b/tdeiconedit/pics/toolbar/fill-cursor.xpm
diff --git a/kiconedit/pics/toolbar/filledcircle.png b/tdeiconedit/pics/toolbar/filledcircle.png
index 1431fbe2..1431fbe2 100644
--- a/kiconedit/pics/toolbar/filledcircle.png
+++ b/tdeiconedit/pics/toolbar/filledcircle.png
diff --git a/kiconedit/pics/toolbar/filledellipse.png b/tdeiconedit/pics/toolbar/filledellipse.png
index 3f1d6220..3f1d6220 100644
--- a/kiconedit/pics/toolbar/filledellipse.png
+++ b/tdeiconedit/pics/toolbar/filledellipse.png
diff --git a/kiconedit/pics/toolbar/filledrectangle.png b/tdeiconedit/pics/toolbar/filledrectangle.png
index 1a011a63..1a011a63 100644
--- a/kiconedit/pics/toolbar/filledrectangle.png
+++ b/tdeiconedit/pics/toolbar/filledrectangle.png
diff --git a/kiconedit/pics/toolbar/flood-cursor.xpm b/tdeiconedit/pics/toolbar/flood-cursor.xpm
index 8707443d..8707443d 100644
--- a/kiconedit/pics/toolbar/flood-cursor.xpm
+++ b/tdeiconedit/pics/toolbar/flood-cursor.xpm
diff --git a/kiconedit/pics/toolbar/flood.png b/tdeiconedit/pics/toolbar/flood.png
index 45e1130b..45e1130b 100644
--- a/kiconedit/pics/toolbar/flood.png
+++ b/tdeiconedit/pics/toolbar/flood.png
diff --git a/kiconedit/pics/toolbar/grayscale.png b/tdeiconedit/pics/toolbar/grayscale.png
index 3b475550..3b475550 100644
--- a/kiconedit/pics/toolbar/grayscale.png
+++ b/tdeiconedit/pics/toolbar/grayscale.png
diff --git a/kiconedit/pics/toolbar/grid.png b/tdeiconedit/pics/toolbar/grid.png
index acf1b687..acf1b687 100644
--- a/kiconedit/pics/toolbar/grid.png
+++ b/tdeiconedit/pics/toolbar/grid.png
diff --git a/kiconedit/pics/toolbar/kdepalette.png b/tdeiconedit/pics/toolbar/kdepalette.png
index 705865a2..705865a2 100644
--- a/kiconedit/pics/toolbar/kdepalette.png
+++ b/tdeiconedit/pics/toolbar/kdepalette.png
diff --git a/kiconedit/pics/toolbar/line.png b/tdeiconedit/pics/toolbar/line.png
index 25964286..25964286 100644
--- a/kiconedit/pics/toolbar/line.png
+++ b/tdeiconedit/pics/toolbar/line.png
diff --git a/kiconedit/pics/toolbar/paintbrush-cursor.xpm b/tdeiconedit/pics/toolbar/paintbrush-cursor.xpm
index fa4a1e32..fa4a1e32 100644
--- a/kiconedit/pics/toolbar/paintbrush-cursor.xpm
+++ b/tdeiconedit/pics/toolbar/paintbrush-cursor.xpm
diff --git a/kiconedit/pics/toolbar/paintbrush.png b/tdeiconedit/pics/toolbar/paintbrush.png
index 53774e19..53774e19 100644
--- a/kiconedit/pics/toolbar/paintbrush.png
+++ b/tdeiconedit/pics/toolbar/paintbrush.png
diff --git a/kiconedit/pics/toolbar/pointer.png b/tdeiconedit/pics/toolbar/pointer.png
index 62229be5..62229be5 100644
--- a/kiconedit/pics/toolbar/pointer.png
+++ b/tdeiconedit/pics/toolbar/pointer.png
diff --git a/kiconedit/pics/toolbar/rectangle.png b/tdeiconedit/pics/toolbar/rectangle.png
index 7075cf10..7075cf10 100644
--- a/kiconedit/pics/toolbar/rectangle.png
+++ b/tdeiconedit/pics/toolbar/rectangle.png
diff --git a/kiconedit/pics/toolbar/selectcircle.png b/tdeiconedit/pics/toolbar/selectcircle.png
index 91f528ec..91f528ec 100644
--- a/kiconedit/pics/toolbar/selectcircle.png
+++ b/tdeiconedit/pics/toolbar/selectcircle.png
diff --git a/kiconedit/pics/toolbar/selectrect.png b/tdeiconedit/pics/toolbar/selectrect.png
index 0ce3aa21..0ce3aa21 100644
--- a/kiconedit/pics/toolbar/selectrect.png
+++ b/tdeiconedit/pics/toolbar/selectrect.png
diff --git a/kiconedit/pics/toolbar/spraycan-cursor.xpm b/tdeiconedit/pics/toolbar/spraycan-cursor.xpm
index 13d84b80..13d84b80 100644
--- a/kiconedit/pics/toolbar/spraycan-cursor.xpm
+++ b/tdeiconedit/pics/toolbar/spraycan-cursor.xpm
diff --git a/kiconedit/pics/toolbar/spraycan.png b/tdeiconedit/pics/toolbar/spraycan.png
index c2ce7e8d..c2ce7e8d 100644
--- a/kiconedit/pics/toolbar/spraycan.png
+++ b/tdeiconedit/pics/toolbar/spraycan.png
diff --git a/kiconedit/pics/toolbar/transform.png b/tdeiconedit/pics/toolbar/transform.png
index 3a5ca2b3..3a5ca2b3 100644
--- a/kiconedit/pics/toolbar/transform.png
+++ b/tdeiconedit/pics/toolbar/transform.png
diff --git a/kiconedit/pics/toolbar/window_new.png b/tdeiconedit/pics/toolbar/window_new.png
index 4d0a40a0..4d0a40a0 100644
--- a/kiconedit/pics/toolbar/window_new.png
+++ b/tdeiconedit/pics/toolbar/window_new.png
diff --git a/kiconedit/properties.cpp b/tdeiconedit/properties.cpp
index 4a90d7fe..4a90d7fe 100644
--- a/kiconedit/properties.cpp
+++ b/tdeiconedit/properties.cpp
diff --git a/kiconedit/properties.h b/tdeiconedit/properties.h
index e4872273..e9ac5a88 100644
--- a/kiconedit/properties.h
+++ b/tdeiconedit/properties.h
@@ -1,5 +1,5 @@
 /*
-    kiconedit - a small graphics drawing program the KDE.
+    tdeiconedit - a small graphics drawing program the KDE.
 
     Copyright (C) 1998 Thomas Tanghus (tanghus@kde.org)
 
@@ -24,7 +24,7 @@
 
 #include <tqwidget.h>
 
-#include "kicongrid.h"
+#include "tdeicongrid.h"
 
 class TDEIconEditProperties : public TQObject
 {
diff --git a/kiconedit/kicon.cpp b/tdeiconedit/tdeicon.cpp
index 296dc9a3..cd3ab63a 100644
--- a/kiconedit/kicon.cpp
+++ b/tdeiconedit/tdeicon.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 
-#include "kicon.h"
+#include "tdeicon.h"
 #include "utils.h"
 
 TDEIconEditIcon::TDEIconEditIcon(TQObject *parent, const TQImage *img, KURL url) 
@@ -276,4 +276,4 @@ bool TDEIconEditIcon::save(const TQImage *image, const TQString &_filename)
 }
 
 
-#include "kicon.moc"
+#include "tdeicon.moc"
diff --git a/kiconedit/kicon.h b/tdeiconedit/tdeicon.h
index ede75f71..ede75f71 100644
--- a/kiconedit/kicon.h
+++ b/tdeiconedit/tdeicon.h
diff --git a/kiconedit/kiconcolors.cpp b/tdeiconedit/tdeiconcolors.cpp
index 6e0e2632..6b695fc5 100644
--- a/kiconedit/kiconcolors.cpp
+++ b/tdeiconedit/tdeiconcolors.cpp
@@ -23,7 +23,7 @@
 
 #include <kdebug.h>
 
-#include "kiconcolors.h"
+#include "tdeiconcolors.h"
 
 KDrawColors::KDrawColors(TQWidget *parent) : KColorGrid(parent, 0, 3)
 {
@@ -167,4 +167,4 @@ void KCustomColors::clear()
   freeAllCells();
   update();
 }
-#include "kiconcolors.moc"
+#include "tdeiconcolors.moc"
diff --git a/kiconedit/kiconcolors.h b/tdeiconedit/tdeiconcolors.h
index cf959a27..6e12d810 100644
--- a/kiconedit/kiconcolors.h
+++ b/tdeiconedit/tdeiconcolors.h
@@ -1,5 +1,5 @@
 /*
-    kiconedit - a small graphics drawing program for creating KDE icons
+    tdeiconedit - a small graphics drawing program for creating KDE icons
     Copyright (C) 1998  Thomas Tanghus (tanghus@kde.org)
 
     This program is free software; you can redistribute it and/or
diff --git a/kiconedit/kiconconfig.cpp b/tdeiconedit/tdeiconconfig.cpp
index d50fbc86..0fb4639a 100644
--- a/kiconedit/kiconconfig.cpp
+++ b/tdeiconedit/tdeiconconfig.cpp
@@ -37,8 +37,8 @@
 #include <kdebug.h>
 #include <kurlrequester.h>
 
-#include "kiconconfig.h"
-#include "kiconedit.h"
+#include "tdeiconconfig.h"
+#include "tdeiconedit.h"
 
 #ifndef PICS_INCLUDED
 #define PICS_INCLUDED
@@ -543,7 +543,7 @@ TDEIconConfig::TDEIconConfig(TQWidget *parent)
   page = addVBoxPage(i18n("Background"), TQString(), loadIcon("background"));
   backs = new KBackgroundConfig(page);
 
-  page = addVBoxPage(i18n("Icon Grid"), TQString(), loadIcon("kiconedit"));
+  page = addVBoxPage(i18n("Icon Grid"), TQString(), loadIcon("tdeiconedit"));
   misc = new KMiscConfig(page);
 
   TQSize min(300, 400);
@@ -586,4 +586,4 @@ void TDEIconConfig::finis()
     delayedDestruct();
 }
 
-#include "kiconconfig.moc"
+#include "tdeiconconfig.moc"
diff --git a/kiconedit/kiconconfig.h b/tdeiconedit/tdeiconconfig.h
index 62f7938c..62f7938c 100644
--- a/kiconedit/kiconconfig.h
+++ b/tdeiconedit/tdeiconconfig.h
diff --git a/kiconedit/kiconedit.cpp b/tdeiconedit/tdeiconedit.cpp
index bec3af7f..4705d102 100644
--- a/kiconedit/kiconedit.cpp
+++ b/tdeiconedit/tdeiconedit.cpp
@@ -1,5 +1,5 @@
 /*
-    kiconedit - a small graphics drawing program for the KDE
+    tdeiconedit - a small graphics drawing program for the KDE
     Copyright (C) 1998  Thomas Tanghus (tanghus@kde.org)
 
     This program is free software; you can redistribute it and/or
@@ -28,7 +28,7 @@
 #include <tdemessagebox.h>
 #include <kdebug.h>
 
-#include "kiconedit.h"
+#include "tdeiconedit.h"
 #include "palettetoolbar.h"
 
 WindowList TDEIconEdit::windowList;
@@ -494,4 +494,4 @@ void TDEIconEdit::addRecent(const TQString & path)
   m_actRecent->addURL(KURL( path ));
 }
 
-#include "kiconedit.moc"
+#include "tdeiconedit.moc"
diff --git a/kiconedit/kiconedit.desktop b/tdeiconedit/tdeiconedit.desktop
index da619ae2..44e23ba2 100644
--- a/kiconedit/kiconedit.desktop
+++ b/tdeiconedit/tdeiconedit.desktop
@@ -65,7 +65,7 @@ GenericName[zh_HK]=圖示編輯器
 GenericName[zh_TW]=圖示編輯器
 GenericName[zu]=Umhleli we Icon
 Name=TDEIconEdit
-Name[af]=K-ikoon-redigeer
+Name[af]=TDE-ikoon-redigeer
 Name[ar]=برنامج TDEIconEdit
 Name[cy]=KGolyguEicon
 Name[eo]=Piktogramredaktilo
@@ -78,18 +78,17 @@ Name[ne]=केडीई प्रतिमा सम्पादन
 Name[pl]=Edytor ikon
 Name[pt_BR]=KEditor de Ícones
 Name[ro]=Editor iconiţe
-Name[sv]=Kiconedit
+Name[sv]=TDEiconedit
 Name[ta]=கேசின்னம் திருத்து
 Name[tr]=K Icon Düzenleyici
 Name[ven]=U sengulusa ha aikhono ya K
 Name[zh_TW]=TDEIconEdit 圖示編輯器
 MimeType=image/x-xpm;image/x-ico;image/png;image/jpeg;
-Exec=kiconedit -caption "%c" %i %m %u
-Icon=kiconedit
+Exec=tdeiconedit -caption "%c" %i %m %u
+Icon=tdeiconedit
 Path=
-DocPath=kiconedit/index.html
+DocPath=tdeiconedit/index.html
 Type=Application
 Terminal=false
-
 X-DCOP-ServiceType=Multi
 Categories=Qt;TDE;Graphics;
diff --git a/kiconedit/kiconedit.h b/tdeiconedit/tdeiconedit.h
index 7c6e74f0..90a21d9f 100644
--- a/kiconedit/kiconedit.h
+++ b/tdeiconedit/tdeiconedit.h
@@ -1,5 +1,5 @@
 /*
-    kiconedit - a small graphics drawing program for creating KDE icons
+    tdeiconedit - a small graphics drawing program for creating KDE icons
     Copyright (C) 1998  Thomas Tanghus (tanghus@kde.org)
 
     This program is free software; you can redistribute it and/or
@@ -18,8 +18,8 @@
     Boston, MA 02110-1301, USA.
 */  
 
-#ifndef __KICONEDIT_H__
-#define __KICONEDIT_H__
+#ifndef __TDEICONEDIT_H__
+#define __TDEICONEDIT_H__
 
 #include <tqwidget.h>
 #include <tqpixmap.h>
@@ -35,9 +35,9 @@
 #include <tdeaction.h>
 
 #include "knew.h"
-#include "kicon.h"
-#include "kiconconfig.h"
-#include "kicongrid.h"
+#include "tdeicon.h"
+#include "tdeiconconfig.h"
+#include "tdeicongrid.h"
 #include "kresize.h"
 #include "properties.h"
 
@@ -61,8 +61,8 @@ class TDEIconEdit : public TDEMainWindow
     Q_OBJECT
   
 public:
-  TDEIconEdit( KURL url = KURL(), const char *name = "kiconedit");
-  TDEIconEdit( const TQImage image, const char *name = "kiconedit");
+  TDEIconEdit( KURL url = KURL(), const char *name = "tdeiconedit");
+  TDEIconEdit( const TQImage image, const char *name = "tdeiconedit");
   ~TDEIconEdit();
 
   virtual TQSize sizeHint() const;
@@ -155,4 +155,4 @@ protected:
   TDERecentFilesAction *m_actRecent;
 };
 
-#endif //__KICONEDIT_H__
+#endif //__TDEICONEDIT_H__
diff --git a/kiconedit/kiconeditslots.cpp b/tdeiconedit/tdeiconeditslots.cpp
index 899a2b5d..913c4037 100644
--- a/kiconedit/kiconeditslots.cpp
+++ b/tdeiconedit/tdeiconeditslots.cpp
@@ -28,8 +28,8 @@
 #include <kprinter.h>
 #include <kurldrag.h>
 
-#include "kiconedit.h"
-#include "kiconcolors.h"
+#include "tdeiconedit.h"
+#include "tdeiconcolors.h"
 #include "palettetoolbar.h"
 
 #ifndef PICS_INCLUDED
@@ -70,7 +70,7 @@ void TDEIconEdit::slotNewWin(const TQString & url)
 {
     //kdDebug(4640) << "TDEIconEdit::openNewWin() - " << url << endl;
 
-    TDEIconEdit *w = new TDEIconEdit(KURL(url), "kiconedit");
+    TDEIconEdit *w = new TDEIconEdit(KURL(url), "tdeiconedit");
     TQ_CHECK_PTR(w);
 }
 
diff --git a/kiconedit/kiconeditui.rc b/tdeiconedit/tdeiconeditui.rc
index cdef162c..1b1eff81 100644
--- a/kiconedit/kiconeditui.rc
+++ b/tdeiconedit/tdeiconeditui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui version="2" name="kiconedit">
+<kpartgui version="2" name="tdeiconedit">
 <MenuBar>
   <Menu name="file"><text>&amp;File</text>
     <Action name="file_new_window" append="new_merge"/>
diff --git a/kiconedit/kicongrid.cpp b/tdeiconedit/tdeicongrid.cpp
index 0ed49f1e..8c336428 100644
--- a/kiconedit/kicongrid.cpp
+++ b/tdeiconedit/tdeicongrid.cpp
@@ -38,8 +38,8 @@
 
 #include "kresize.h"
 #include "properties.h"
-#include "kicongrid.h"
-#include "kiconedit.h"
+#include "tdeicongrid.h"
+#include "tdeiconedit.h"
 #ifndef PICS_INCLUDED
 #include "pics/logo.xpm"
 #define PICS_INCLUDED
@@ -2259,5 +2259,5 @@ void TDEIconEditGrid::setModified(bool m)
 }
 
 
-#include "kicongrid.moc"
+#include "tdeicongrid.moc"
 // vim: set ts=4:
diff --git a/kiconedit/kicongrid.h b/tdeiconedit/tdeicongrid.h
index a88a78be..9f41084f 100644
--- a/kiconedit/kicongrid.h
+++ b/tdeiconedit/tdeicongrid.h
@@ -18,8 +18,8 @@
     Boston, MA 02110-1301, USA.
 */  
 
-#ifndef __KICONEDITGRID_H__
-#define __KICONEDITGRID_H__
+#ifndef __TDEICONEDITGRID_H__
+#define __TDEICONEDITGRID_H__
 
 #include <tqpixmap.h>
 #include <tqimage.h>
@@ -259,7 +259,7 @@ protected:
 
 
 
-#endif //__KICONEDITGRID_H__
+#endif //__TDEICONEDITGRID_H__
 
 
 
diff --git a/kiconedit/utils.cpp b/tdeiconedit/utils.cpp
index efd50d88..efd50d88 100644
--- a/kiconedit/utils.cpp
+++ b/tdeiconedit/utils.cpp
diff --git a/kiconedit/utils.h b/tdeiconedit/utils.h
index 83108b33..197d67b6 100644
--- a/kiconedit/utils.h
+++ b/tdeiconedit/utils.h
@@ -1,5 +1,5 @@
 /*  
-    kiconedit - a small graphics drawing program for the KDE
+    tdeiconedit - a small graphics drawing program for the KDE
 
     Copyright (C) 1998 Thomas Tanghus (tanghus@kde.org)
 
diff --git a/kiconedit/version.h b/tdeiconedit/version.h
index 8f04bb6e..3c7400a6 100644
--- a/kiconedit/version.h
+++ b/tdeiconedit/version.h
@@ -1,5 +1,5 @@
 /*  
-    kiconedit - a small graphics drawing program for the KDE
+    tdeiconedit - a small graphics drawing program for the KDE
 
     Copyright (C) 1998 Thomas Tanghus (tanghus@kde.org)