--- /dev/null
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dddcc5d..55ff45f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -92,7 +92,7 @@ else()
+ endif()
+
+ install(EXPORT "${PROJECT_NAME}-targets"
+- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/"
++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/"
+ NAMESPACE AWS::
+ COMPONENT Development)
+
+diff --git a/cmake/aws-c-event-stream-config.cmake b/cmake/aws-c-event-stream-config.cmake
+index e881cb8..cb817e4 100644
+--- a/cmake/aws-c-event-stream-config.cmake
++++ b/cmake/aws-c-event-stream-config.cmake
+@@ -2,9 +2,5 @@ include(CMakeFindDependencyMacro)
+ find_dependency(aws-c-common)
+ find_dependency(aws-checksums)
+
+-if (BUILD_SHARED_LIBS)
+- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake)
+-else()
+- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake)
+-endif()
++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)
+