diff --git a/src/BitBagShippingExportPlugin.php b/src/BitBagSyliusShippingExportPlugin.php
similarity index 93%
rename from src/BitBagShippingExportPlugin.php
rename to src/BitBagSyliusShippingExportPlugin.php
index ee7a1c4..acd5fb9 100644
--- a/src/BitBagShippingExportPlugin.php
+++ b/src/BitBagSyliusShippingExportPlugin.php
@@ -17,7 +17,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-final class BitBagShippingExportPlugin extends Bundle
+final class BitBagSyliusShippingExportPlugin extends Bundle
 {
     use SyliusPluginTrait;
 
diff --git a/src/Resources/config/config.yml b/src/Resources/config/config.yml
index 606ae6c..df2fa38 100644
--- a/src/Resources/config/config.yml
+++ b/src/Resources/config/config.yml
@@ -1,12 +1,12 @@
 imports:
-    - { resource: "@BitBagShippingExportPlugin/Resources/config/resource/bitbag_shipping_gateway.yml" }
-    - { resource: "@BitBagShippingExportPlugin/Resources/config/resource/bitbag_shipping_export.yml" }
-    - { resource: "@BitBagShippingExportPlugin/Resources/config/grids/bitbag_shipping_gateway.yml" }
-    - { resource: "@BitBagShippingExportPlugin/Resources/config/grids/bitbag_shipping_export.yml" }
-    - { resource: "@BitBagShippingExportPlugin/Resources/config/services.yml" }
+    - { resource: "@BitBagSyliusShippingExportPlugin/Resources/config/resource/bitbag_shipping_gateway.yml" }
+    - { resource: "@BitBagSyliusShippingExportPlugin/Resources/config/resource/bitbag_shipping_export.yml" }
+    - { resource: "@BitBagSyliusShippingExportPlugin/Resources/config/grids/bitbag_shipping_gateway.yml" }
+    - { resource: "@BitBagSyliusShippingExportPlugin/Resources/config/grids/bitbag_shipping_export.yml" }
+    - { resource: "@BitBagSyliusShippingExportPlugin/Resources/config/services.yml" }
 
 sylius_grid:
     templates:
         action:
-            create_shipping_gateway: "@BitBagShippingExportPlugin/ShippingGateway/Action/_create.html.twig"
-            export_shipments: "@BitBagShippingExportPlugin/ShippingExport/Action/_exportShipments.html.twig"
+            create_shipping_gateway: "@BitBagSyliusShippingExportPlugin/ShippingGateway/Action/_create.html.twig"
+            export_shipments: "@BitBagSyliusShippingExportPlugin/ShippingExport/Action/_exportShipments.html.twig"
diff --git a/src/Resources/config/doctrine/ShippingExport.orm.yml b/src/Resources/config/doctrine/ShippingExport.orm.yml
index 4a79234..3e9af22 100644
--- a/src/Resources/config/doctrine/ShippingExport.orm.yml
+++ b/src/Resources/config/doctrine/ShippingExport.orm.yml
@@ -27,6 +27,7 @@ BitBag\SyliusShippingExportPlugin\Entity\ShippingExport:
     manyToOne:
         shippingGateway:
             targetEntity: BitBag\SyliusShippingExportPlugin\Entity\ShippingGateway
+            inversedBy: shippingExports
             joinColumn:
                 name: shipping_gateway_id
                 referencedColumnName: id
diff --git a/src/Resources/config/grids/bitbag_shipping_export.yml b/src/Resources/config/grids/bitbag_shipping_export.yml
index f792e35..118262b 100644
--- a/src/Resources/config/grids/bitbag_shipping_export.yml
+++ b/src/Resources/config/grids/bitbag_shipping_export.yml
@@ -16,7 +16,7 @@ sylius_grid:
                     path: .
                     sortable: shipment.order
                     options:
-                        template: "@BitBagShippingExportPlugin/ShippingExport/Grid/Field/orderNumber.html.twig"
+                        template: "@BitBagSyliusShippingExportPlugin/ShippingExport/Grid/Field/orderNumber.html.twig"
                 shipment:
                     type: datetime
                     label: sylius.ui.created_at
@@ -30,28 +30,28 @@ sylius_grid:
                     path: .
                     sortable: ~
                     options:
-                        template: "@BitBagShippingExportPlugin/ShippingExport/Grid/Field/exportedAt.html.twig"
+                        template: "@BitBagSyliusShippingExportPlugin/ShippingExport/Grid/Field/exportedAt.html.twig"
                 shippingMethod:
                     type: twig
                     label: sylius.ui.shipping_method
                     path: .
                     sortable: ~
                     options:
-                        template: "@BitBagShippingExportPlugin/ShippingExport/Grid/Field/shippingMethod.html.twig"
+                        template: "@BitBagSyliusShippingExportPlugin/ShippingExport/Grid/Field/shippingMethod.html.twig"
                 labelPath:
                     type: twig
                     label: bitbag.ui.shipping_export_label
                     path: .
                     sortable: ~
                     options:
-                        template: "@BitBagShippingExportPlugin/ShippingExport/Grid/Field/shippingExportLabel.html.twig"
+                        template: "@BitBagSyliusShippingExportPlugin/ShippingExport/Grid/Field/shippingExportLabel.html.twig"
                 state:
                     type: twig
                     label: sylius.ui.state
                     path: .
                     sortable: ~
                     options:
-                        template: "@BitBagShippingExportPlugin/ShippingExport/Grid/Field/state.html.twig"
+                        template: "@BitBagSyliusShippingExportPlugin/ShippingExport/Grid/Field/state.html.twig"
             filters:
                 search:
                     type: string
diff --git a/src/Resources/config/routing.yml b/src/Resources/config/routing.yml
index 28772a9..b1c5a97 100644
--- a/src/Resources/config/routing.yml
+++ b/src/Resources/config/routing.yml
@@ -1,5 +1,5 @@
 bitbag_shipping_gateway:
-    resource: "@BitBagShippingExportPlugin/Resources/config/routing/bitbag_shipping_gateway.yml"
+    resource: "@BitBagSyliusShippingExportPlugin/Resources/config/routing/bitbag_shipping_gateway.yml"
 
 bitbag_shipping_export:
-    resource: "@BitBagShippingExportPlugin/Resources/config/routing/bitbag_shipping_export.yml"
+    resource: "@BitBagSyliusShippingExportPlugin/Resources/config/routing/bitbag_shipping_export.yml"
diff --git a/tests/Application/app/AppKernel.php b/tests/Application/app/AppKernel.php
index febc07e..99f96ea 100755
--- a/tests/Application/app/AppKernel.php
+++ b/tests/Application/app/AppKernel.php
@@ -18,7 +18,7 @@ public function registerBundles(): array
             new \FOS\OAuthServerBundle\FOSOAuthServerBundle(), // Required by SyliusApiBundle
             new \Sylius\Bundle\AdminApiBundle\SyliusAdminApiBundle(),
 
-            new \BitBag\SyliusShippingExportPlugin\BitBagShippingExportPlugin(),
+            new \BitBag\SyliusShippingExportPlugin\BitBagSyliusShippingExportPlugin(),
         ]);
     }
 
