diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb018e5..acd1313 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,7 @@ if (NOT builddebug)
 endif(NOT builddebug)
 
 
-# Get the kde3 dir. This is a bit tricky, i'm not sure how well
+# Get the trinity dir. This is a bit tricky, i'm not sure how well
 # this works on other systems.
 STRING(REPLACE "/lib" "" KDE3_DIR ${KDE3_LIB_DIR})
 
@@ -68,7 +68,7 @@ set(KDE3_SERVICETYPES_DIR ${CMAKE_INSTALL_PREFIX}/share/servicetypes)
 set(KDE3_SERVICES_DIR ${CMAKE_INSTALL_PREFIX}/share/services)
 set(KDE3_XDG_APPS_DIR ${CMAKE_INSTALL_PREFIX}/share/applications/kde)
 set(KDE3_LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib)
-set(KDE3_PLUGIN_INSTALL_DIR ${KDE3_LIB_INSTALL_DIR}/kde3)
+set(KDE3_PLUGIN_INSTALL_DIR ${KDE3_LIB_INSTALL_DIR}/trinity)
 
 # tell cmake where to search for libraries:
 link_directories(${KDE3_LIB_DIR})
diff --git a/ChangeLog b/ChangeLog
index 01da1b8..3fbf380 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1036,7 +1036,7 @@ KPilot Developer's notes for July 9th
 
 2003-7-5  Adriaan de Groot
 * Renamed all conduit plugins from lib<bla>conduit (and variants) to
-  conduit_<bla>, so that they're easier to identify in $KDEDIR/lib/kde3.
+  conduit_<bla>, so that they're easier to identify in $KDEDIR/lib/trinity.
   Of course, this doesn't work right. Feh.
 * Removed listCat again.
 * Implemented a notion of "internal conduit", so that we can move
diff --git a/Documentation/ConduitProgrammingTutorial/index.tex b/Documentation/ConduitProgrammingTutorial/index.tex
index aed082e..66b17f3 100644
--- a/Documentation/ConduitProgrammingTutorial/index.tex
+++ b/Documentation/ConduitProgrammingTutorial/index.tex
@@ -147,7 +147,7 @@ From your system's point of view, a conduit is a shared library which is loaded
 on demand by KPilot. This means that as long as you don't do a sync, the conduit will not 
 be in memory. Once a hotsync is initiated, kpilotDaemon (the process running in 
 the background that does the actual sync) loads the conduit, let's say its name 
-is "malconduit" and it is installed as /opt/kde3/lib/kde3/libmalconduit.so. It 
+is "malconduit" and it is installed as /opt/trinity/lib/trinity/libmalconduit.so. It 
 then calls the function \code{init\_libmalconduit} (the name after init\_ is the 
 filename of the library), which needs to return a pointer to an instance 
 of a \class{KLibFactory} subclass. 
diff --git a/conduits/abbrowserconduit/CMakeLists.txt b/conduits/abbrowserconduit/CMakeLists.txt
index 2459d1d..dc159c9 100644
--- a/conduits/abbrowserconduit/CMakeLists.txt
+++ b/conduits/abbrowserconduit/CMakeLists.txt
@@ -19,9 +19,9 @@ set(conduit_abbrowser_KCFGS
 	abbrowserSettings.kcfgc
 )
 
