diff --git a/CMake/FindBlueZ.cmake b/CMake/FindBlueZ.cmake
index b82e7bdb0f..3b80a703ae 100644
--- a/CMake/FindBlueZ.cmake
+++ b/CMake/FindBlueZ.cmake
@@ -6,7 +6,7 @@
 #
 # vim: expandtab sw=4 ts=4 sts=4:
 
-include(FindPkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules (BlueZ_PKG QUIET bluez)
 
 find_path(BlueZ_INCLUDE_DIR NAMES bluetooth/bluetooth.h
diff --git a/CMake/FindCubeb.cmake b/CMake/FindCUBEB.cmake
similarity index 100%
rename from CMake/FindCubeb.cmake
rename to CMake/FindCUBEB.cmake
diff --git a/CMake/FindLibevdev.cmake b/CMake/FindLIBEVDEV.cmake
similarity index 94%
rename from CMake/FindLibevdev.cmake
rename to CMake/FindLIBEVDEV.cmake
index e89a5f229d..f01e41a562 100644
--- a/CMake/FindLibevdev.cmake
+++ b/CMake/FindLIBEVDEV.cmake
@@ -27,7 +27,7 @@ set(LIBEVDEV_LIBRARIES ${LIBEVDEV_LIBRARY} )
 set(LIBEVDEV_INCLUDE_DIRS ${LIBEVDEV_INCLUDE_DIR} )
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(libevdev  DEFAULT_MSG
+find_package_handle_standard_args(LIBEVDEV  DEFAULT_MSG
                                   LIBEVDEV_LIBRARY LIBEVDEV_INCLUDE_DIR)
 
 mark_as_advanced(LIBEVDEV_INCLUDE_DIR LIBEVDEV_LIBRARY )
diff --git a/CMake/FindLibudev.cmake b/CMake/FindLIBUDEV.cmake
similarity index 100%
rename from CMake/FindLibudev.cmake
rename to CMake/FindLIBUDEV.cmake
diff --git a/CMake/FindMbedTLS.cmake b/CMake/FindMBEDTLS.cmake
similarity index 100%
rename from CMake/FindMbedTLS.cmake
rename to CMake/FindMBEDTLS.cmake
diff --git a/CMake/FindMiniupnpc.cmake b/CMake/FindMINIUPNPC.cmake
similarity index 100%
rename from CMake/FindMiniupnpc.cmake
rename to CMake/FindMINIUPNPC.cmake
diff --git a/CMake/FindPulseAudio.cmake b/CMake/FindPulseAudio.cmake
index 6046898cc4..bebbed3e11 100644
--- a/CMake/FindPulseAudio.cmake
+++ b/CMake/FindPulseAudio.cmake
@@ -6,7 +6,7 @@
 #
 # vim: expandtab sw=4 ts=4 sts=4:
 
-include(FindPkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules (PulseAudio_PKG QUIET libpulse)
 
 find_path(PulseAudio_INCLUDE_DIR NAMES pulse/pulseaudio.h
diff --git a/CMake/FindLibsystemd.cmake b/CMake/FindSYSTEMD.cmake
similarity index 95%
rename from CMake/FindLibsystemd.cmake
rename to CMake/FindSYSTEMD.cmake
index f75558a444..d3a706ad19 100644
--- a/CMake/FindLibsystemd.cmake
+++ b/CMake/FindSYSTEMD.cmake
@@ -1,5 +1,6 @@
-include(FindPkgConfig)
+find_package(PkgConfig QUIET)
 pkg_check_modules(PC_SYSTEMD QUIET "libsystemd")
+
 if (PC_SYSTEMD_FOUND)
 	add_definitions(${PC_SYSTEMD_CFLAGS} ${PC_SYSTEMD_CFLAGS_OTHER})
 endif(PC_SYSTEMD_FOUND)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26484938a3..f93d45de5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -485,8 +485,8 @@ if(OPROFILING)
 endif()
 
 if(ENABLE_EVDEV)
-  find_package(Libudev REQUIRED)
-  find_package(Libevdev REQUIRED)
+  find_package(LIBUDEV REQUIRED)
+  find_package(LIBEVDEV REQUIRED)
   if(LIBUDEV_FOUND AND LIBEVDEV_FOUND)
     message(STATUS "libevdev/libudev found, enabling evdev controller backend")
     add_definitions(-DHAVE_LIBUDEV=1)
@@ -679,7 +679,7 @@ endif()
 add_subdirectory(Externals/soundtouch)
 include_directories(Externals/soundtouch)
 
-find_package(Cubeb)
+find_package(CUBEB)
 if(CUBEB_FOUND)
   message(STATUS "Using the system cubeb")
 else()
@@ -721,7 +721,7 @@ endif()
 
 if(USE_UPNP)
   if(NOT APPLE)
-    find_package(Miniupnpc)
+    find_package(MINIUPNPC)
   endif()
   if(MINIUPNPC_FOUND AND MINIUPNPC_API_VERSION GREATER 8)
     message(STATUS "Using shared miniupnpc")
@@ -734,7 +734,7 @@ if(USE_UPNP)
 endif()
 
 if(NOT APPLE)
-  find_package(MbedTLS)
+  find_package(MBEDTLS)
 endif()
 if(MBEDTLS_FOUND)
   message(STATUS "Using shared mbed TLS")
@@ -789,7 +789,7 @@ if(USE_DISCORD_PRESENCE)
   include_directories(Externals/discord-rpc/include)
 endif()
 
-find_package(Libsystemd)
+find_package(SYSTEMD)
 if(SYSTEMD_FOUND)
   message(STATUS "libsystemd found, enabling traversal server watchdog support")
   add_definitions(-DHAVE_LIBSYSTEMD)
diff --git a/Source/Core/AudioCommon/CMakeLists.txt b/Source/Core/AudioCommon/CMakeLists.txt
index 908c60ed5e..87b6abce81 100644
--- a/Source/Core/AudioCommon/CMakeLists.txt
+++ b/Source/Core/AudioCommon/CMakeLists.txt
@@ -49,7 +49,7 @@ if(ENABLE_PULSEAUDIO)
   # PulseAudio ships with a PulseAudioConfig.cmake with no imported target
   # So we use our own FindPulseAudio instead with "MODULE"
   find_package(PulseAudio MODULE QUIET)
-  if(PULSEAUDIO_FOUND)
+  if(PulseAudio_FOUND)
     message(STATUS "PulseAudio found, enabling PulseAudio sound backend")
     target_sources(audiocommon PRIVATE
       PulseAudioStream.cpp
diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt
index a3f3f4dc93..62c3a36174 100644
--- a/Source/Core/Core/CMakeLists.txt
+++ b/Source/Core/Core/CMakeLists.txt
@@ -635,7 +635,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
   option(ENABLE_BLUEZ "Enables bluetooth support" ON)
   if(ENABLE_BLUEZ)
     find_package(BlueZ)
-    if(BLUEZ_FOUND)
+    if(BlueZ_FOUND)
       message(STATUS "BlueZ found, enabling bluetooth support")
       target_sources(core PRIVATE
         HW/WiimoteReal/IOLinux.cpp