diff --git a/tests/Application/app/config/config.yml b/tests/Application/app/config/config.yml
index 0c770a5..fed5e88 100755
--- a/tests/Application/app/config/config.yml
+++ b/tests/Application/app/config/config.yml
@@ -8,7 +8,7 @@ imports:
     - { resource: "@SyliusShopBundle/Resources/config/app/config.yml" }
     - { resource: "@SyliusAdminApiBundle/Resources/config/app/config.yml" }
 
-    - { resource: "@BitBagShippingExportPlugin/Resources/config/config.yml" }
+    - { resource: "@BitBagSyliusShippingExportPlugin/Resources/config/config.yml" }
 
     - { resource: "../../../../vendor/sylius/sylius/app/config/security.yml" }
 
diff --git a/tests/Application/app/config/routing.yml b/tests/Application/app/config/routing.yml
index 7eef16b..32fc494 100755
--- a/tests/Application/app/config/routing.yml
+++ b/tests/Application/app/config/routing.yml
@@ -2,5 +2,5 @@ sylius:
     resource: "../../../../vendor/sylius/sylius/app/config/routing.yml"
 
 bitbag_shipping_export_plugin:
-    resource: "@BitBagShippingExportPlugin/Resources/config/routing.yml"
+    resource: "@BitBagSyliusShippingExportPlugin/Resources/config/routing.yml"
     prefix: /admin