diff --git a/ark/CMakeLists.txt b/ark/CMakeLists.txt
index a1467535..2b2fe397 100644
--- a/ark/CMakeLists.txt
+++ b/ark/CMakeLists.txt
@@ -8,34 +8,34 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()
 
-macro_optional_find_package(LibArchive 3.0.3)
+kde4_optional_find_package(LibArchive 3.0.3)
 set_package_properties(LibArchive PROPERTIES
     DESCRIPTION "A library for dealing with a wide variety of archive file formats"
     URL "http://code.google.com/p/libarchive/"
     PURPOSE "Required for among others tar, tar.gz, tar.bz2 formats in Ark"
 )
 
-macro_optional_find_package(LibKonq)
+kde4_optional_find_package(LibKonq)
 set_package_properties(LibKonq PROPERTIES
     DESCRIPTION "libkonq library"
     PURPOSE "Need to integrate in konqueror"
 )
 
-macro_optional_find_package(ZLIB)
+kde4_optional_find_package(ZLIB)
 set_package_properties(ZLIB PROPERTIES
     DESCRIPTION "General purpose data compression library"
     URL "http://www.zlib.net"
     PURPOSE "Required for the .gz format support in Ark"
 )
 
-macro_optional_find_package(BZip2)
+kde4_optional_find_package(BZip2)
 set_package_properties(BZip2 PROPERTIES
     DESCRIPTION "A high-quality data compressor"
     URL "http://www.bzip.org"
     PURPOSE "Required for the .bz2 format support in Ark"
 )
 
