diff --git a/conduits/abbrowserconduit/CMakeLists.txt b/conduits/abbrowserconduit/CMakeLists.txt
index dc159c9..07b65e1 100644
--- a/conduits/abbrowserconduit/CMakeLists.txt
+++ b/conduits/abbrowserconduit/CMakeLists.txt
@@ -19,7 +19,7 @@ set(conduit_abbrowser_KCFGS
 	abbrowserSettings.kcfgc
 )
 
-trinity_add_kcfg_files(conduit_abbrowser_SRCS ${conduit_abbrowser_KCFGS})
+kde3_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})
diff --git a/conduits/docconduit/CMakeLists.txt b/conduits/docconduit/CMakeLists.txt
index e2441f6..e0a3a1a 100644
--- a/conduits/docconduit/CMakeLists.txt
+++ b/conduits/docconduit/CMakeLists.txt
@@ -30,7 +30,7 @@ set(conduit_doc_KCFGS
 	kpalmdocSettings.kcfgc
 )
 
-trinity_add_kcfg_files(conduit_doc_SRCS ${conduit_doc_KCFGS})
+kde3_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})
@@ -54,7 +54,7 @@ set(kpalmdoc_SRCS
 	kpalmdoc_dlg.cc
 	kpalmdoc.cpp
 )
-trinity_add_kcfg_files(kpalmdoc_SRCS kpalmdocSettings.kcfgc)
+kde3_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})
diff --git a/conduits/knotes/CMakeLists.txt b/conduits/knotes/CMakeLists.txt
index a548d7d..efdafbb 100644
--- a/conduits/knotes/CMakeLists.txt
+++ b/conduits/knotes/CMakeLists.txt
@@ -20,10 +20,10 @@ set(conduit_knotes_KCFGS
 #	KNotesIface.h
 #)
 
-#trinity_add_dcop_skels(conduit_knotes_SRCS ${conduit_knotes_STUBS})
-#trinity_add_dcop_stubs(conduit_knotes_SRCS ${conduit_knotes_STUBS})
+#kde3_add_dcop_skels(conduit_knotes_SRCS ${conduit_knotes_STUBS})
+#kde3_add_dcop_stubs(conduit_knotes_SRCS ${conduit_knotes_STUBS})
 
-trinity_add_kcfg_files(conduit_knotes_SRCS ${conduit_knotes_KCFGS})
+kde3_add_kcfg_files(conduit_knotes_SRCS ${conduit_knotes_KCFGS})
 trinity_add_ui_files(conduit_knotes_SRCS ${conduit_knotes_UIS})
 trinity_automoc(${conduit_knotes_SRCS})
 
diff --git a/conduits/malconduit/CMakeLists.txt b/conduits/malconduit/CMakeLists.txt
index 7d8a796..6064a22 100644
--- a/conduits/malconduit/CMakeLists.txt
+++ b/conduits/malconduit/CMakeLists.txt
@@ -17,7 +17,7 @@ set(conduit_mal_KCFGS
 	malconduitSettings.kcfgc
 )
 
-trinity_add_kcfg_files(conduit_mal_SRCS ${conduit_mal_KCFGS})
+kde3_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})
diff --git a/conduits/memofileconduit/CMakeLists.txt b/conduits/memofileconduit/CMakeLists.txt
index 150efec..bece12c 100644
--- a/conduits/memofileconduit/CMakeLists.txt
+++ b/conduits/memofileconduit/CMakeLists.txt
@@ -17,7 +17,7 @@ set(conduit_memofile_KCFGS
 	memofileSettings.kcfgc
 )
 
-trinity_add_kcfg_files(conduit_memofile_SRCS ${conduit_memofile_KCFGS})
+kde3_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})
diff --git a/conduits/notepadconduit/CMakeLists.txt b/conduits/notepadconduit/CMakeLists.txt
index 619df0f..d654a6a 100644
--- a/conduits/notepadconduit/CMakeLists.txt
+++ b/conduits/notepadconduit/CMakeLists.txt
@@ -15,7 +15,7 @@ set(conduit_notepad_KCFGS
 	notepadconduit.kcfgc
 )
 
-trinity_add_kcfg_files(conduit_notepad_SRCS ${conduit_notepad_KCFGS})
+kde3_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})
diff --git a/conduits/null/CMakeLists.txt b/conduits/null/CMakeLists.txt
index 4da5255..3b689e0 100644
--- a/conduits/null/CMakeLists.txt
+++ b/conduits/null/CMakeLists.txt
@@ -15,7 +15,7 @@ set(conduit_null_KCFGS
 	nullSettings.kcfgc
 )
 
-trinity_add_kcfg_files(conduit_null_SRCS ${conduit_null_KCFGS})
+kde3_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})
diff --git a/conduits/popmail/CMakeLists.txt b/conduits/popmail/CMakeLists.txt
index 388e59d..d2c63e9 100644
--- a/conduits/popmail/CMakeLists.txt
+++ b/conduits/popmail/CMakeLists.txt
@@ -16,7 +16,7 @@ set(conduit_popmail_KCFGS
 	popmailSettings.kcfgc
 )
 
