diff --git a/CMakeLists.txt b/CMakeLists.txt
index 318b299..43f6d31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -104,7 +104,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-s3-config.cmake b/cmake/aws-c-s3-config.cmake
index eb62a4b..24debd9 100644
--- a/cmake/aws-c-s3-config.cmake
+++ b/cmake/aws-c-s3-config.cmake
@@ -3,8 +3,4 @@ include(CMakeFindDependencyMacro)
 find_dependency(aws-c-auth)
 find_dependency(aws-c-http)
 
-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)
\ No newline at end of file