-kde3_add_kcfg_files(conduit_abbrowser_SRCS ${conduit_abbrowser_KCFGS})
-kde3_add_ui_files(conduit_abbrowser_SRCS ${conduit_abbrowser_UIS})
-kde3_automoc(${conduit_abbrowser_SRCS})
+trinity_add_kcfg_files(conduit_abbrowser_SRCS ${conduit_abbrowser_KCFGS})
+trinity_add_ui_files(conduit_abbrowser_SRCS ${conduit_abbrowser_UIS})
+trinity_automoc(${conduit_abbrowser_SRCS})
 add_library(conduit_address SHARED ${conduit_abbrowser_SRCS})
 target_link_libraries(conduit_address kabc_file kabc)
 set_target_properties(conduit_address PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
@@ -29,7 +29,7 @@ set_target_properties(conduit_address PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_
 	PREFIX ""
 )
 
-kde3_install_libtool_file(conduit_address)
+trinity_install_libtool_file(conduit_address)
 
 install(
 	TARGETS conduit_address
diff --git a/conduits/docconduit/CMakeLists.txt b/conduits/docconduit/CMakeLists.txt
index fa87eb0..e2441f6 100644
--- a/conduits/docconduit/CMakeLists.txt
+++ b/conduits/docconduit/CMakeLists.txt
@@ -30,9 +30,9 @@ set(conduit_doc_KCFGS
 	kpalmdocSettings.kcfgc
 )
 
-kde3_add_kcfg_files(conduit_doc_SRCS ${conduit_doc_KCFGS})
-kde3_add_ui_files(conduit_doc_SRCS ${conduit_doc_UIS})
-kde3_automoc(${conduit_doc_SRCS})
+trinity_add_kcfg_files(conduit_doc_SRCS ${conduit_doc_KCFGS})
+trinity_add_ui_files(conduit_doc_SRCS ${conduit_doc_UIS})
+trinity_automoc(${conduit_doc_SRCS})
 add_library(conduit_doc SHARED ${conduit_doc_SRCS})
 
 kpilot_rpath(conduit_doc)
@@ -42,7 +42,7 @@ set_target_properties(
 	PREFIX ""
 )
 
-kde3_install_libtool_file(conduit_doc)
+trinity_install_libtool_file(conduit_doc)
 
 install(
 	TARGETS conduit_doc
@@ -54,9 +54,9 @@ set(kpalmdoc_SRCS
 	kpalmdoc_dlg.cc
 	kpalmdoc.cpp
 )
-kde3_add_kcfg_files(kpalmdoc_SRCS kpalmdocSettings.kcfgc)
-kde3_add_ui_files(kpalmdoc_SRCS kpalmdoc_dlgbase.ui)
-kde3_automoc(${kpalmdoc_SRCS})
+trinity_add_kcfg_files(kpalmdoc_SRCS kpalmdocSettings.kcfgc)
+trinity_add_ui_files(kpalmdoc_SRCS kpalmdoc_dlgbase.ui)
+trinity_automoc(${kpalmdoc_SRCS})
 add_executable(kpalmdoc ${kpalmdoc_SRCS})
 target_link_libraries(kpalmdoc ${QT_LIBRARIES} kpilot kdeui kio)
 kpilot_rpath(kpalmdoc)
diff --git a/conduits/docconduit/Icons/CMakeLists.txt b/conduits/docconduit/Icons/CMakeLists.txt
index 3d1034d..17d5a63 100644
--- a/conduits/docconduit/Icons/CMakeLists.txt
+++ b/conduits/docconduit/Icons/CMakeLists.txt
@@ -1,3 +1,3 @@
 
-kde3_install_icons_custom( hicolor )
+trinity_install_icons_custom( hicolor )
 
diff --git a/conduits/knotes/CMakeLists.txt b/conduits/knotes/CMakeLists.txt
index 568adb4..a548d7d 100644
--- a/conduits/knotes/CMakeLists.txt
+++ b/conduits/knotes/CMakeLists.txt
@@ -20,12 +20,12 @@ set(conduit_knotes_KCFGS
 #	KNotesIface.h
 #)
 
-#kde3_add_dcop_skels(conduit_knotes_SRCS ${conduit_knotes_STUBS})
-#kde3_add_dcop_stubs(conduit_knotes_SRCS ${conduit_knotes_STUBS})
+#trinity_add_dcop_skels(conduit_knotes_SRCS ${conduit_knotes_STUBS})
+#trinity_add_dcop_stubs(conduit_knotes_SRCS ${conduit_knotes_STUBS})
 
-kde3_add_kcfg_files(conduit_knotes_SRCS ${conduit_knotes_KCFGS})
-kde3_add_ui_files(conduit_knotes_SRCS ${conduit_knotes_UIS})
-kde3_automoc(${conduit_knotes_SRCS})
+trinity_add_kcfg_files(conduit_knotes_SRCS ${conduit_knotes_KCFGS})
+trinity_add_ui_files(conduit_knotes_SRCS ${conduit_knotes_UIS})
+trinity_automoc(${conduit_knotes_SRCS})
 
 add_library(conduit_knotes SHARED ${conduit_knotes_SRCS})
 target_link_libraries(conduit_knotes kcal)
@@ -36,7 +36,7 @@ set_target_properties(conduit_knotes PROPERTIES
 	PREFIX ""
 )
 
-kde3_install_libtool_file(conduit_knotes)
+trinity_install_libtool_file(conduit_knotes)
 
 install(
 	TARGETS conduit_knotes
diff --git a/conduits/malconduit/CMakeLists.txt b/conduits/malconduit/CMakeLists.txt
index 092f340..7d8a796 100644
--- a/conduits/malconduit/CMakeLists.txt
+++ b/conduits/malconduit/CMakeLists.txt
@@ -17,9 +17,9 @@ set(conduit_mal_KCFGS
 	malconduitSettings.kcfgc
 )
 
-kde3_add_kcfg_files(conduit_mal_SRCS ${conduit_mal_KCFGS})
-kde3_add_ui_files(conduit_mal_SRCS ${conduit_mal_UIS})
-kde3_automoc(${conduit_mal_SRCS})
+trinity_add_kcfg_files(conduit_mal_SRCS ${conduit_mal_KCFGS})
+trinity_add_ui_files(conduit_mal_SRCS ${conduit_mal_UIS})
+trinity_automoc(${conduit_mal_SRCS})
 add_library(conduit_mal SHARED ${conduit_mal_SRCS})
 target_link_libraries(conduit_mal ${MAL_LIBRARY})
 
@@ -31,7 +31,7 @@ set_target_properties(
 	INSTALL_RPATH_USE_LINK_PATH true
 )
 
-kde3_install_libtool_file(conduit_mal)
+trinity_install_libtool_file(conduit_mal)
 
 install(
 	TARGETS conduit_mal
diff --git a/conduits/memofileconduit/CMakeLists.txt b/conduits/memofileconduit/CMakeLists.txt
index 5699457..150efec 100644
--- a/conduits/memofileconduit/CMakeLists.txt
+++ b/conduits/memofileconduit/CMakeLists.txt
@@ -17,9 +17,9 @@ set(conduit_memofile_KCFGS
 	memofileSettings.kcfgc
 )
 
-kde3_add_kcfg_files(conduit_memofile_SRCS ${conduit_memofile_KCFGS})
-kde3_add_ui_files(conduit_memofile_SRCS ${conduit_memofile_UIS})
-kde3_automoc(${conduit_memofile_SRCS})
+trinity_add_kcfg_files(conduit_memofile_SRCS ${conduit_memofile_KCFGS})
+trinity_add_ui_files(conduit_memofile_SRCS ${conduit_memofile_UIS})
+trinity_automoc(${conduit_memofile_SRCS})
 add_library(conduit_memofile SHARED ${conduit_memofile_SRCS})
 
 set_target_properties(
@@ -28,7 +28,7 @@ set_target_properties(
 	PREFIX ""
 )
 
-kde3_install_libtool_file(conduit_memofile)
+trinity_install_libtool_file(conduit_memofile)
 
 install(
 	TARGETS conduit_memofile
diff --git a/conduits/notepadconduit/CMakeLists.txt b/conduits/notepadconduit/CMakeLists.txt
index 90e202d..619df0f 100644
--- a/conduits/notepadconduit/CMakeLists.txt
+++ b/conduits/notepadconduit/CMakeLists.txt
@@ -15,9 +15,9 @@ set(conduit_notepad_KCFGS
 	notepadconduit.kcfgc
 )
 
-kde3_add_kcfg_files(conduit_notepad_SRCS ${conduit_notepad_KCFGS})
-kde3_add_ui_files(conduit_notepad_SRCS ${conduit_notepad_UIS})
-kde3_automoc(${conduit_notepad_SRCS})
+trinity_add_kcfg_files(conduit_notepad_SRCS ${conduit_notepad_KCFGS})
+trinity_add_ui_files(conduit_notepad_SRCS ${conduit_notepad_UIS})
+trinity_automoc(${conduit_notepad_SRCS})
 add_library(conduit_notepad SHARED ${conduit_notepad_SRCS})
 
 set_target_properties(
@@ -26,7 +26,7 @@ set_target_properties(
 	PREFIX ""
 )
 
-kde3_install_libtool_file(conduit_notepad)
+trinity_install_libtool_file(conduit_notepad)
 
 install(
 	TARGETS conduit_notepad
diff --git a/conduits/null/CMakeLists.txt b/conduits/null/CMakeLists.txt
index b2fdbb8..4da5255 100644
--- a/conduits/null/CMakeLists.txt
+++ b/conduits/null/CMakeLists.txt
@@ -15,9 +15,9 @@ set(conduit_null_KCFGS
 	nullSettings.kcfgc
 )
 
-kde3_add_kcfg_files(conduit_null_SRCS ${conduit_null_KCFGS})
-kde3_add_ui_files(conduit_null_SRCS ${conduit_null_UIS})
-kde3_automoc(${conduit_null_SRCS})
+trinity_add_kcfg_files(conduit_null_SRCS ${conduit_null_KCFGS})
+trinity_add_ui_files(conduit_null_SRCS ${conduit_null_UIS})
+trinity_automoc(${conduit_null_SRCS})
 add_library(conduit_null SHARED ${conduit_null_SRCS})
 
 set_target_properties(
@@ -26,7 +26,7 @@ set_target_properties(
 	PREFIX ""
 )
 
-kde3_install_libtool_file(conduit_null)
+trinity_install_libtool_file(conduit_null)
 
 install(
 	TARGETS conduit_null
diff --git a/conduits/popmail/CMakeLists.txt b/conduits/popmail/CMakeLists.txt
index daec3c3..388e59d 100644
--- a/conduits/popmail/CMakeLists.txt
+++ b/conduits/popmail/CMakeLists.txt
@@ -16,9 +16,9 @@ set(conduit_popmail_KCFGS
 	popmailSettings.kcfgc
 )
 
-kde3_add_kcfg_files(conduit_popmail_SRCS ${conduit_popmail_KCFGS})
-kde3_add_ui_files(conduit_popmail_SRCS ${conduit_popmail_UIS})
-kde3_automoc(${conduit_popmail_SRCS})
+trinity_add_kcfg_files(conduit_popmail_SRCS ${conduit_popmail_KCFGS})
+trinity_add_ui_files(conduit_popmail_SRCS ${conduit_popmail_UIS})
+trinity_automoc(${conduit_popmail_SRCS})
 add_library(conduit_popmail SHARED ${conduit_popmail_SRCS})
 
 set_target_properties(
@@ -27,7 +27,7 @@ set_target_properties(
 	PREFIX ""
 )
 
-kde3_install_libtool_file(conduit_popmail)
+trinity_install_libtool_file(conduit_popmail)
 
 install(
 	TARGETS conduit_popmail
diff --git a/conduits/sysinfoconduit/CMakeLists.txt b/conduits/sysinfoconduit/CMakeLists.txt
index cae6d89..67ba3c9 100644
--- a/conduits/sysinfoconduit/CMakeLists.txt
+++ b/conduits/sysinfoconduit/CMakeLists.txt
@@ -16,9 +16,9 @@ set(conduit_sysinfo_KCFGS
 	sysinfoSettings.kcfgc
 )
 
-kde3_add_kcfg_files(conduit_sysinfo_SRCS ${conduit_sysinfo_KCFGS})
-kde3_add_ui_files(conduit_sysinfo_SRCS ${conduit_sysinfo_UIS})
-kde3_automoc(${conduit_sysinfo_SRCS})
+trinity_add_kcfg_files(conduit_sysinfo_SRCS ${conduit_sysinfo_KCFGS})
+trinity_add_ui_files(conduit_sysinfo_SRCS ${conduit_sysinfo_UIS})
+trinity_automoc(${conduit_sysinfo_SRCS})
 add_library(conduit_sysinfo SHARED ${conduit_sysinfo_SRCS})
 
 set_target_properties(
@@ -27,7 +27,7 @@ set_target_properties(
 	PREFIX ""
 )
 
-kde3_install_libtool_file(conduit_sysinfo)
+trinity_install_libtool_file(conduit_sysinfo)
 
 install(
 	TARGETS conduit_sysinfo
diff --git a/conduits/timeconduit/CMakeLists.txt b/conduits/timeconduit/CMakeLists.txt
index e980e72..5063a0f 100644
--- a/conduits/timeconduit/CMakeLists.txt
+++ b/conduits/timeconduit/CMakeLists.txt
@@ -16,9 +16,9 @@ set(conduit_time_KCFGS
 	timeConduitSettings.kcfgc
 )
 
-kde3_add_kcfg_files(conduit_time_SRCS ${conduit_time_KCFGS})
-kde3_add_ui_files(conduit_time_SRCS ${conduit_time_UIS})
-kde3_automoc(${conduit_time_SRCS})
+trinity_add_kcfg_files(conduit_time_SRCS ${conduit_time_KCFGS})
+trinity_add_ui_files(conduit_time_SRCS ${conduit_time_UIS})
+trinity_automoc(${conduit_time_SRCS})
 add_library(conduit_time SHARED ${conduit_time_SRCS})
 
 kpilot_rpath(conduit_time)
@@ -28,7 +28,7 @@ set_target_properties(
 	PREFIX ""
 )
 
-kde3_install_libtool_file(conduit_time)
+trinity_install_libtool_file(conduit_time)
 
 install(
 	TARGETS conduit_time
diff --git a/conduits/vcalconduit/CMakeLists.txt b/conduits/vcalconduit/CMakeLists.txt
index 2148235..caa5d3a 100644
--- a/conduits/vcalconduit/CMakeLists.txt
+++ b/conduits/vcalconduit/CMakeLists.txt
@@ -19,8 +19,8 @@ set(conduit_SHARED
 	todoRecord.cc
 )
 
-kde3_add_kcfg_files(conduit_SHARED vcalconduitSettings.kcfgc)
-kde3_add_ui_files(conduit_SHARED korganizerConduit.ui)
+trinity_add_kcfg_files(conduit_SHARED vcalconduitSettings.kcfgc)
+trinity_add_ui_files(conduit_SHARED korganizerConduit.ui)
 
 set(conduit_vcal_SRCS
 	${conduit_SHARED}
@@ -29,7 +29,7 @@ set(conduit_vcal_SRCS
 	vcal-setup.cc
 )
 
-kde3_automoc(${conduit_vcal_SRCS})
+trinity_automoc(${conduit_vcal_SRCS})
 add_library(conduit_vcal SHARED ${conduit_vcal_SRCS})
 target_link_libraries(conduit_vcal kcal)
 
@@ -40,7 +40,7 @@ set(conduit_todo_SRCS
 	todo-conduit.cc
 )
 
-kde3_automoc(${conduit_todo_SRCS})
+trinity_automoc(${conduit_todo_SRCS})
 add_library(conduit_todo SHARED ${conduit_todo_SRCS})
 target_link_libraries(conduit_todo kcal)
 
@@ -55,7 +55,7 @@ set_target_properties(
 	PREFIX ""
 )
 
-kde3_install_libtool_file(conduit_vcal)
+trinity_install_libtool_file(conduit_vcal)
 
 install(
 	TARGETS conduit_vcal conduit_todo
@@ -63,7 +63,7 @@ install(
 	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
 )
 
-kde3_install_libtool_file(conduit_todo)
+trinity_install_libtool_file(conduit_todo)
 
 install(
 	FILES vcal-conduit.desktop todo-conduit.desktop
diff --git a/kpilot/CMakeLists.txt b/kpilot/CMakeLists.txt
index 9be2446..2c6df15 100644
--- a/kpilot/CMakeLists.txt
+++ b/kpilot/CMakeLists.txt
@@ -17,7 +17,7 @@ set(settings_SRC
 	kpilotConfig.cc
 )
 
-kde3_add_kcfg_files(settings_SRC kpilotSettings.kcfgc)
+trinity_add_kcfg_files(settings_SRC kpilotSettings.kcfgc)
 
 ###
 #
@@ -49,10 +49,10 @@ set(kcmpilot_UIS
 	dbSelection_base.ui
 )
 
-kde3_add_ui_files(kcmpilot_SRCS ${kcmpilot_UIS})
-kde3_add_kcfg_files(kcmpilot_SRCS ${kcmpilot_KCFGS})
-kde3_add_dcop_stubs(kcmpilot_SRCS pilotDaemonDCOP.h)
-kde3_automoc(${kcmpilot_SRCS})
+trinity_add_ui_files(kcmpilot_SRCS ${kcmpilot_UIS})
+trinity_add_kcfg_files(kcmpilot_SRCS ${kcmpilot_KCFGS})
+trinity_add_dcop_stubs(kcmpilot_SRCS pilotDaemonDCOP.h)
+trinity_automoc(${kcmpilot_SRCS})
 
 # Now add these generated files to the ADD_LIBRARY step
 # If this is NOT done, then the ui_*.h files will not be generated
@@ -75,9 +75,9 @@ set(kpilotTest_SRCS
 	main-test.cc
 )
 # Acts as a receiver for DCOP log messages
-kde3_add_dcop_skels(kpilotTest_SRCS loggerDCOP.h)
+trinity_add_dcop_skels(kpilotTest_SRCS loggerDCOP.h)
 
-kde3_automoc(${kpilotTest_SRCS})
+trinity_automoc(${kpilotTest_SRCS})
 add_executable(kpilotTest ${kpilotTest_SRCS})
 target_link_libraries(kpilotTest ${QT_LIBRARIES} kpilot kdeui kio)
 kpilot_rpath(kpilotTest)
@@ -95,9 +95,9 @@ set(kpilotDaemon_SRCS
 	pilotDaemon.cc
 )
 # Both sends and receives DCOP log messages. Talks to KPilot.
-kde3_add_dcop_skels(kpilotDaemon_SRCS loggerDCOP.h pilotDaemonDCOP.h)
-kde3_add_dcop_stubs(kpilotDaemon_SRCS loggerDCOP.h kpilotDCOP.h)
-kde3_automoc(${kpilotDaemon_SRCS})
+trinity_add_dcop_skels(kpilotDaemon_SRCS loggerDCOP.h pilotDaemonDCOP.h)
+trinity_add_dcop_stubs(kpilotDaemon_SRCS loggerDCOP.h kpilotDCOP.h)
+trinity_automoc(${kpilotDaemon_SRCS})
 add_executable(kpilotDaemon ${kpilotDaemon_SRCS})
 target_link_libraries(kpilotDaemon ${QT_LIBRARIES} kpilot kdeui kio)
 kpilot_rpath(kpilotDaemon)
@@ -131,11 +131,11 @@ set(kpilot_UIS
 	todoEditor_base.ui
 )
 
-kde3_add_ui_files(kpilot_SRCS ${kpilot_UIS})
+trinity_add_ui_files(kpilot_SRCS ${kpilot_UIS})
 # Talks to the daemon. Listens as itself.
-kde3_add_dcop_skels(kpilot_SRCS loggerDCOP.h kpilotDCOP.h)
-kde3_add_dcop_stubs(kpilot_SRCS pilotDaemonDCOP.h)
-kde3_automoc(${kpilot_SRCS})
+trinity_add_dcop_skels(kpilot_SRCS loggerDCOP.h kpilotDCOP.h)
+trinity_add_dcop_stubs(kpilot_SRCS pilotDaemonDCOP.h)
+trinity_automoc(${kpilot_SRCS})
 add_executable(kpilot_bin ${kpilot_SRCS})
 target_link_libraries(kpilot_bin ${QT_LIBRARIES} kpilot kutils kdeui kio)
 kpilot_rpath(kpilot_bin)
@@ -145,7 +145,7 @@ set_target_properties(kpilot_bin PROPERTIES
 
 ######################### INSTALL STUFF #######################################
 
-kde3_install_libtool_file(kcm_kpilot)
+trinity_install_libtool_file(kcm_kpilot)
 
 install(
 	TARGETS kcm_kpilot kpilot_bin kpilotDaemon
diff --git a/kpilot/Icons/CMakeLists.txt b/kpilot/Icons/CMakeLists.txt
index b0be5ca..37ce58b 100644
--- a/kpilot/Icons/CMakeLists.txt
+++ b/kpilot/Icons/CMakeLists.txt
@@ -1,4 +1,4 @@
 
-kde3_install_icons_custom( hicolor )
+trinity_install_icons_custom( hicolor )
 
 install( FILES kpilot-splash.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/kpilot/pics/)
diff --git a/kpilot/kpilotConfig.cc b/kpilot/kpilotConfig.cc
index 35f25fa..4c96258 100644
--- a/kpilot/kpilotConfig.cc
+++ b/kpilot/kpilotConfig.cc
@@ -234,7 +234,7 @@ static void update440()
 	const char **s = oldconduits;
 	while (*s)
 	{
-		TQString libname = CSL1("kde3/lib%1conduit.so").tqarg(TQString::tqfromLatin1(*s));
+		TQString libname = CSL1("trinity/lib%1conduit.so").tqarg(TQString::tqfromLatin1(*s));
 		TQString foundlib = ::locate("lib",libname);
 		if (!foundlib.isEmpty())
 		{
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index efc36ce..a8b43b7 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -52,8 +52,8 @@ set(lib_SRCS
 	pilotTodoEntry.cc
 )
 
-kde3_automoc(${lib_SRCS})
-kde3_add_kcfg_files(lib_SRCS kpilotlibSettings.kcfgc)
+trinity_automoc(${lib_SRCS})
+trinity_add_kcfg_files(lib_SRCS kpilotlibSettings.kcfgc)
 add_library(kpilot SHARED ${lib_SRCS})
 target_link_libraries(kpilot ${PILOTLINK_LIBRARY} ${QT_LIBRARIES} kdeui kio)
 kpilot_rpath(kpilot)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b38883c..ca18a0e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -9,27 +9,27 @@ add_definitions( -DKDESRCDIR=\\"${CMAKE_CURRENT_SOURCE_DIR}\\" )
 
 
 set(testconstants_SRCS testconstants.cc)
-kde3_add_executable(testconstants ${testconstants_SRCS})
+trinity_add_executable(testconstants ${testconstants_SRCS})
 target_link_libraries(testconstants kpilot ${QT_LIBRARIES})
 add_test(testconstants ${EXECUTABLE_OUTPUT_PATH}/testconstants)
 
 set(testcategories_SRCS testcategories.cc)
-kde3_add_executable(testcategories ${testcategories_SRCS})
+trinity_add_executable(testcategories ${testcategories_SRCS})
 target_link_libraries(testcategories kpilot ${QT_LIBRARIES})
 add_test(testcategories ${EXECUTABLE_OUTPUT_PATH}/testcategories)
 
 set(testaddresses_SRCS testaddress.cc)
-kde3_add_executable(testaddresses ${testaddresses_SRCS})
+trinity_add_executable(testaddresses ${testaddresses_SRCS})
 target_link_libraries(testaddresses kpilot ${QT_LIBRARIES})
 add_test(testaddresses ${EXECUTABLE_OUTPUT_PATH}/testaddresses)
 
 set(testdatebook_SRCS testdatebook.cc)
-kde3_add_executable(testdatebook ${testdatebook_SRCS})
+trinity_add_executable(testdatebook ${testdatebook_SRCS})
 target_link_libraries(testdatebook kpilot ${QT_LIBRARIES})
 add_test(testdatebook ${EXECUTABLE_OUTPUT_PATH}/testdatebook)
 
 set(testidmapper_SRCS testidmapper.cc)
-kde3_add_executable(testidmapper ${testidmapper_SRCS})
+trinity_add_executable(testidmapper ${testidmapper_SRCS})
 target_link_libraries(testidmapper kpilot ${QT_LIBRARIES})
 add_test(testidmapper ${EXECUTABLE_OUTPUT_PATH}/testidmapper)
 
@@ -37,9 +37,9 @@ if (HAVE_CALENDARLOCAL_H)
 	set(importdatebook_SRCS importdatebook.cc)
 	set(exportdatebook_SRCS exportdatebook.cc)
 	set(mergecalendars_SRCS mergecalendars.cc)
-	kde3_add_executable(importdatebook ${importdatebook_SRCS})
-	kde3_add_executable(exportdatebook ${exportdatebook_SRCS})
-	kde3_add_executable(mergecalendars ${mergecalendars_SRCS})
+	trinity_add_executable(importdatebook ${importdatebook_SRCS})
+	trinity_add_executable(exportdatebook ${exportdatebook_SRCS})
+	trinity_add_executable(mergecalendars ${mergecalendars_SRCS})
 	target_link_libraries(importdatebook kpilot ${QT_LIBRARIES} kcal)
 	target_link_libraries(exportdatebook kpilot ${QT_LIBRARIES} kcal)
 	target_link_libraries(mergecalendars ${QT_LIBRARIES} kcal)
@@ -49,7 +49,7 @@ if (HAVE_CALENDARLOCAL_H)
 endif (HAVE_CALENDARLOCAL_H)
 
 set(importaddresses_SRCS importaddresses.cc)
-kde3_add_executable(importaddresses ${importaddresses_SRCS})
+trinity_add_executable(importaddresses ${importaddresses_SRCS})
 target_link_libraries(importaddresses kpilot ${QT_LIBRARIES} kabc kabc_file)
 add_test(importaddresses ${EXECUTABLE_OUTPUT_PATH}/importaddresses)