Fix unintended renaming

54 files changed, 139 insertions, 139 deletions

diff --git a/chalk/plugins/tools/selectiontools/Makefile.am b/chalk/plugins/tools/selectiontools/Makefile.am
index 5bb87983..49d3f571 100644
--- a/chalk/plugins/tools/selectiontools/Makefile.am
+++ b/chalk/plugins/tools/selectiontools/Makefile.am
@@ -1,4 +1,4 @@
-kde_services_DATA = chaltdeselectiontools.desktop
+kde_services_DATA = chalkselectiontools.desktop
 
 # all_includes must remain last!
 INCLUDES =  -I$(srcdir)/../../../sdk \
@@ -9,13 +9,13 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chaltdeselectiontools_la_SOURCES = kis_tool_move_selection.cc \
+chalkselectiontools_la_SOURCES = kis_tool_move_selection.cc \
 	kis_tool_select_brush.cc kis_tool_select_contiguous.cc kis_tool_select_elliptical.cc \
 	kis_tool_select_eraser.cc kis_tool_select_outline.cc kis_tool_select_polygonal.cc \
 	kis_tool_select_rectangular.cc selection_tools.cc
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = chaltdeselectiontools.la
+kde_module_LTLIBRARIES = chalkselectiontools.la
 
 noinst_HEADERS = \
 	selection_tools.h \
@@ -28,13 +28,13 @@ noinst_HEADERS = \
 	kis_tool_select_elliptical.h 
 
 
-chaltdeselectiontools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
-chaltdeselectiontools_la_LIBADD =  ../../../libchalkcommon.la \
+chalkselectiontools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkselectiontools_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
 
-chaltdeselectiontools_la_METASOURCES = AUTO
+chalkselectiontools_la_METASOURCES = AUTO
 
 KDE_OPTIONS = nofinal
 
diff --git a/chalk/plugins/tools/selectiontools/chaltdeselectiontools.desktop b/chalk/plugins/tools/selectiontools/chalkselectiontools.desktop
index b18a857a..f005126b 100644
--- a/chalk/plugins/tools/selectiontools/chaltdeselectiontools.desktop
+++ b/chalk/plugins/tools/selectiontools/chalkselectiontools.desktop
@@ -48,5 +48,5 @@ Name[zh_CN]=选择工具
 Name[zh_TW]=選取區工具
 ServiceTypes=Chalk/Tool
 Type=Service
-X-TDE-Library=chaltdeselectiontools
+X-TDE-Library=chalkselectiontools
 X-Chalk-Version=2
diff --git a/chalk/plugins/tools/selectiontools/selection_tools.cc b/chalk/plugins/tools/selectiontools/selection_tools.cc
index 2fdedc0c..fb0e6191 100644
--- a/chalk/plugins/tools/selectiontools/selection_tools.cc
+++ b/chalk/plugins/tools/selectiontools/selection_tools.cc
@@ -48,7 +48,7 @@
 #include "kis_tool_move_selection.h"
 
 typedef KGenericFactory<SelectionTools> SelectionToolsFactory;
-K_EXPORT_COMPONENT_FACTORY( chaltdeselectiontools, SelectionToolsFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chalkselectiontools, SelectionToolsFactory( "chalk" ) )
 
 
 SelectionTools::SelectionTools(TQObject *parent, const char *name, const TQStringList &)
diff --git a/chalk/plugins/tools/tool_crop/Makefile.am b/chalk/plugins/tools/tool_crop/Makefile.am
index fb7bcca7..9f46072e 100644
--- a/chalk/plugins/tools/tool_crop/Makefile.am
+++ b/chalk/plugins/tools/tool_crop/Makefile.am
@@ -1,4 +1,4 @@
-kde_services_DATA = chaltdetoolcrop.desktop
+kde_services_DATA = chalktoolcrop.desktop
 
 # all_includes must remain last!
 INCLUDES =  -I$(srcdir)/../../../sdk \
@@ -9,25 +9,25 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chaltdetoolcrop_la_SOURCES = \
+chalktoolcrop_la_SOURCES = \
 	wdg_tool_crop.ui \
 	tool_crop.cc \
 	kis_tool_crop.cc 
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = chaltdetoolcrop.la
+kde_module_LTLIBRARIES = chalktoolcrop.la
 
 noinst_HEADERS = \
 	tool_crop.h \
 	kis_tool_crop.h 
 
-chaltdetoolcrop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
-chaltdetoolcrop_la_LIBADD =  ../../../libchalkcommon.la \
+chalktoolcrop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalktoolcrop_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
 
-chaltdetoolcrop_la_METASOURCES = AUTO
+chalktoolcrop_la_METASOURCES = AUTO
 
 KDE_OPTIONS = nofinal
 
diff --git a/chalk/plugins/tools/tool_crop/chaltdetoolcrop.desktop b/chalk/plugins/tools/tool_crop/chalktoolcrop.desktop
index c93b427e..325fbf78 100644
--- a/chalk/plugins/tools/tool_crop/chaltdetoolcrop.desktop
+++ b/chalk/plugins/tools/tool_crop/chalktoolcrop.desktop
@@ -43,5 +43,5 @@ Name[zh_CN]=裁剪工具
 Name[zh_TW]=剪裁工具
 ServiceTypes=Chalk/Tool
 Type=Service
-X-TDE-Library=chaltdetoolcrop
+X-TDE-Library=chalktoolcrop
 X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_crop/tool_crop.cc b/chalk/plugins/tools/tool_crop/tool_crop.cc
index 9a836ec6..c624d62f 100644
--- a/chalk/plugins/tools/tool_crop/tool_crop.cc
+++ b/chalk/plugins/tools/tool_crop/tool_crop.cc
@@ -39,7 +39,7 @@
 
 
 typedef KGenericFactory<ToolCrop> ToolCropFactory;