-trinity_add_kcfg_files(conduit_popmail_SRCS ${conduit_popmail_KCFGS})
+kde3_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})
diff --git a/conduits/sysinfoconduit/CMakeLists.txt b/conduits/sysinfoconduit/CMakeLists.txt
index 67ba3c9..99b862c 100644
--- a/conduits/sysinfoconduit/CMakeLists.txt
+++ b/conduits/sysinfoconduit/CMakeLists.txt
@@ -16,7 +16,7 @@ set(conduit_sysinfo_KCFGS
 	sysinfoSettings.kcfgc
 )
 
-trinity_add_kcfg_files(conduit_sysinfo_SRCS ${conduit_sysinfo_KCFGS})
+kde3_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})
diff --git a/conduits/timeconduit/CMakeLists.txt b/conduits/timeconduit/CMakeLists.txt
index 5063a0f..abf1e27 100644
--- a/conduits/timeconduit/CMakeLists.txt
+++ b/conduits/timeconduit/CMakeLists.txt
@@ -16,7 +16,7 @@ set(conduit_time_KCFGS
 	timeConduitSettings.kcfgc
 )
 
-trinity_add_kcfg_files(conduit_time_SRCS ${conduit_time_KCFGS})
+kde3_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})
diff --git a/conduits/vcalconduit/CMakeLists.txt b/conduits/vcalconduit/CMakeLists.txt
index caa5d3a..40808bc 100644
--- a/conduits/vcalconduit/CMakeLists.txt
+++ b/conduits/vcalconduit/CMakeLists.txt
@@ -19,7 +19,7 @@ set(conduit_SHARED
 	todoRecord.cc
 )
 
-trinity_add_kcfg_files(conduit_SHARED vcalconduitSettings.kcfgc)
+kde3_add_kcfg_files(conduit_SHARED vcalconduitSettings.kcfgc)
 trinity_add_ui_files(conduit_SHARED korganizerConduit.ui)
 
 set(conduit_vcal_SRCS
diff --git a/kpilot/CMakeLists.txt b/kpilot/CMakeLists.txt
index 2c6df15..fe96550 100644
--- a/kpilot/CMakeLists.txt
+++ b/kpilot/CMakeLists.txt
@@ -17,7 +17,7 @@ set(settings_SRC
 	kpilotConfig.cc
 )
 
-trinity_add_kcfg_files(settings_SRC kpilotSettings.kcfgc)
+kde3_add_kcfg_files(settings_SRC kpilotSettings.kcfgc)
 
 ###
 #
@@ -50,8 +50,8 @@ set(kcmpilot_UIS
 )
 
 trinity_add_ui_files(kcmpilot_SRCS ${kcmpilot_UIS})
-trinity_add_kcfg_files(kcmpilot_SRCS ${kcmpilot_KCFGS})
-trinity_add_dcop_stubs(kcmpilot_SRCS pilotDaemonDCOP.h)
+kde3_add_kcfg_files(kcmpilot_SRCS ${kcmpilot_KCFGS})
+kde3_add_dcop_stubs(kcmpilot_SRCS pilotDaemonDCOP.h)
 trinity_automoc(${kcmpilot_SRCS})
 
 # Now add these generated files to the ADD_LIBRARY step
@@ -75,7 +75,7 @@ set(kpilotTest_SRCS
 	main-test.cc
 )
 # Acts as a receiver for DCOP log messages
-trinity_add_dcop_skels(kpilotTest_SRCS loggerDCOP.h)
+kde3_add_dcop_skels(kpilotTest_SRCS loggerDCOP.h)
 
 trinity_automoc(${kpilotTest_SRCS})
 add_executable(kpilotTest ${kpilotTest_SRCS})
@@ -95,8 +95,8 @@ set(kpilotDaemon_SRCS
 	pilotDaemon.cc
 )
 # Both sends and receives DCOP log messages. Talks to KPilot.
-trinity_add_dcop_skels(kpilotDaemon_SRCS loggerDCOP.h pilotDaemonDCOP.h)
-trinity_add_dcop_stubs(kpilotDaemon_SRCS loggerDCOP.h kpilotDCOP.h)
+kde3_add_dcop_skels(kpilotDaemon_SRCS loggerDCOP.h pilotDaemonDCOP.h)
+kde3_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)
@@ -133,8 +133,8 @@ set(kpilot_UIS
 
 trinity_add_ui_files(kpilot_SRCS ${kpilot_UIS})
 # Talks to the daemon. Listens as itself.
-trinity_add_dcop_skels(kpilot_SRCS loggerDCOP.h kpilotDCOP.h)
-trinity_add_dcop_stubs(kpilot_SRCS pilotDaemonDCOP.h)
+kde3_add_dcop_skels(kpilot_SRCS loggerDCOP.h kpilotDCOP.h)
+kde3_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)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index a8b43b7..bda9b45 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -53,7 +53,7 @@ set(lib_SRCS
 )
 
 trinity_automoc(${lib_SRCS})
-trinity_add_kcfg_files(lib_SRCS kpilotlibSettings.kcfgc)
+kde3_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)