diff --git a/client/FreeRDP-ClientConfig.cmake.in b/client/FreeRDP-ClientConfig.cmake.in
index ba3b8d192..779374c9f 100644
--- a/client/FreeRDP-ClientConfig.cmake.in
+++ b/client/FreeRDP-ClientConfig.cmake.in
@@ -1,10 +1,10 @@
 
 @PACKAGE_INIT@
 
-set(FreeRDP_VERSION_MAJOR "@FREERDP_VERSION_MAJOR@")
-set(FreeRDP_VERSION_MINOR "@FREERDP_VERSION_MINOR@")
-set(FreeRDP_VERSION_REVISION "@FREERDP_VERSION_REVISION@")
+set(FreeRDP-Client_VERSION_MAJOR "@FREERDP_VERSION_MAJOR@")
+set(FreeRDP-Client_VERSION_MINOR "@FREERDP_VERSION_MINOR@")
+set(FreeRDP-Client_VERSION_REVISION "@FREERDP_VERSION_REVISION@")
 
-set_and_check(FreeRDP_INCLUDE_DIR "@PACKAGE_FREERDP_INCLUDE_DIR@")
+set_and_check(FreeRDP-Client_INCLUDE_DIR "@PACKAGE_FREERDP_INCLUDE_DIR@")
 
 include("${CMAKE_CURRENT_LIST_DIR}/FreeRDP-ClientTargets.cmake")
diff --git a/server/FreeRDP-ServerConfig.cmake.in b/server/FreeRDP-ServerConfig.cmake.in
index 2f2788bd2..b9edb5581 100644
--- a/server/FreeRDP-ServerConfig.cmake.in
+++ b/server/FreeRDP-ServerConfig.cmake.in
@@ -1,10 +1,10 @@
 
 @PACKAGE_INIT@
 
-set(FreeRDP_VERSION_MAJOR "@FREERDP_VERSION_MAJOR@")
-set(FreeRDP_VERSION_MINOR "@FREERDP_VERSION_MINOR@")
-set(FreeRDP_VERSION_REVISION "@FREERDP_VERSION_REVISION@")
+set(FreeRDP-Server_VERSION_MAJOR "@FREERDP_VERSION_MAJOR@")
+set(FreeRDP-Server_VERSION_MINOR "@FREERDP_VERSION_MINOR@")
+set(FreeRDP-Server_VERSION_REVISION "@FREERDP_VERSION_REVISION@")
 
-set_and_check(FreeRDP_INCLUDE_DIR "@PACKAGE_FREERDP_INCLUDE_DIR@")
+set_and_check(FreeRDP-Server_INCLUDE_DIR "@PACKAGE_FREERDP_INCLUDE_DIR@")
 
 include("${CMAKE_CURRENT_LIST_DIR}/FreeRDP-ServerTargets.cmake")