-K_EXPORT_COMPONENT_FACTORY( chaltdetoolcrop, ToolCropFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chalktoolcrop, ToolCropFactory( "chalk" ) )
 
 
 ToolCrop::ToolCrop(TQObject *parent, const char *name, const TQStringList &)
diff --git a/chalk/plugins/tools/tool_curves/Makefile.am b/chalk/plugins/tools/tool_curves/Makefile.am
index 704a975d..d2ddbf07 100644
--- a/chalk/plugins/tools/tool_curves/Makefile.am
+++ b/chalk/plugins/tools/tool_curves/Makefile.am
@@ -1,4 +1,4 @@
-kde_services_DATA = chaltdetoolcurves.desktop
+kde_services_DATA = chalktoolcurves.desktop
 
 # all_includes must remain last!
 INCLUDES =  -I$(srcdir)/../../../sdk \
@@ -9,7 +9,7 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chaltdetoolcurves_la_SOURCES = \
+chalktoolcurves_la_SOURCES = \
 	kis_curve_framework.cc \
 	kis_tool_curve.cc \
 		tool_curves.cc \
@@ -21,7 +21,7 @@ chaltdetoolcurves_la_SOURCES = \
 	kis_tool_moutline.cc
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = chaltdetoolcurves.la
+kde_module_LTLIBRARIES = chalktoolcurves.la
 
 noinst_HEADERS = \
 	kis_curve_framework.h \
@@ -33,13 +33,13 @@ noinst_HEADERS = \
 	kis_tool_bezier_select.h \
 	kis_tool_moutline.h
 
-chaltdetoolcurves_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
-chaltdetoolcurves_la_LIBADD =  ../../../libchalkcommon.la \
+chalktoolcurves_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalktoolcurves_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
 
-chaltdetoolcurves_la_METASOURCES = AUTO
+chalktoolcurves_la_METASOURCES = AUTO
 
 KDE_OPTIONS = nofinal
 
diff --git a/chalk/plugins/tools/tool_curves/chaltdetoolcurves.desktop b/chalk/plugins/tools/tool_curves/chalktoolcurves.desktop
index 218abbf4..76ea7b29 100644
--- a/chalk/plugins/tools/tool_curves/chaltdetoolcurves.desktop
+++ b/chalk/plugins/tools/tool_curves/chalktoolcurves.desktop
@@ -32,5 +32,5 @@ Name[uk]=Криві
 Name[zh_TW]=曲線工具
 ServiceTypes=Chalk/Tool
 Type=Service
-X-TDE-Library=chaltdetoolcurves
+X-TDE-Library=chalktoolcurves
 X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_curves/tool_curves.cc b/chalk/plugins/tools/tool_curves/tool_curves.cc
index 8e32617e..d941c2dc 100644
--- a/chalk/plugins/tools/tool_curves/tool_curves.cc
+++ b/chalk/plugins/tools/tool_curves/tool_curves.cc
@@ -42,7 +42,7 @@
 
 
 typedef KGenericFactory<ToolCurves> ToolCurvesFactory;
-K_EXPORT_COMPONENT_FACTORY( chaltdetoolcurves, ToolCurvesFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chalktoolcurves, ToolCurvesFactory( "chalk" ) )
 
 
 ToolCurves::ToolCurves(TQObject *parent, const char *name, const TQStringList &)
diff --git a/chalk/plugins/tools/tool_filter/Makefile.am b/chalk/plugins/tools/tool_filter/Makefile.am
index f8d69952..f775c435 100644
--- a/chalk/plugins/tools/tool_filter/Makefile.am
+++ b/chalk/plugins/tools/tool_filter/Makefile.am
@@ -1,4 +1,4 @@
-kde_services_DATA = chaltdetoolfilter.desktop
+kde_services_DATA = chalktoolfilter.desktop
 
 # all_includes must remain last!
 INCLUDES =  -I$(srcdir)/../../../sdk \
@@ -9,26 +9,26 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chaltdetoolfilter_la_SOURCES = \
+chalktoolfilter_la_SOURCES = \
 	kis_filterop.cc \
 	kis_tool_filter.cc \
 	tool_filter.cc
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = chaltdetoolfilter.la
+kde_module_LTLIBRARIES = chalktoolfilter.la
 
 noinst_HEADERS = \
 	kis_filterop.h \
 	kis_tool_filter.h \
 	tool_filter.h
 
-chaltdetoolfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
-chaltdetoolfilter_la_LIBADD =  ../../../libchalkcommon.la \
+chalktoolfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalktoolfilter_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
 
-chaltdetoolfilter_la_METASOURCES = AUTO
+chalktoolfilter_la_METASOURCES = AUTO
 
 KDE_OPTIONS = nofinal
 
diff --git a/chalk/plugins/tools/tool_filter/chaltdetoolfilter.desktop b/chalk/plugins/tools/tool_filter/chalktoolfilter.desktop
index f20c3cca..991709b9 100644
--- a/chalk/plugins/tools/tool_filter/chaltdetoolfilter.desktop
+++ b/chalk/plugins/tools/tool_filter/chalktoolfilter.desktop
@@ -88,5 +88,5 @@ Comment[zh_CN]=过滤器工具和绘图集成
 Comment[zh_TW]=濾鏡工具與繪圖操作
 ServiceTypes=Chalk/Tool
 Type=Service
-X-TDE-Library=chaltdetoolfilter
+X-TDE-Library=chalktoolfilter
 X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_filter/tool_filter.cc b/chalk/plugins/tools/tool_filter/tool_filter.cc
index 912686c1..b5d7c4b5 100644
--- a/chalk/plugins/tools/tool_filter/tool_filter.cc
+++ b/chalk/plugins/tools/tool_filter/tool_filter.cc
@@ -41,7 +41,7 @@
 
 
 typedef KGenericFactory<ToolFilter> ToolFilterFactory;