-macro_optional_find_package(LibLZMA)
+kde4_optional_find_package(LibLZMA)
 set_package_properties(LibLZMA PROPERTIES
     DESCRIPTION "Legacy data compression software with high compression ratio"
     URL "http://tukaani.org/xz/"
diff --git a/kdeplasma-addons/CMakeLists.txt b/kdeplasma-addons/CMakeLists.txt
index 54b28195..a7d05bf5 100644
--- a/kdeplasma-addons/CMakeLists.txt
+++ b/kdeplasma-addons/CMakeLists.txt
@@ -8,21 +8,21 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()
 
-macro_optional_find_package(KDE4Workspace)
+kde4_optional_find_package(KDE4Workspace)
 set_package_properties(KDE4Workspace PROPERTIES
     DESCRIPTION "KDE base workspace libraries"
     URL "https://osdn.net/projects/kde/"
     PURPOSE "Needed for building several Plasma plugins"
 )
 
-macro_optional_find_package(DBusMenuQt)
+kde4_optional_find_package(DBusMenuQt)
 set_package_properties(DBusMenuQt PROPERTIES
     DESCRIPTION "Library that provides a Qt implementation of the DBusMenu spec"
     URL "https://osdn.net/projects/kde/"
     PURPOSE "Needed for Unity support in IconTasks"
 )
 
-macro_optional_find_package(Qalculate)
+kde4_optional_find_package(Qalculate)
 set_package_properties(Qalculate PROPERTIES
     DESCRIPTION "Qalculate Library"
     URL "http://qalculate.sourceforge.net/"
diff --git a/kget/CMakeLists.txt b/kget/CMakeLists.txt
index aa741ccf..2ee0ca22 100644
--- a/kget/CMakeLists.txt
+++ b/kget/CMakeLists.txt
@@ -16,21 +16,21 @@ include(CheckTypeSize)
 
 include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
 
-macro_optional_find_package(LibMms)
+kde4_optional_find_package(LibMms)
 set_package_properties(LibMms PROPERTIES
     DESCRIPTION "Library to read mms streams"
     URL "http://libmms.sourceforge.net"
     PURPOSE "Needed to build KGet mms support"
 )
 
-macro_optional_find_package(LibTorrent)
+kde4_optional_find_package(LibTorrent)
 set_package_properties(LibTorrent PROPERTIES
     DESCRIPTION "Feature complete C++ bittorrent implementation focusing on efficiency and scalability"
     URL "https://libtorrent.org/"
     PURPOSE "Needed to build KGet torrent support"
 )
 
-macro_optional_find_package(KDE4Workspace)
+kde4_optional_find_package(KDE4Workspace)
 set_package_properties(KDE4Workspace PROPERTIES
     DESCRIPTION "KDE base workspace libraries"
     URL "https://osdn.net/projects/kde/"
diff --git a/kmix/CMakeLists.txt b/kmix/CMakeLists.txt
index aecb1360..ea05c28e 100644
--- a/kmix/CMakeLists.txt
+++ b/kmix/CMakeLists.txt
@@ -7,7 +7,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()
 
-macro_optional_find_package(ALSA)
+kde4_optional_find_package(ALSA)
 set_package_properties(ALSA PROPERTIES
     DESCRIPTION "Advanced Linux Sound Architecture"
     URL "https://alsa-project.org/wiki/Main_Page"
diff --git a/krdc/CMakeLists.txt b/krdc/CMakeLists.txt
index 18f8aba0..180496c0 100644
--- a/krdc/CMakeLists.txt
+++ b/krdc/CMakeLists.txt
@@ -8,7 +8,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()
 
-macro_optional_find_package(LibVNCServer 0.9.8)
+kde4_optional_find_package(LibVNCServer 0.9.8)
 set_package_properties(LibVNCServer PROPERTIES
     DESCRIPTION "VNC server / client library"
     URL "http://libvncserver.sourceforge.net/"
@@ -16,7 +16,7 @@ set_package_properties(LibVNCServer PROPERTIES
 )
 
 # NX support is not ready for KDE 4.2; disabled (uwolfer)
-# macro_optional_find_package(LibNXCL)
+# kde4_optional_find_package(LibNXCL)
 # macro_log_feature(LIBNXCL_FOUND "libnxcl" "NX X compression client library" "http://svn.berlios.de/svnroot/repos/freenx/trunk/freenx-client/nxcl/" FALSE "1.0" "Needed to build Krdc with NX support")
 
 # v1.0.2 required
diff --git a/okular/CMakeLists.txt b/okular/CMakeLists.txt
index e117d7cb..787c256d 100644
--- a/okular/CMakeLists.txt
+++ b/okular/CMakeLists.txt
@@ -13,42 +13,42 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-macro_optional_find_package(Poppler)
+kde4_optional_find_package(Poppler)
 set_package_properties(Poppler PROPERTIES
     DESCRIPTION "A PDF rendering library"
     URL "https://poppler.freedesktop.org"
     PURPOSE "Support for PDF files in Okular"
 )
 
-macro_optional_find_package(LibSpectre 0.2)
+kde4_optional_find_package(LibSpectre 0.2)
 set_package_properties(LibSpectre PROPERTIES
     DESCRIPTION "A PostScript rendering library"
     URL "http://libspectre.freedesktop.org/wiki/"
     PURPOSE "Support for PS files in Okular"
 )
 
-macro_optional_find_package(DjVuLibre 3.5.17)
+kde4_optional_find_package(DjVuLibre 3.5.17)
 set_package_properties(DjVuLibre PROPERTIES
     DESCRIPTION "A library for dealing with DjVu formatted files"
     URL "http://djvulibre.djvuzone.org"
     PURPOSE "Support for DjVu files in Okular"
 )
 
-macro_optional_find_package(Freetype)
+kde4_optional_find_package(Freetype)
 set_package_properties(Freetype PROPERTIES
     DESCRIPTION "A font rendering engine"
     URL "http://www.freetype.org"
     PURPOSE "Provides freetype font support in the Okular DVI generator"
 )
 
-macro_optional_find_package(EPub)
+kde4_optional_find_package(EPub)
 set_package_properties(EPub PROPERTIES
     DESCRIPTION "A library for reading EPub documents"
     URL "http://sourceforge.net/projects/ebook-tools"
     PURPOSE "Support for EPub documents in Okular"
 )
 
-macro_optional_find_package(OpenSSL)
+kde4_optional_find_package(OpenSSL)
 set_package_properties(OpenSSL PROPERTIES
     DESCRIPTION "Robust, commercial-grade, full-featured toolkit for general-purpose cryptography and secure communication"
     URL "https://www.openssl.org/"
diff --git a/partitionmanager/CMakeLists.txt b/partitionmanager/CMakeLists.txt
index daa9b04b..dc20ba82 100644
--- a/partitionmanager/CMakeLists.txt
+++ b/partitionmanager/CMakeLists.txt
@@ -37,7 +37,7 @@ set_package_properties(LIBPARTED PROPERTIES
     PURPOSE "Required for partitions management"
 )
 
-macro_optional_find_package(LibATASmart)
+kde4_optional_find_package(LibATASmart)
 set_package_properties(LibATASmart PROPERTIES
     DESCRIPTION "ATA S.M.A.R.T. reading and parsing library"
     URL "http://0pointer.de/blog/projects/being-smart.html"
diff --git a/thumbnailers/CMakeLists.txt b/thumbnailers/CMakeLists.txt
index a0391cef..14068873 100644
--- a/thumbnailers/CMakeLists.txt
+++ b/thumbnailers/CMakeLists.txt
@@ -7,21 +7,21 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()
 
-macro_optional_find_package(GettextPO)
+kde4_optional_find_package(GettextPO)
 set_package_properties(GettextPO PROPERTIES
     DESCRIPTION "A library for processing PO files"
     URL "www.gnu.org/software/gettext"
     PURPOSE "Required to build the PO thumbnailer"
 )
 
-macro_optional_find_package(Taglib 1.4)
+kde4_optional_find_package(Taglib 1.4)
 set_package_properties(Taglib PROPERTIES
     DESCRIPTION "Id3 tag reader"
     URL "https://taglib.org/"
     PURPOSE "Required to build the audio thumbnailer"
 )
 
-macro_optional_find_package(FFmpegThumbnailer)
+kde4_optional_find_package(FFmpegThumbnailer)
 set_package_properties(FFmpegThumbnailer PROPERTIES
     DESCRIPTION "Lightweight video thumbnailer that can be used by file managers to create thumbnails for video files"
     URL "https://github.com/dirkvdb/ffmpegthumbnailer"