diff --git a/modules/TDEMacros.cmake b/modules/TDEMacros.cmake
index 1152cf6..0389966 100644
--- a/modules/TDEMacros.cmake
+++ b/modules/TDEMacros.cmake
@@ -345,15 +345,15 @@ macro( __tde_internal_process_sources _sources )
 
     # handle .skel files
     elseif( ${_ext} STREQUAL ".skel" )
-      kde3_add_dcop_skels( ${_sources} ${_path}/${_name}.h )
+      trinity_add_dcop_skels( ${_sources} ${_path}/${_name}.h )
 
     # handle .stub files
     elseif( ${_ext} STREQUAL ".stub" )
-      kde3_add_dcop_stubs( ${_sources} ${_path}/${_name}.h )
+      trinity_add_dcop_stubs( ${_sources} ${_path}/${_name}.h )
 
     # handle .kcfgc files
     elseif( ${_ext} STREQUAL ".kcfgc" )
-      kde3_add_kcfg_files( ${_sources} ${_arg} )
+      trinity_add_kcfg_files( ${_sources} ${_arg} )
 
     # handle any other files
     else( ${_ext} STREQUAL ".ui" )
diff --git a/modules/TDESetupPaths.cmake b/modules/TDESetupPaths.cmake
index 409a7b9..1e0dbaf 100644
--- a/modules/TDESetupPaths.cmake
+++ b/modules/TDESetupPaths.cmake
@@ -34,11 +34,11 @@ macro( tde_setup_paths )
   _tde_internal_setup_path( BIN_INSTALL_DIR           "${EXEC_INSTALL_PREFIX}/bin"                  "The install dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)" )
   _tde_internal_setup_path( SBIN_INSTALL_DIR          "${EXEC_INSTALL_PREFIX}/sbin"                 "The install dir for system executables (default ${EXEC_INSTALL_PREFIX}/sbin)" )
   _tde_internal_setup_path( LIB_INSTALL_DIR           "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}"     "The subdirectory relative to the install prefix where libraries will be installed (default is ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX})" )
-  _tde_internal_setup_path( LIBEXEC_INSTALL_DIR       "${LIB_INSTALL_DIR}/kde3/libexec"             "The subdirectory relative to the install prefix where libraries will be installed (default is ${LIB_INSTALL_DIR}/kde3/libexec)" )
+  _tde_internal_setup_path( LIBEXEC_INSTALL_DIR       "${LIB_INSTALL_DIR}/trinity/libexec"             "The subdirectory relative to the install prefix where libraries will be installed (default is ${LIB_INSTALL_DIR}/trinity/libexec)" )
   _tde_internal_setup_path( INCLUDE_INSTALL_DIR       "${CMAKE_INSTALL_PREFIX}/include"             "The subdirectory to the header prefix" )
 
   _tde_internal_setup_path( CMAKE_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/cmake"               "The install dir for cmake import modules" )
-  _tde_internal_setup_path( PLUGIN_INSTALL_DIR        "${LIB_INSTALL_DIR}/kde3"                     "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/kde3)" )
+  _tde_internal_setup_path( PLUGIN_INSTALL_DIR        "${LIB_INSTALL_DIR}/trinity"                     "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/trinity)" )
   _tde_internal_setup_path( CONFIG_INSTALL_DIR        "${SHARE_INSTALL_PREFIX}/config"              "The config file install dir" )
   _tde_internal_setup_path( DATA_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/apps"                "The parent directory where applications can install their data" )
   _tde_internal_setup_path( HTML_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/doc/kde/HTML"        "The HTML install dir for documentation" )