-K_EXPORT_COMPONENT_FACTORY( chaltdetoolfilter, ToolFilterFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chalktoolfilter, ToolFilterFactory( "chalk" ) )
 
 
 ToolFilter::ToolFilter(TQObject *parent, const char *name, const TQStringList &)
diff --git a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am
index df749152..53475991 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am
+++ b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am
@@ -1,4 +1,4 @@
-kde_services_DATA = chaltdetoolperspectivegrid.desktop
+kde_services_DATA = chalktoolperspectivegrid.desktop
 
 # all_includes must remain last!
 INCLUDES =  -I$(srcdir)/../../../sdk \
@@ -9,19 +9,19 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chaltdetoolperspectivegrid_la_SOURCES = \
+chalktoolperspectivegrid_la_SOURCES = \
 	tool_perspectivegrid.cc \
 	kis_tool_perspectivegrid.cc 
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = chaltdetoolperspectivegrid.la
+kde_module_LTLIBRARIES = chalktoolperspectivegrid.la
 
 noinst_HEADERS = \
 	tool_perspectivegrid.h \
 	kis_tool_perspectivegrid.h 
 
-chaltdetoolperspectivegrid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
-chaltdetoolperspectivegrid_la_LIBADD =  ../../../libchalkcommon.la \
+chalktoolperspectivegrid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalktoolperspectivegrid_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
diff --git a/chalk/plugins/tools/tool_perspectivegrid/chaltdetoolperspectivegrid.desktop b/chalk/plugins/tools/tool_perspectivegrid/chalktoolperspectivegrid.desktop
index 1538be0b..9899e284 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/chaltdetoolperspectivegrid.desktop
+++ b/chalk/plugins/tools/tool_perspectivegrid/chalktoolperspectivegrid.desktop
@@ -31,5 +31,5 @@ Name[uk]=Засіб ґратки перспективи
 Name[zh_TW]=透視格工具
 ServiceTypes=Chalk/Tool
 Type=Service
-X-TDE-Library=chaltdetoolperspectivegrid
+X-TDE-Library=chalktoolperspectivegrid
 X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc
index f9f4a5aa..12615387 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc
+++ b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc
@@ -39,7 +39,7 @@
 
 
 typedef KGenericFactory<ToolPerspectiveGrid> ToolPerspectiveGridFactory;
-K_EXPORT_COMPONENT_FACTORY( chaltdetoolperspectivegrid, ToolPerspectiveGridFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chalktoolperspectivegrid, ToolPerspectiveGridFactory( "chalk" ) )
 
 
 ToolPerspectiveGrid::ToolPerspectiveGrid(TQObject *parent, const char *name, const TQStringList &)
diff --git a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am
index 48c1fe7a..c34b906c 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am
+++ b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am
@@ -1,4 +1,4 @@
-kde_services_DATA = chaltdetoolperspectivetransform.desktop
+kde_services_DATA = chalktoolperspectivetransform.desktop
 
 # all_includes must remain last!
 INCLUDES =  -I$(srcdir)/../../../sdk \
@@ -9,24 +9,24 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chaltdetoolperspectivetransform_la_SOURCES = \
+chalktoolperspectivetransform_la_SOURCES = \
 	tool_perspectivetransform.cc \
 	kis_tool_perspectivetransform.cc 
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = chaltdetoolperspectivetransform.la
+kde_module_LTLIBRARIES = chalktoolperspectivetransform.la
 
 noinst_HEADERS = \
 	tool_perspectivetransform.h \
 	kis_tool_perspectivetransform.h 
 
-chaltdetoolperspectivetransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
-chaltdetoolperspectivetransform_la_LIBADD =  ../../../libchalkcommon.la \
+chalktoolperspectivetransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalktoolperspectivetransform_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
 
-chaltdetoolperspectivetransform_la_METASOURCES = AUTO
+chalktoolperspectivetransform_la_METASOURCES = AUTO
 
 KDE_OPTIONS = nofinal
 
diff --git a/chalk/plugins/tools/tool_perspectivetransform/chaltdetoolperspectivetransform.desktop b/chalk/plugins/tools/tool_perspectivetransform/chalktoolperspectivetransform.desktop
index 0717f235..9f1a9b9c 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/chaltdetoolperspectivetransform.desktop
+++ b/chalk/plugins/tools/tool_perspectivetransform/chalktoolperspectivetransform.desktop
@@ -33,5 +33,5 @@ Name[uk]=Засіб перспективи
 Name[zh_TW]=透視轉換工具
 ServiceTypes=Chalk/Tool
 Type=Service
-X-TDE-Library=chaltdetoolperspectivetransform
+X-TDE-Library=chalktoolperspectivetransform
 X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc
index be96be71..24d71620 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc
+++ b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc
@@ -39,7 +39,7 @@
 
 
 typedef KGenericFactory<ToolPerspectiveTransform> ToolPerspectiveTransformFactory;
-K_EXPORT_COMPONENT_FACTORY( chaltdetoolperspectivetransform, ToolPerspectiveTransformFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chalktoolperspectivetransform, ToolPerspectiveTransformFactory( "chalk" ) )
 
 
 ToolPerspectiveTransform::ToolPerspectiveTransform(TQObject *parent, const char *name, const TQStringList &)
diff --git a/chalk/plugins/tools/tool_polygon/Makefile.am b/chalk/plugins/tools/tool_polygon/Makefile.am
index c72db700..ad69e2cc 100644
--- a/chalk/plugins/tools/tool_polygon/Makefile.am
+++ b/chalk/plugins/tools/tool_polygon/Makefile.am
@@ -1,4 +1,4 @@
-kde_services_DATA = chaltdetoolpolygon.desktop
+kde_services_DATA = chalktoolpolygon.desktop
 
 # all_includes must remain last!
 INCLUDES =  -I$(srcdir)/../../../sdk \
