diff --git a/Config/config.php b/Config/config.php
index 0f66193..12f9f40 100644
--- a/Config/config.php
+++ b/Config/config.php
@@ -12,7 +12,7 @@
 return [
     'services' => [
         'events' => [
-            'mautic.sms.campaignbundle.subscriber' => [
+            'mautic.sms.infobipcampaignbundle.subscriber' => [
                 'class'     => 'MauticPlugin\MauticInfoBipSmsBundle\EventListener\CampaignSubscriber',
                 'arguments' => [
                     'mautic.helper.integration',
@@ -28,19 +28,19 @@
                     'mautic.asset.helper.token',
                 ],
             ],
-            'mautic.sms.channel.subscriber' => [
+            'mautic.sms.infobipchannel.subscriber' => [
                 'class'     => \MauticPlugin\MauticInfoBipSmsBundle\EventListener\ChannelSubscriber::class,
                 'arguments' => [
                     'mautic.helper.integration',
                 ],
             ],
-            'mautic.sms.message_queue.subscriber' => [
+            'mautic.sms.infobipmessage_queue.subscriber' => [
                 'class'     => \MauticPlugin\MauticInfoBipSmsBundle\EventListener\MessageQueueSubscriber::class,
                 'arguments' => [
                     'mautic.sms.model.sms',
                 ],
             ],
-            'mautic.sms.stats.subscriber' => [
+            'mautic.sms.infobipstats.subscriber' => [
                 'class'     => \MauticPlugin\MauticInfoBipSmsBundle\EventListener\StatsSubscriber::class,
                 'arguments' => [
                     'doctrine.orm.entity_manager',
@@ -48,27 +48,27 @@
             ],
         ],
         'forms' => [
-            'mautic.form.type.sms' => [
+            'mautic.form.type.infobipsms' => [
                 'class'     => 'MauticPlugin\MauticInfoBipSmsBundle\Form\Type\SmsType',
                 'arguments' => 'mautic.factory',
                 'alias'     => 'sms',
             ],
-            'mautic.form.type.smsconfig' => [
+            'mautic.form.type.infobipsmsconfig' => [
                 'class' => 'MauticPlugin\MauticInfoBipSmsBundle\Form\Type\ConfigType',
                 'alias' => 'smsconfig',
             ],
-            'mautic.form.type.smssend_list' => [
+            'mautic.form.type.infobipsmssend_list' => [
                 'class'     => 'MauticPlugin\MauticInfoBipSmsBundle\Form\Type\SmsSendType',
                 'arguments' => 'router',
                 'alias'     => 'smssend_list',
             ],
-            'mautic.form.type.sms_list' => [
+            'mautic.form.type.infobipsms_list' => [
                 'class' => 'MauticPlugin\MauticInfoBipSmsBundle\Form\Type\SmsListType',
                 'alias' => 'sms_list',
             ],
         ],
         'helpers' => [
-            'mautic.helper.sms' => [
+            'mautic.helper.infobipsms' => [
                 'class'     => 'MauticPlugin\MauticInfoBipSmsBundle\Helper\SmsHelper',
                 'arguments' => [
                     'doctrine.orm.entity_manager',
@@ -81,7 +81,7 @@
             ],
         ],
         'other' => [
-            'mautic.sms.api' => [
+            'mautic.infobipsms.api' => [
                 'class'     => 'MauticPlugin\MauticInfoBipSmsBundle\Api\InfoBipApi',
                 'arguments' => [
                     'mautic.page.model.trackable',
@@ -93,7 +93,7 @@
             ],
         ],
         'models' => [
-            'mautic.sms.model.sms' => [
+            'mautic.infobipsms.model.sms' => [
                 'class'     => 'MauticPlugin\MauticInfoBipSmsBundle\Model\SmsModel',
                 'arguments' => [
                     'mautic.page.model.trackable',
diff --git a/EventListener/CampaignSubscriber.php b/EventListener/CampaignSubscriber.php
index b976f0a..340180b 100644
--- a/EventListener/CampaignSubscriber.php
+++ b/EventListener/CampaignSubscriber.php
@@ -16,7 +16,7 @@
 use Mautic\CampaignBundle\Event\CampaignExecutionEvent;
 use Mautic\CoreBundle\EventListener\CommonSubscriber;
 use Mautic\PluginBundle\Helper\IntegrationHelper;
-use MauticPlugin\MauticInfoBipSmsBundle\Model\SmsModel;
+use Mautic\SmsBundle\Model\SmsModel;
 use MauticPlugin\MauticInfoBipSmsBundle\SmsEvents;
 
 /**
diff --git a/EventListener/SmsSubscriber.php b/EventListener/SmsSubscriber.php
index 781bf86..de7c1dc 100644
--- a/EventListener/SmsSubscriber.php
+++ b/EventListener/SmsSubscriber.php
@@ -85,7 +85,7 @@ public static function getSubscribedEvents()
      *
      * @param SmsEvent $event
      */
-    public function onPostSave(\MauticPlugin\MauticInfoBipSmsBundle\Event\SmsEvent $event)
+    public function onPostSave(SmsEvent $event)
     {
         $entity = $event->getSms();
         if ($details = $event->getChanges()) {