diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b9f075..4633d0d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ find_package(ZLIB REQUIRED)
 find_package(SDL REQUIRED)
 find_package(SDL_mixer REQUIRED)
 find_package(LZ4 REQUIRED)
-find_package(FFmpeg REQUIRED)
+find_package(FFMPEG REQUIRED)
 find_package(FreeImage REQUIRED)
 
 include_directories(
@@ -191,7 +191,7 @@ add_executable(
 
 target_link_libraries(wallengine
     ${X11_LIBRARIES}
-    ${XRANDR_LIBRARIES}
+    ${Xrandr_LIBRARIES}
     ${X11_Xxf86vm_LIB}
     ${OPENGL_LIBRARIES}
     ${GLEW_LIBRARIES}
diff --git a/CMakeModules/FindFFmpeg.cmake b/CMakeModules/FindFFMPEG.cmake
similarity index 97%
rename from CMakeModules/FindFFmpeg.cmake
rename to CMakeModules/FindFFMPEG.cmake
index bfd7b21..ab55615 100644
--- a/CMakeModules/FindFFmpeg.cmake
+++ b/CMakeModules/FindFFMPEG.cmake
@@ -22,10 +22,8 @@ include(FindPackageHandleStandardArgs)
 
     find_package_handle_standard_args(FFMPEG
         FOUND_VAR FFMPEG_FOUND
-        REQUIRED_VARS
-            FFMPEG_LIBRARY
-            FFMPEG_INCLUDE_DIR
         VERSION_VAR FFMPEG_VERSION
+        HANDLE_COMPONENTS
     )
 
 if(FFMPEG_LIBRARIES AND FFMPEG_INCLUDE_DIR)
diff --git a/CMakeModules/FindXrandr.cmake b/CMakeModules/FindXrandr.cmake
index 3d8f1f2..cb5d1a7 100644
--- a/CMakeModules/FindXrandr.cmake
+++ b/CMakeModules/FindXrandr.cmake
@@ -1,14 +1,14 @@
 # - try to find the Xrandr library
 #
 # Cache Variables: (probably not for direct use in your scripts)
-#  XRANDR_INCLUDE_DIR
-#  XRANDR_SOURCE_DIR
-#  XRANDR_LIBRARY
+#  Xrandr_INCLUDE_DIR
+#  Xrandr_SOURCE_DIR
+#  Xrandr_LIBRARY
 #
 # Non-cache variables you might use in your CMakeLists.txt:
-#  XRANDR_FOUND
-#  XRANDR_INCLUDE_DIRS
-#  XRANDR_LIBRARIES
+#  Xrandr_FOUND
+#  Xrandr_INCLUDE_DIRS
+#  Xrandr_LIBRARIES
 #
 # Requires these CMake modules:
 #  FindPackageHandleStandardArgs (known included with CMake >=2.6.2)
@@ -20,8 +20,8 @@
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 
-set(XRANDR_ROOT_DIR
-        "${XRANDR_ROOT_DIR}"
+set(Xrandr_ROOT_DIR
+        "${Xrandr_ROOT_DIR}"
         CACHE
         PATH
         "Directory to search for Xrandr")
@@ -31,21 +31,21 @@ if(PKG_CONFIG_FOUND)
     pkg_check_modules(PC_LIBXRANDR xrandr)
 endif()
 
-find_library(XRANDR_LIBRARY
+find_library(Xrandr_LIBRARY
         NAMES
         Xrandr
         PATHS
         ${PC_LIBXRANDR_LIBRARY_DIRS}
         ${PC_LIBXRANDR_LIBDIR}
         HINTS
-        "${XRANDR_ROOT_DIR}"
+        "${Xrandr_ROOT_DIR}"
         PATH_SUFFIXES
         lib
         )
 
-get_filename_component(_libdir "${XRANDR_LIBRARY}" PATH)
+get_filename_component(_libdir "${Xrandr_LIBRARY}" PATH)
 
-find_path(XRANDR_INCLUDE_DIR
+find_path(Xrandr_INCLUDE_DIR
         NAMES
         Xrandr.h
         PATHS
@@ -54,25 +54,25 @@ find_path(XRANDR_INCLUDE_DIR
         HINTS
         "${_libdir}"
         "${_libdir}/.."
-        "${XRANDR_ROOT_DIR}"
+        "${Xrandr_ROOT_DIR}"
         PATH_SUFFIXES
         X11
         X11/extensions
         )
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(XRANDR
+find_package_handle_standard_args(Xrandr
         DEFAULT_MSG
-        XRANDR_LIBRARY
-        XRANDR_INCLUDE_DIR
+        Xrandr_LIBRARY
+        Xrandr_INCLUDE_DIR
         )
 
-if(XRANDR_FOUND)
-    list(APPEND XRANDR_LIBRARIES ${XRANDR_LIBRARY})
-    list(APPEND XRANDR_INCLUDE_DIRS ${XRANDR_INCLUDE_DIR})
-    mark_as_advanced(XRANDR_ROOT_DIR)
+if(Xrandr_FOUND)
+    list(APPEND Xrandr_LIBRARIES ${Xrandr_LIBRARY})
+    list(APPEND Xrandr_INCLUDE_DIRS ${Xrandr_INCLUDE_DIR})
+    mark_as_advanced(Xrandr_ROOT_DIR)
 endif()
 
-mark_as_advanced(XRANDR_INCLUDE_DIR
-        XRANDR_LIBRARY)
+mark_as_advanced(Xrandr_INCLUDE_DIR
+        Xrandr_LIBRARY)