@@ -9,24 +9,24 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chaltdetoolpolygon_la_SOURCES = \
+chalktoolpolygon_la_SOURCES = \
         tool_polygon.cc \
 	kis_tool_polygon.cc 
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = chaltdetoolpolygon.la
+kde_module_LTLIBRARIES = chalktoolpolygon.la
 
 noinst_HEADERS = \
 	tool_polygon.h \
 	kis_tool_polygon.h 
 
-chaltdetoolpolygon_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
-chaltdetoolpolygon_la_LIBADD =  ../../../libchalkcommon.la \
+chalktoolpolygon_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalktoolpolygon_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
 
-chaltdetoolpolygon_la_METASOURCES = AUTO
+chalktoolpolygon_la_METASOURCES = AUTO
 
 KDE_OPTIONS = nofinal
 
diff --git a/chalk/plugins/tools/tool_polygon/chaltdetoolpolygon.desktop b/chalk/plugins/tools/tool_polygon/chalktoolpolygon.desktop
index f58ddc8a..2b10ed9d 100644
--- a/chalk/plugins/tools/tool_polygon/chaltdetoolpolygon.desktop
+++ b/chalk/plugins/tools/tool_polygon/chalktoolpolygon.desktop
@@ -48,5 +48,5 @@ Name[zh_CN]=多边形工具
 Name[zh_TW]=多邊形工具
 ServiceTypes=Chalk/Tool
 Type=Service
-X-TDE-Library=chaltdetoolpolygon
+X-TDE-Library=chalktoolpolygon
 X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_polygon/tool_polygon.cc b/chalk/plugins/tools/tool_polygon/tool_polygon.cc
index c5783cba..5ace6079 100644
--- a/chalk/plugins/tools/tool_polygon/tool_polygon.cc
+++ b/chalk/plugins/tools/tool_polygon/tool_polygon.cc
@@ -39,7 +39,7 @@
 
 
 typedef KGenericFactory<ToolPolygon> ToolPolygonFactory;
-K_EXPORT_COMPONENT_FACTORY( chaltdetoolpolygon, ToolPolygonFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chalktoolpolygon, ToolPolygonFactory( "chalk" ) )
 
 
 ToolPolygon::ToolPolygon(TQObject *parent, const char *name, const TQStringList &)
diff --git a/chalk/plugins/tools/tool_polyline/Makefile.am b/chalk/plugins/tools/tool_polyline/Makefile.am
index bd778616..a058dc58 100644
--- a/chalk/plugins/tools/tool_polyline/Makefile.am
+++ b/chalk/plugins/tools/tool_polyline/Makefile.am
@@ -1,4 +1,4 @@
-kde_services_DATA = chaltdetoolpolyline.desktop
+kde_services_DATA = chalktoolpolyline.desktop
 
 # all_includes must remain last!
 INCLUDES =  -I$(srcdir)/../../../sdk \
@@ -9,24 +9,24 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chaltdetoolpolyline_la_SOURCES = \
+chalktoolpolyline_la_SOURCES = \
         tool_polyline.cc \
 	kis_tool_polyline.cc 
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = chaltdetoolpolyline.la
+kde_module_LTLIBRARIES = chalktoolpolyline.la
 
 noinst_HEADERS = \
 	tool_polyline.h \
 	kis_tool_polyline.h 
 
-chaltdetoolpolyline_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
-chaltdetoolpolyline_la_LIBADD =  ../../../libchalkcommon.la \
+chalktoolpolyline_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalktoolpolyline_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
 
-chaltdetoolpolyline_la_METASOURCES = AUTO
+chalktoolpolyline_la_METASOURCES = AUTO
 
 KDE_OPTIONS = nofinal
 
diff --git a/chalk/plugins/tools/tool_polyline/chaltdetoolpolyline.desktop b/chalk/plugins/tools/tool_polyline/chalktoolpolyline.desktop
index 37846b0e..b68aa879 100644
--- a/chalk/plugins/tools/tool_polyline/chaltdetoolpolyline.desktop
+++ b/chalk/plugins/tools/tool_polyline/chalktoolpolyline.desktop
@@ -45,5 +45,5 @@ Name[zh_CN]=折线工具
 Name[zh_TW]=任意線工具
 ServiceTypes=Chalk/Tool
 Type=Service
-X-TDE-Library=chaltdetoolpolyline
+X-TDE-Library=chalktoolpolyline
 X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_polyline/tool_polyline.cc b/chalk/plugins/tools/tool_polyline/tool_polyline.cc
index 34592d5c..fe9eb002 100644
--- a/chalk/plugins/tools/tool_polyline/tool_polyline.cc
+++ b/chalk/plugins/tools/tool_polyline/tool_polyline.cc
@@ -40,7 +40,7 @@
 
 
 typedef KGenericFactory<ToolPolyline> ToolPolylineFactory;
-K_EXPORT_COMPONENT_FACTORY( chaltdetoolpolyline, ToolPolylineFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chalktoolpolyline, ToolPolylineFactory( "chalk" ) )
 
 
 ToolPolyline::ToolPolyline(TQObject *parent, const char *name, const TQStringList &)
diff --git a/chalk/plugins/tools/tool_selectsimilar/Makefile.am b/chalk/plugins/tools/tool_selectsimilar/Makefile.am
index c7ac5a2e..84bb341e 100644
--- a/chalk/plugins/tools/tool_selectsimilar/Makefile.am
+++ b/chalk/plugins/tools/tool_selectsimilar/Makefile.am
@@ -1,4 +1,4 @@
-kde_services_DATA = chaltdetoolselectsimilar.desktop
+kde_services_DATA = chalktoolselectsimilar.desktop
 
 INCLUDES  =  -I$(srcdir)/../../../sdk \
 	-I$(srcdir)/../../../core \
@@ -9,18 +9,18 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(all_includes)
 
 
-chaltdetoolselectsimilar_la_SOURCES = selectsimilar.cc kis_tool_selectsimilar.cc
+chalktoolselectsimilar_la_SOURCES = selectsimilar.cc kis_tool_selectsimilar.cc
 noinst_HEADERS = selectsimilar.h kis_tool_selectsimilar.h
 
