diff --git a/src/module.js b/src/module.js
index d71d2d346b..af9a5ca2a0 100644
--- a/src/module.js
+++ b/src/module.js
@@ -1,7 +1,7 @@
 import { resolve, join } from 'pathe';
 
 import {
-  addImports,
+  addImportsDir,
   createResolver,
   defineNuxtModule,
   addPluginTemplate,
@@ -83,18 +83,7 @@ export default defineNuxtModule({
 
     await addBuildTemplates(nuxt, moduleOptions);
 
-    addImports(
-      [
-        'useBoosterComponentObserver',
-        'useBoosterCritical',
-        'useBoosterConfig',
-        'useBoosterFonts',
-        'useBoosterHead'
-      ].map(name => ({
-        name,
-        from: resolve(runtimeDir, 'composables/index')
-      }))
-    );
+    addImportsDir(resolve(runtimeDir, 'composables'));
   }
 });
 
diff --git a/src/runtime/components/BoosterIframe.vue b/src/runtime/components/BoosterIframe.vue
index 9e417fc306..ee536aaacc 100644
--- a/src/runtime/components/BoosterIframe.vue
+++ b/src/runtime/components/BoosterIframe.vue
@@ -12,8 +12,6 @@
 <script setup>
 import { ref, watch, useBoosterComponentObserver } from '#imports';
 
-import { defineProps, defineEmits } from 'vue';
-
 const props = defineProps({
   src: {
     type: String,
diff --git a/src/runtime/composables/index.js b/src/runtime/composables/index.js
deleted file mode 100644
index 625e695533..0000000000
--- a/src/runtime/composables/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export { default as useBoosterComponentObserver } from './componentObserver';
-export { default as useBoosterCritical } from './critical';
-export { default as useBoosterConfig } from './config';
-export { default as useBoosterFonts } from './fonts';
-export { default as useBoosterHead } from './head';
diff --git a/src/runtime/composables/componentObserver.js b/src/runtime/composables/useBoosterComponentObserver.js
similarity index 100%
rename from src/runtime/composables/componentObserver.js
rename to src/runtime/composables/useBoosterComponentObserver.js
diff --git a/src/runtime/composables/config.js b/src/runtime/composables/useBoosterConfig.js
similarity index 100%
rename from src/runtime/composables/config.js
rename to src/runtime/composables/useBoosterConfig.js
diff --git a/src/runtime/composables/critical.js b/src/runtime/composables/useBoosterCritical.js
similarity index 100%
rename from src/runtime/composables/critical.js
rename to src/runtime/composables/useBoosterCritical.js
diff --git a/src/runtime/composables/fonts.js b/src/runtime/composables/useBoosterFonts.js
similarity index 100%
rename from src/runtime/composables/fonts.js
rename to src/runtime/composables/useBoosterFonts.js
diff --git a/src/runtime/composables/head.js b/src/runtime/composables/useBoosterHead.js
similarity index 100%
rename from src/runtime/composables/head.js
rename to src/runtime/composables/useBoosterHead.js