diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8a9099..a657782 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -215,7 +215,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-io-config.cmake b/cmake/aws-c-io-config.cmake
index d4bc525..72a78ec 100644
--- a/cmake/aws-c-io-config.cmake
+++ b/cmake/aws-c-io-config.cmake
@@ -7,8 +7,4 @@ endif()
 find_dependency(aws-c-common)
 find_dependency(aws-c-cal)
 
-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)