-kde_module_LTLIBRARIES = chaltdetoolselectsimilar.la
+kde_module_LTLIBRARIES = chalktoolselectsimilar.la
 
-chaltdetoolselectsimilar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
-chaltdetoolselectsimilar_la_LIBADD =  ../../../libchalkcommon.la \
+chalktoolselectsimilar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalktoolselectsimilar_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
 
-chaltdetoolselectsimilar_la_METASOURCES = AUTO
+chalktoolselectsimilar_la_METASOURCES = AUTO
 
 KDE_OPTIONS = nofinal
 
diff --git a/chalk/plugins/tools/tool_selectsimilar/chaltdetoolselectsimilar.desktop b/chalk/plugins/tools/tool_selectsimilar/chalktoolselectsimilar.desktop
index 32d28701..cc83dccc 100644
--- a/chalk/plugins/tools/tool_selectsimilar/chaltdetoolselectsimilar.desktop
+++ b/chalk/plugins/tools/tool_selectsimilar/chalktoolselectsimilar.desktop
@@ -39,5 +39,5 @@ Name[zh_CN]=选择相似颜色工具
 Name[zh_TW]=選取近似色彩工具
 ServiceTypes=Chalk/Tool
 Type=Service
-X-TDE-Library=chaltdetoolselectsimilar
+X-TDE-Library=chalktoolselectsimilar
 X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc
index 85cf98be..95c315d8 100644
--- a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc
+++ b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc
@@ -39,7 +39,7 @@
 #include "kis_tool_selectsimilar.h"
 
 typedef KGenericFactory<SelectSimilar> SelectSimilarFactory;
-K_EXPORT_COMPONENT_FACTORY( chaltdetoolselectsimilar, SelectSimilarFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chalktoolselectsimilar, SelectSimilarFactory( "chalk" ) )
 
 SelectSimilar::SelectSimilar(TQObject *parent, const char *name, const TQStringList &)
     : KParts::Plugin(parent, name)
diff --git a/chalk/plugins/tools/tool_star/Makefile.am b/chalk/plugins/tools/tool_star/Makefile.am
index c3de3a0d..c8f65857 100644
--- a/chalk/plugins/tools/tool_star/Makefile.am
+++ b/chalk/plugins/tools/tool_star/Makefile.am
@@ -1,4 +1,4 @@
-kde_services_DATA = chaltdetoolstar.desktop
+kde_services_DATA = chalktoolstar.desktop
 
 # all_includes must remain last!
 INCLUDES =  -I$(srcdir)/../../../sdk \
@@ -9,25 +9,25 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chaltdetoolstar_la_SOURCES = \
+chalktoolstar_la_SOURCES = \
 	wdg_tool_star.ui \
         tool_star.cc \
 	kis_tool_star.cc 
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = chaltdetoolstar.la
+kde_module_LTLIBRARIES = chalktoolstar.la
 
 noinst_HEADERS = \
 	tool_star.h \
 	kis_tool_star.h 
 
-chaltdetoolstar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
-chaltdetoolstar_la_LIBADD =  ../../../libchalkcommon.la \
+chalktoolstar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalktoolstar_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
 
-chaltdetoolstar_la_METASOURCES = AUTO
+chalktoolstar_la_METASOURCES = AUTO
 
 KDE_OPTIONS = nofinal
 
diff --git a/chalk/plugins/tools/tool_star/chaltdetoolstar.desktop b/chalk/plugins/tools/tool_star/chalktoolstar.desktop
index 0f6bc2eb..f2b68b7a 100644
--- a/chalk/plugins/tools/tool_star/chaltdetoolstar.desktop
+++ b/chalk/plugins/tools/tool_star/chalktoolstar.desktop
@@ -48,5 +48,5 @@ Name[zh_CN]=星形工具
 Name[zh_TW]=星形工具
 ServiceTypes=Chalk/Tool
 Type=Service
-X-TDE-Library=chaltdetoolstar
+X-TDE-Library=chalktoolstar
 X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_star/tool_star.cc b/chalk/plugins/tools/tool_star/tool_star.cc
index 040eaf99..dc40edf9 100644
--- a/chalk/plugins/tools/tool_star/tool_star.cc
+++ b/chalk/plugins/tools/tool_star/tool_star.cc
@@ -39,7 +39,7 @@
 
 
 typedef KGenericFactory<ToolStar> ToolStarFactory;
-K_EXPORT_COMPONENT_FACTORY( chaltdetoolstar, ToolStarFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chalktoolstar, ToolStarFactory( "chalk" ) )
 
 
 ToolStar::ToolStar(TQObject *parent, const char *name, const TQStringList &)
diff --git a/chalk/plugins/tools/tool_transform/Makefile.am b/chalk/plugins/tools/tool_transform/Makefile.am
index 016988f8..78aab31b 100644
--- a/chalk/plugins/tools/tool_transform/Makefile.am
+++ b/chalk/plugins/tools/tool_transform/Makefile.am
@@ -1,4 +1,4 @@
-kde_services_DATA = chaltdetooltransform.desktop
+kde_services_DATA = chalktooltransform.desktop
 
 # all_includes must remain last!
 INCLUDES =  -I$(srcdir)/../../../sdk \
@@ -9,25 +9,25 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chaltdetooltransform_la_SOURCES = \
+chalktooltransform_la_SOURCES = \
 	wdg_tool_transform.ui \
 	tool_transform.cc \
 	kis_tool_transform.cc 
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = chaltdetooltransform.la
+kde_module_LTLIBRARIES = chalktooltransform.la
 
 noinst_HEADERS = \
 	tool_transform.h \
 	kis_tool_transform.h 
 
-chaltdetooltransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
-chaltdetooltransform_la_LIBADD =  ../../../libchalkcommon.la \
+chalktooltransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalktooltransform_la_LIBADD =  ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
 
