diff --git a/tiriel/firestore-odm-bundle/0.2/config/tiriel.yaml b/tiriel/firestore-odm-bundle/0.2/config/packages/tiriel.yaml
similarity index 100%
rename from tiriel/firestore-odm-bundle/0.2/config/tiriel.yaml
rename to tiriel/firestore-odm-bundle/0.2/config/packages/tiriel.yaml
diff --git a/tiriel/firestore-odm-bundle/0.2/manifest.json b/tiriel/firestore-odm-bundle/0.2/manifest.json
index c8ea6dc8..7d55ff12 100644
--- a/tiriel/firestore-odm-bundle/0.2/manifest.json
+++ b/tiriel/firestore-odm-bundle/0.2/manifest.json
@@ -1,6 +1,6 @@
 {
     "bundles": {
-        "Tiriel\\FirestoreOdmBundle\\FirestoreOdmBundle": ["all"]
+        "Tiriel\\FirestoreOdmBundle\\TirielFirestoreOdmBundle": ["all"]
     },
     "copy-from-recipe": {
         "config/": "%CONFIG_DIR%/"
diff --git a/tiriel/firestore-security-bridge/0.2/config/tiriel.yaml b/tiriel/firestore-security-bridge/0.2/config/packages/tiriel.yaml
similarity index 100%
rename from tiriel/firestore-security-bridge/0.2/config/tiriel.yaml
rename to tiriel/firestore-security-bridge/0.2/config/packages/tiriel.yaml
diff --git a/tiriel/firestore-security-bridge/0.2/manifest.json b/tiriel/firestore-security-bridge/0.2/manifest.json
index 6bada691..557427a3 100644
--- a/tiriel/firestore-security-bridge/0.2/manifest.json
+++ b/tiriel/firestore-security-bridge/0.2/manifest.json
@@ -1,6 +1,6 @@
 {
     "bundles": {
-        "Tiriel\\FirestoreSecurityBundle\\FirestoreSecurityBundle": ["all"]
+        "Tiriel\\FirestoreSecurityBridge\\TirielFirestoreSecurityBundle": ["all"]
     },
     "copy-from-recipe": {
         "config/": "%CONFIG_DIR%/"