diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d80abb..36c027f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,7 +94,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-mqtt-config.cmake b/cmake/aws-c-mqtt-config.cmake
index 4a4dcbb..2ad48d2 100644
--- a/cmake/aws-c-mqtt-config.cmake
+++ b/cmake/aws-c-mqtt-config.cmake
@@ -6,9 +6,5 @@ if (@MQTT_WITH_WEBSOCKETS@)
     find_dependency(aws-c-http)
 endif()
 
-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)