-chaltdetooltransform_la_METASOURCES = AUTO
+chalktooltransform_la_METASOURCES = AUTO
 
 KDE_OPTIONS = nofinal
 
diff --git a/chalk/plugins/tools/tool_transform/chaltdetooltransform.desktop b/chalk/plugins/tools/tool_transform/chalktooltransform.desktop
index 74a2eebe..48fe8042 100644
--- a/chalk/plugins/tools/tool_transform/chaltdetooltransform.desktop
+++ b/chalk/plugins/tools/tool_transform/chalktooltransform.desktop
@@ -42,5 +42,5 @@ Name[zh_CN]=变形工具
 Name[zh_TW]=變形工具
 ServiceTypes=Chalk/Tool
 Type=Service
-X-TDE-Library=chaltdetooltransform
+X-TDE-Library=chalktooltransform
 X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_transform/tool_transform.cc b/chalk/plugins/tools/tool_transform/tool_transform.cc
index a5aead78..32810020 100644
--- a/chalk/plugins/tools/tool_transform/tool_transform.cc
+++ b/chalk/plugins/tools/tool_transform/tool_transform.cc
@@ -39,7 +39,7 @@
 
 
 typedef KGenericFactory<ToolTransform> ToolTransformFactory;
-K_EXPORT_COMPONENT_FACTORY( chaltdetooltransform, ToolTransformFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chalktooltransform, ToolTransformFactory( "chalk" ) )
 
 
 ToolTransform::ToolTransform(TQObject *parent, const char *name, const TQStringList &)
diff --git a/chalk/plugins/viewplugins/scripting/Makefile.am b/chalk/plugins/viewplugins/scripting/Makefile.am
index 39c37392..7d7e76b8 100644
--- a/chalk/plugins/viewplugins/scripting/Makefile.am
+++ b/chalk/plugins/viewplugins/scripting/Makefile.am
@@ -1,9 +1,9 @@
-SUBDIRS = chaltdescripting chalkcore samples
+SUBDIRS = chalkscripting chalkcore samples
 
 chalkrcdir = $(kde_datadir)/chalkplugins
 chalkrc_DATA = scripting.rc
 
-kde_services_DATA = chaltdescripting.desktop
+kde_services_DATA = chalkscripting.desktop
 
 
 INCLUDES  =  -I$(top_srcdir)/chalk/sdk \
@@ -15,17 +15,17 @@ INCLUDES  =  -I$(top_srcdir)/chalk/sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chaltdescripting_la_SOURCES = scripting.cc
+chalkscripting_la_SOURCES = scripting.cc
 
-kde_module_LTLIBRARIES = chaltdescripting.la
+kde_module_LTLIBRARIES = chalkscripting.la
 noinst_HEADERS = scripting.h
 
-chaltdescripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
-chaltdescripting_la_LIBADD = $(LIB_KOFFICEUI) $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la ./chaltdescripting/libchaltdescripting.la \
+chalkscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkscripting_la_LIBADD = $(LIB_KOFFICEUI) $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la ./chalkscripting/libchalkscripting.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
 
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 
-chaltdescripting_la_METASOURCES = AUTO
+chalkscripting_la_METASOURCES = AUTO
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am b/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am
index b56a3d06..570154ba 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/core -I$(top_srcdir)/chalk/plugins/viewplugins/scripting/chaltdescripting \
+INCLUDES = -I$(top_srcdir)/core -I$(top_srcdir)/chalk/plugins/viewplugins/scripting/chalkscripting \
 	-I$(top_srcdir)/chalk $(KOFFICECORE_INCLUDES) $(KROSS_INCLUDES) \
 	-I$(top_srcdir)/chalk/ui -I$(top_srcdir)/chalk/core -I$(top_srcdir)/chalk/sdk \
 	-I$(top_srcdir)/chalk/chalkcolor $(all_includes)
@@ -19,7 +19,7 @@ krosschalkcore_la_LIBADD = \
     $(top_builddir)/lib/kross/api/libkrossapi.la \
     $(top_builddir)/lib/kross/main/libkrossmain.la \
     $(top_builddir)/chalk/libchalkcommon.la \
-    $(top_builddir)/chalk/plugins/viewplugins/scripting/chaltdescripting/libchaltdescripting.la \
+    $(top_builddir)/chalk/plugins/viewplugins/scripting/chalkscripting/libchalkscripting.la \
     ../../../../../chalk/chalkcolor/libchalkcolor.la \
     ../../../../../chalk/core/libchalkimage.la \
     ../../../../../chalk/ui/libchalkui.la
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp
index d137ab8c..45c1705a 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp
@@ -247,11 +247,11 @@ ChalkCoreModule::ChalkCoreModule(Kross::Api::Manager* manager)
     }
    // Wrap ChalkScriptProgress
     TQString packagePath;
-    Kross::Api::Object::Ptr chaltdescriptprogress = manager->getChild("ChalkScriptProgress");
+    Kross::Api::Object::Ptr chalkscriptprogress = manager->getChild("ChalkScriptProgress");
     if(chalkdocument) {
-        Kross::Api::QtObject* chaltdescriptprogressqt = (Kross::Api::QtObject*)( chaltdescriptprogress.data() );
-        if(chaltdescriptprogressqt) {
-                ::KisScriptProgress* scriptprogress = (::KisScriptProgress*)( chaltdescriptprogressqt->getObject() );
+        Kross::Api::QtObject* chalkscriptprogressqt = (Kross::Api::QtObject*)( chalkscriptprogress.data() );
+        if(chalkscriptprogressqt) {
+                ::KisScriptProgress* scriptprogress = (::KisScriptProgress*)( chalkscriptprogressqt->getObject() );
                 scriptprogress->activateAsSubject();
                 packagePath = scriptprogress->packagePath();
                 if(scriptprogress) {
diff --git a/chalk/plugins/viewplugins/scripting/chaltdescripting.desktop b/chalk/plugins/viewplugins/scripting/chalkscripting.desktop
index c4267097..eba3ea37 100644
--- a/chalk/plugins/viewplugins/scripting/chaltdescripting.desktop
+++ b/chalk/plugins/viewplugins/scripting/chalkscripting.desktop
@@ -77,5 +77,5 @@ Comment[zh_CN]=允许执行脚本
 Comment[zh_TW]=允許執行命令稿
 ServiceTypes=Chalk/ViewPlugin
 Type=Service
-X-TDE-Library=chaltdescripting
+X-TDE-Library=chalkscripting
 X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/Makefile.am b/chalk/plugins/viewplugins/scripting/chalkscripting/Makefile.am
new file mode 100644
index 00000000..b805ef18
--- /dev/null
+++ b/chalk/plugins/viewplugins/scripting/chalkscripting/Makefile.am
@@ -0,0 +1,19 @@
+INCLUDES  =  -I$(top_srcdir)/chalk/sdk \
+	-I$(top_srcdir)/chalk/core \
+	-I$(top_srcdir)/chalk/chalkcolor/ \
+	-I$(top_srcdir)/chalk/ui \
+	$(KROSS_INCLUDES) \
+	$(KOFFICE_INCLUDES) \
+	$(all_includes)
+
+
+lib_LTLIBRARIES = libchalkscripting.la
+libchalkscripting_la_SOURCES = kis_script_progress.cpp kis_script_monitor.cpp
+noinst_HEADERS = kis_script_progress.h
+
+libchalkscripting_la_LDFLAGS = -no-undefined $(all_libraries)
+libchalkscripting_la_LIBADD =  $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la
+
+KDE_CXXFLAGS = $(USE_EXCEPTIONS)
+
+libchalkscripting_la_METASOURCES = AUTO
diff --git a/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.cpp b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.cpp
index 3967ffe7..3967ffe7 100644
--- a/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.cpp
+++ b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.cpp
diff --git a/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.h b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.h
index b2495d8b..b2495d8b 100644
--- a/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.h
+++ b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.h
diff --git a/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.cpp b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.cpp
index d7af4eb4..d7af4eb4 100644
--- a/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.cpp
+++ b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.cpp
diff --git a/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.h b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.h
index 48af433c..48af433c 100644
--- a/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.h
+++ b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.h
diff --git a/chalk/plugins/viewplugins/scripting/chaltdescripting/Makefile.am b/chalk/plugins/viewplugins/scripting/chaltdescripting/Makefile.am
deleted file mode 100644
index a38d8df0..00000000
--- a/chalk/plugins/viewplugins/scripting/chaltdescripting/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-INCLUDES  =  -I$(top_srcdir)/chalk/sdk \
-	-I$(top_srcdir)/chalk/core \
-	-I$(top_srcdir)/chalk/chalkcolor/ \
-	-I$(top_srcdir)/chalk/ui \
-	$(KROSS_INCLUDES) \
-	$(KOFFICE_INCLUDES) \
-	$(all_includes)
-
-
-lib_LTLIBRARIES = libchaltdescripting.la
-libchaltdescripting_la_SOURCES = kis_script_progress.cpp kis_script_monitor.cpp
-noinst_HEADERS = kis_script_progress.h
-
-libchaltdescripting_la_LDFLAGS = -no-undefined $(all_libraries)
-libchaltdescripting_la_LIBADD =  $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la
-
-KDE_CXXFLAGS = $(USE_EXCEPTIONS)
-
-libchaltdescripting_la_METASOURCES = AUTO
diff --git a/chalk/plugins/viewplugins/scripting/scripting.cc b/chalk/plugins/viewplugins/scripting/scripting.cc
index 1a795434..c7e1db5f 100644
--- a/chalk/plugins/viewplugins/scripting/scripting.cc
+++ b/chalk/plugins/viewplugins/scripting/scripting.cc
@@ -48,11 +48,11 @@
 #include <kis_image.h>
 #include <kis_layer.h>
 
-#include "chaltdescripting/kis_script_progress.h"
-#include "chaltdescripting/kis_script_monitor.h"
+#include "chalkscripting/kis_script_progress.h"
+#include "chalkscripting/kis_script_monitor.h"
 
 typedef KGenericFactory<Scripting> ChalkScriptingFactory;
-K_EXPORT_COMPONENT_FACTORY( chaltdescripting, ChalkScriptingFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chalkscripting, ChalkScriptingFactory( "chalk" ) )
 
 Scripting::Scripting(TQObject *parent, const char *name, const TQStringList &)
         : KParts::Plugin(parent, name)
diff --git a/chalk/plugins/viewplugins/scripting/scripting.rc b/chalk/plugins/viewplugins/scripting/scripting.rc
index b4978b4c..1b4999df 100644
--- a/chalk/plugins/viewplugins/scripting/scripting.rc
+++ b/chalk/plugins/viewplugins/scripting/scripting.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui library="chaltdescripting" version="3">
+<kpartgui library="chalkscripting" version="3">
   <MenuBar>
     <Menu name="Scripts"><text>S&amp;cripts</text>
       <Separator/>
diff --git a/chalk/plugins/viewplugins/selectopaque/Makefile.am b/chalk/plugins/viewplugins/selectopaque/Makefile.am
index 295f6980..20333271 100644
--- a/chalk/plugins/viewplugins/selectopaque/Makefile.am
+++ b/chalk/plugins/viewplugins/selectopaque/Makefile.am
@@ -5,23 +5,23 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-kde_module_LTLIBRARIES = chaltdeselectopaque.la
+kde_module_LTLIBRARIES = chalkselectopaque.la
 
-chaltdeselectopaque_la_SOURCES = selectopaque.cc 
+chalkselectopaque_la_SOURCES = selectopaque.cc 
 noinst_HEADERS = selectopaque.h
 
-chaltdeselectopaque_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
+chalkselectopaque_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
-chaltdeselectopaque_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chalkselectopaque_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 
 chalkrcdir = $(kde_datadir)/chalkplugins
 chalkrc_DATA = selectopaque.rc
 EXTRA_DIST = $(chalkrc_DATA)
 
-kde_services_DATA = chaltdeselectopaque.desktop
+kde_services_DATA = chalkselectopaque.desktop
 
-chaltdeselectopaque_la_METASOURCES = AUTO
+chalkselectopaque_la_METASOURCES = AUTO
 
 KDE_OPTIONS = nofinal
diff --git a/chalk/plugins/viewplugins/selectopaque/chaltdeselectopaque.desktop b/chalk/plugins/viewplugins/selectopaque/chalkselectopaque.desktop
index db8e883c..654e809c 100644
--- a/chalk/plugins/viewplugins/selectopaque/chaltdeselectopaque.desktop
+++ b/chalk/plugins/viewplugins/selectopaque/chalkselectopaque.desktop
@@ -22,5 +22,5 @@ Name[uk]=Виділення непрозорих ділянок
 Name[zh_TW]=選擇不透明
 ServiceTypes=Chalk/ViewPlugin
 Type=Service
-X-TDE-Library=chaltdeselectopaque
+X-TDE-Library=chalkselectopaque
 X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc b/chalk/plugins/viewplugins/selectopaque/selectopaque.cc
index ced4fd9a..57e32dce 100644
--- a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc
+++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.cc
@@ -51,7 +51,7 @@
 #include "selectopaque.h"
 
 typedef KGenericFactory<SelectOpaque> SelectOpaqueFactory;
-K_EXPORT_COMPONENT_FACTORY( chaltdeselectopaque, SelectOpaqueFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chalkselectopaque, SelectOpaqueFactory( "chalk" ) )
 
 SelectOpaque::SelectOpaque(TQObject *parent, const char *name, const TQStringList &)
     : KParts::Plugin(parent, name)
diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.rc b/chalk/plugins/viewplugins/selectopaque/selectopaque.rc
index 6ff21abf..a4809d59 100644
--- a/chalk/plugins/viewplugins/selectopaque/selectopaque.rc
+++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui library="chaltdeselectopaque" version="1">
+<kpartgui library="chalkselectopaque" version="1">
 <MenuBar>
     <Menu name="Select"><text>Select</text>
 	<Separator/>
diff --git a/configure.in b/configure.in
index bd9118ed..3a6899bd 100644
--- a/configure.in
+++ b/configure.in
@@ -2120,7 +2120,7 @@ AC_CONFIG_FILES([ chalk/plugins/viewplugins/rotateimage/Makefile ])
 AC_CONFIG_FILES([ chalk/plugins/viewplugins/screenshot/Makefile ])
 AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/Makefile ])
 AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/chalkcore/Makefile ])
-AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/chaltdescripting/Makefile ])
+AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/chalkscripting/Makefile ])
 AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/samples/Makefile ])
 AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/samples/python/Makefile ])
 AC_CONFIG_FILES([ chalk/plugins/viewplugins/scripting/samples/ruby/Makefile ])
diff --git a/doc/chalk/developers-plugins.docbook b/doc/chalk/developers-plugins.docbook
index 8b31aa96..029af8d7 100644
--- a/doc/chalk/developers-plugins.docbook
+++ b/doc/chalk/developers-plugins.docbook
@@ -306,7 +306,7 @@ And an implementation file:
 
 
 typedef KGenericFactory&lt;ToolStar&gt; ToolStarFactory;
-K_EXPORT_COMPONENT_FACTORY( chaltdetoolstar, ToolStarFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chalktoolstar, ToolStarFactory( "chalk" ) )
 
 
 ToolStar::ToolStar(QObject *parent, const char *name, const QStringList &amp;)
@@ -880,7 +880,7 @@ A good example of a tool is the star tool:
 <screen>
 kis_tool_star.cc       Makefile.am   tool_star_cursor.png  wdg_tool_star.ui
 kis_tool_star.h        Makefile.in   tool_star.h           
-chaltdetoolstar.desktop  tool_star.cc  tool_star.png         
+chalktoolstar.desktop  tool_star.cc  tool_star.png         
 </screen>
 
 <para>
diff --git a/kplato/reports/Makefile.am b/kplato/reports/Makefile.am
index 28130aef..4768252a 100644
--- a/kplato/reports/Makefile.am
+++ b/kplato/reports/Makefile.am
@@ -1,7 +1,7 @@
 kplatoreportdir = $(kde_datadir)/kplato/reports
-kplatoreport_DATA = resourcelist.desktop tastdelist.desktop
+kplatoreport_DATA = resourcelist.desktop tasklist.desktop
 
 kplatoreportsourcedir = $(kde_datadir)/kplato/reports/.source
-kplatoreportsource_DATA = resourcelist.ktf tastdelist.ktf
+kplatoreportsource_DATA = resourcelist.ktf tasklist.ktf
 
 EXTRA_DIST = $(kplatoreport_DATA)
diff --git a/kplato/reports/tastdelist.desktop b/kplato/reports/tasklist.desktop
index 0b23d166..aaa2b7f3 100644
--- a/kplato/reports/tastdelist.desktop
+++ b/kplato/reports/tasklist.desktop
@@ -42,5 +42,5 @@ Name[uz@cyrillic]=Вазифалар рўйхати
 Name[zh_CN]=任务列表
 Name[zh_TW]=工作清單
 Type=Link
-URL= .source/tastdelist.ktf
+URL= .source/tasklist.ktf
 X-TDE-Hidden=false
diff --git a/kplato/reports/tastdelist.ktf b/kplato/reports/tasklist.ktf
index ecfceb57..ecfceb57 100644
--- a/kplato/reports/tastdelist.ktf
+++ b/kplato/reports/tasklist.ktf