diff --git a/app/config/config.yml b/app/config/config.yml
index a53562f7d..6cd6557e6 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -285,7 +285,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.pocket'
-            callback: wallabag_import.consumer.amqp.pocket
+            callback: wallabag_core.consumer.amqp.pocket
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_readability:
             connection: default
@@ -294,7 +294,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.readability'
-            callback: wallabag_import.consumer.amqp.readability
+            callback: wallabag_core.consumer.amqp.readability
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_instapaper:
             connection: default
@@ -303,7 +303,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.instapaper'
-            callback: wallabag_import.consumer.amqp.instapaper
+            callback: wallabag_core.consumer.amqp.instapaper
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_pinboard:
             connection: default
@@ -312,7 +312,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.pinboard'
-            callback: wallabag_import.consumer.amqp.pinboard
+            callback: wallabag_core.consumer.amqp.pinboard
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_delicious:
             connection: default
@@ -321,7 +321,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.delicious'
-            callback: wallabag_import.consumer.amqp.delicious
+            callback: wallabag_core.consumer.amqp.delicious
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_wallabag_v1:
             connection: default
@@ -330,7 +330,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.wallabag_v1'
-            callback: wallabag_import.consumer.amqp.wallabag_v1
+            callback: wallabag_core.consumer.amqp.wallabag_v1
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_wallabag_v2:
             connection: default
@@ -339,7 +339,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.wallabag_v2'
-            callback: wallabag_import.consumer.amqp.wallabag_v2
+            callback: wallabag_core.consumer.amqp.wallabag_v2
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_elcurator:
             connection: default
@@ -348,7 +348,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.elcurator'
-            callback: wallabag_import.consumer.amqp.elcurator
+            callback: wallabag_core.consumer.amqp.elcurator
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_firefox:
             connection: default
@@ -357,7 +357,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.firefox'
-            callback: wallabag_import.consumer.amqp.firefox
+            callback: wallabag_core.consumer.amqp.firefox
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_chrome:
             connection: default
@@ -366,7 +366,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.chrome'
-            callback: wallabag_import.consumer.amqp.chrome
+            callback: wallabag_core.consumer.amqp.chrome
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_shaarli:
             connection: default
@@ -375,7 +375,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.shaarli'
-            callback: wallabag_import.consumer.amqp.shaarli
+            callback: wallabag_core.consumer.amqp.shaarli
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_pocket_html:
             connection: default
@@ -384,7 +384,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.pocket_html'
-            callback: wallabag_import.consumer.amqp.pocket_html
+            callback: wallabag_core.consumer.amqp.pocket_html
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
 
 fos_js_routing:
@@ -424,7 +424,7 @@ httplug:
         wallabag_core.entry.download_images:
             factory: 'httplug.factory.auto'
             plugins: ['httplug.plugin.logger']
-        wallabag_import.pocket.client:
+        wallabag_core.pocket.client:
             factory: 'httplug.factory.auto'
             plugins:
                 - 'httplug.plugin.logger'
diff --git a/app/config/services.yml b/app/config/services.yml
index de4a5f696..3e89e29df 100644
--- a/app/config/services.yml
+++ b/app/config/services.yml
@@ -46,62 +46,62 @@ services:
     Wallabag\CoreBundle\Controller\Import\ChromeController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_chrome_producer'
-            $redisProducer: '@wallabag_import.producer.redis.chrome'
+            $redisProducer: '@wallabag_core.producer.redis.chrome'
 
     Wallabag\CoreBundle\Controller\Import\DeliciousController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_delicious_producer'
-            $redisProducer: '@wallabag_import.producer.redis.delicious'
+            $redisProducer: '@wallabag_core.producer.redis.delicious'
 
     Wallabag\CoreBundle\Controller\Import\ElcuratorController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_elcurator_producer'
-            $redisProducer: '@wallabag_import.producer.redis.elcurator'
+            $redisProducer: '@wallabag_core.producer.redis.elcurator'
 
     Wallabag\CoreBundle\Controller\Import\FirefoxController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_firefox_producer'
-            $redisProducer: '@wallabag_import.producer.redis.firefox'
+            $redisProducer: '@wallabag_core.producer.redis.firefox'
 
     Wallabag\CoreBundle\Controller\Import\InstapaperController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_instapaper_producer'
-            $redisProducer: '@wallabag_import.producer.redis.instapaper'
+            $redisProducer: '@wallabag_core.producer.redis.instapaper'
 
     Wallabag\CoreBundle\Controller\Import\PinboardController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_pinboard_producer'
-            $redisProducer: '@wallabag_import.producer.redis.pinboard'
+            $redisProducer: '@wallabag_core.producer.redis.pinboard'
 
     Wallabag\CoreBundle\Controller\Import\PocketController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_pocket_producer'
-            $redisProducer: '@wallabag_import.producer.redis.pocket'
+            $redisProducer: '@wallabag_core.producer.redis.pocket'
 
     Wallabag\CoreBundle\Controller\Import\ReadabilityController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_readability_producer'
-            $redisProducer: '@wallabag_import.producer.redis.readability'
+            $redisProducer: '@wallabag_core.producer.redis.readability'
 
     Wallabag\CoreBundle\Controller\Import\WallabagV1Controller:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_wallabag_v1_producer'
-            $redisProducer: '@wallabag_import.producer.redis.wallabag_v1'
+            $redisProducer: '@wallabag_core.producer.redis.wallabag_v1'
 
     Wallabag\CoreBundle\Controller\Import\WallabagV2Controller:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_wallabag_v2_producer'
-            $redisProducer: '@wallabag_import.producer.redis.wallabag_v2'
+            $redisProducer: '@wallabag_core.producer.redis.wallabag_v2'
 
     Wallabag\CoreBundle\Controller\Import\ShaarliController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_shaarli_producer'
-            $redisProducer: '@wallabag_import.producer.redis.shaarli'
+            $redisProducer: '@wallabag_core.producer.redis.shaarli'
 
     Wallabag\CoreBundle\Controller\Import\PocketHtmlController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_pocket_html_producer'
-            $redisProducer: '@wallabag_import.producer.redis.pocket_html'
+            $redisProducer: '@wallabag_core.producer.redis.pocket_html'
 
     Doctrine\DBAL\Connection:
         alias: doctrine.dbal.default_connection
@@ -322,58 +322,58 @@ services:
         tags:
             - { name: kernel.event_listener, event: security.authentication.failure, method: onAuthenticationFailure }
 
-    wallabag_import.pocket.client:
-        alias: 'httplug.client.wallabag_import.pocket.client'
+    wallabag_core.pocket.client:
+        alias: 'httplug.client.wallabag_core.pocket.client'
 
     Wallabag\CoreBundle\Import\PocketImport:
         calls:
-            - [ setClient, [ "@wallabag_import.pocket.client" ] ]
+            - [ setClient, [ "@wallabag_core.pocket.client" ] ]
         tags:
-            -  { name: wallabag_import.import, alias: pocket }
+            -  { name: wallabag_core.import, alias: pocket }
 
     Wallabag\CoreBundle\Import\WallabagV1Import:
         tags:
-            -  { name: wallabag_import.import, alias: wallabag_v1 }
+            -  { name: wallabag_core.import, alias: wallabag_v1 }
 
     Wallabag\CoreBundle\Import\WallabagV2Import:
         tags:
-            -  { name: wallabag_import.import, alias: wallabag_v2 }
+            -  { name: wallabag_core.import, alias: wallabag_v2 }
 
     Wallabag\CoreBundle\Import\ElcuratorImport:
         tags:
-            -  { name: wallabag_import.import, alias: elcurator }
+            -  { name: wallabag_core.import, alias: elcurator }
 
     Wallabag\CoreBundle\Import\ReadabilityImport:
         tags:
-            -  { name: wallabag_import.import, alias: readability }
+            -  { name: wallabag_core.import, alias: readability }
 
     Wallabag\CoreBundle\Import\InstapaperImport:
         tags:
-            -  { name: wallabag_import.import, alias: instapaper }
+            -  { name: wallabag_core.import, alias: instapaper }
 
     Wallabag\CoreBundle\Import\PinboardImport:
         tags:
-            -  { name: wallabag_import.import, alias: pinboard }
+            -  { name: wallabag_core.import, alias: pinboard }
 
     Wallabag\CoreBundle\Import\DeliciousImport:
         tags:
-            -  { name: wallabag_import.import, alias: delicious }
+            -  { name: wallabag_core.import, alias: delicious }
 
     Wallabag\CoreBundle\Import\FirefoxImport:
         tags:
-            -  { name: wallabag_import.import, alias: firefox }
+            -  { name: wallabag_core.import, alias: firefox }
 
     Wallabag\CoreBundle\Import\ChromeImport:
         tags:
-            -  { name: wallabag_import.import, alias: chrome }
+            -  { name: wallabag_core.import, alias: chrome }
 
     Wallabag\CoreBundle\Import\ShaarliImport:
         tags:
-            -  { name: wallabag_import.import, alias: shaarli }
+            -  { name: wallabag_core.import, alias: shaarli }
 
     Wallabag\CoreBundle\Import\PocketHtmlImport:
         tags:
-            -  { name: wallabag_import.import, alias: pocket_html }
+            -  { name: wallabag_core.import, alias: pocket_html }
 
     # to factorize the proximity and bypass translation for prev & next
     pagerfanta.view.default_wallabag:
diff --git a/app/config/services_rabbit.yml b/app/config/services_rabbit.yml
index b7ab0ccd4..1a475370e 100644
--- a/app/config/services_rabbit.yml
+++ b/app/config/services_rabbit.yml
@@ -20,62 +20,62 @@ services:
             $shaarliConsumer: '@old_sound_rabbit_mq.import_shaarli_consumer'
             $pocketHtmlConsumer: '@old_sound_rabbit_mq.import_pocket_html_consumer'
 
-    wallabag_import.consumer.amqp.pocket:
+    wallabag_core.consumer.amqp.pocket:
         class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\CoreBundle\Import\PocketImport'
 
-    wallabag_import.consumer.amqp.readability:
+    wallabag_core.consumer.amqp.readability:
         class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\CoreBundle\Import\ReadabilityImport'
 
-    wallabag_import.consumer.amqp.instapaper:
+    wallabag_core.consumer.amqp.instapaper:
         class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\CoreBundle\Import\InstapaperImport'
 
-    wallabag_import.consumer.amqp.pinboard:
+    wallabag_core.consumer.amqp.pinboard:
         class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\CoreBundle\Import\PinboardImport'
 
-    wallabag_import.consumer.amqp.delicious:
+    wallabag_core.consumer.amqp.delicious:
         class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\CoreBundle\Import\DeliciousImport'
 
-    wallabag_import.consumer.amqp.wallabag_v1:
+    wallabag_core.consumer.amqp.wallabag_v1:
         class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\CoreBundle\Import\WallabagV1Import'
 
-    wallabag_import.consumer.amqp.wallabag_v2:
+    wallabag_core.consumer.amqp.wallabag_v2:
         class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\CoreBundle\Import\WallabagV2Import'
 
-    wallabag_import.consumer.amqp.elcurator:
+    wallabag_core.consumer.amqp.elcurator:
         class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\CoreBundle\Import\ElcuratorImport'
 
-    wallabag_import.consumer.amqp.firefox:
+    wallabag_core.consumer.amqp.firefox:
         class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\CoreBundle\Import\FirefoxImport'
 
-    wallabag_import.consumer.amqp.chrome:
+    wallabag_core.consumer.amqp.chrome:
         class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\CoreBundle\Import\ChromeImport'
 
-    wallabag_import.consumer.amqp.shaarli:
+    wallabag_core.consumer.amqp.shaarli:
         class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\CoreBundle\Import\ShaarliImport'
 
-    wallabag_import.consumer.amqp.pocket_html:
+    wallabag_core.consumer.amqp.pocket_html:
         class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\CoreBundle\Import\PocketHtmlImport'
diff --git a/app/config/services_redis.yml b/app/config/services_redis.yml
index 11fc0dac3..3f052b293 100644
--- a/app/config/services_redis.yml
+++ b/app/config/services_redis.yml
@@ -6,193 +6,193 @@ services:
         public: true
 
     # readability
-    wallabag_import.queue.redis.readability:
+    wallabag_core.queue.redis.readability:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.readability"
 
-    wallabag_import.producer.redis.readability:
+    wallabag_core.producer.redis.readability:
         class: Wallabag\CoreBundle\Redis\Producer
         arguments:
-            - "@wallabag_import.queue.redis.readability"
+            - "@wallabag_core.queue.redis.readability"
 
-    wallabag_import.consumer.redis.readability:
+    wallabag_core.consumer.redis.readability:
         class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\CoreBundle\Import\ReadabilityImport'
 
     # instapaper
-    wallabag_import.queue.redis.instapaper:
+    wallabag_core.queue.redis.instapaper:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.instapaper"
 
-    wallabag_import.producer.redis.instapaper:
+    wallabag_core.producer.redis.instapaper:
         class: Wallabag\CoreBundle\Redis\Producer
         arguments:
-            - "@wallabag_import.queue.redis.instapaper"
+            - "@wallabag_core.queue.redis.instapaper"
 
-    wallabag_import.consumer.redis.instapaper:
+    wallabag_core.consumer.redis.instapaper:
         class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\CoreBundle\Import\InstapaperImport'
 
     # pinboard
-    wallabag_import.queue.redis.pinboard:
+    wallabag_core.queue.redis.pinboard:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.pinboard"
 
-    wallabag_import.producer.redis.pinboard:
+    wallabag_core.producer.redis.pinboard:
         class: Wallabag\CoreBundle\Redis\Producer
         arguments:
-            - "@wallabag_import.queue.redis.pinboard"
+            - "@wallabag_core.queue.redis.pinboard"
 
-    wallabag_import.consumer.redis.pinboard:
+    wallabag_core.consumer.redis.pinboard:
         class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\CoreBundle\Import\PinboardImport'
 
     # delicious
-    wallabag_import.queue.redis.delicious:
+    wallabag_core.queue.redis.delicious:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.delicious"
 
-    wallabag_import.producer.redis.delicious:
+    wallabag_core.producer.redis.delicious:
         class: Wallabag\CoreBundle\Redis\Producer
         arguments:
-            - "@wallabag_import.queue.redis.delicious"
+            - "@wallabag_core.queue.redis.delicious"
 
-    wallabag_import.consumer.redis.delicious:
+    wallabag_core.consumer.redis.delicious:
         class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\CoreBundle\Import\DeliciousImport'
 
     # pocket
-    wallabag_import.queue.redis.pocket:
+    wallabag_core.queue.redis.pocket:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.pocket"
 
-    wallabag_import.producer.redis.pocket:
+    wallabag_core.producer.redis.pocket:
         class: Wallabag\CoreBundle\Redis\Producer
         arguments:
-            - "@wallabag_import.queue.redis.pocket"
+            - "@wallabag_core.queue.redis.pocket"
 
-    wallabag_import.consumer.redis.pocket:
+    wallabag_core.consumer.redis.pocket:
         class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\CoreBundle\Import\PocketImport'
 
     # wallabag v1
-    wallabag_import.queue.redis.wallabag_v1:
+    wallabag_core.queue.redis.wallabag_v1:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.wallabag_v1"
 
-    wallabag_import.producer.redis.wallabag_v1:
+    wallabag_core.producer.redis.wallabag_v1:
         class: Wallabag\CoreBundle\Redis\Producer
         arguments:
-            - "@wallabag_import.queue.redis.wallabag_v1"
+            - "@wallabag_core.queue.redis.wallabag_v1"
 
-    wallabag_import.consumer.redis.wallabag_v1:
+    wallabag_core.consumer.redis.wallabag_v1:
         class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\CoreBundle\Import\WallabagV1Import'
 
     # wallabag v2
-    wallabag_import.queue.redis.wallabag_v2:
+    wallabag_core.queue.redis.wallabag_v2:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.wallabag_v2"
 
-    wallabag_import.producer.redis.wallabag_v2:
+    wallabag_core.producer.redis.wallabag_v2:
         class: Wallabag\CoreBundle\Redis\Producer
         arguments:
-            - "@wallabag_import.queue.redis.wallabag_v2"
+            - "@wallabag_core.queue.redis.wallabag_v2"
 
-    wallabag_import.consumer.redis.wallabag_v2:
+    wallabag_core.consumer.redis.wallabag_v2:
         class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\CoreBundle\Import\WallabagV2Import'
 
     # elcurator
-    wallabag_import.queue.redis.elcurator:
+    wallabag_core.queue.redis.elcurator:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.elcurator"
 
-    wallabag_import.producer.redis.elcurator:
+    wallabag_core.producer.redis.elcurator:
         class: Wallabag\CoreBundle\Redis\Producer
         arguments:
-            - "@wallabag_import.queue.redis.elcurator"
+            - "@wallabag_core.queue.redis.elcurator"
 
-    wallabag_import.consumer.redis.elcurator:
+    wallabag_core.consumer.redis.elcurator:
         class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\CoreBundle\Import\ElcuratorImport'
 
     # firefox
-    wallabag_import.queue.redis.firefox:
+    wallabag_core.queue.redis.firefox:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.firefox"
 
-    wallabag_import.producer.redis.firefox:
+    wallabag_core.producer.redis.firefox:
         class: Wallabag\CoreBundle\Redis\Producer
         arguments:
-            - "@wallabag_import.queue.redis.firefox"
+            - "@wallabag_core.queue.redis.firefox"
 
-    wallabag_import.consumer.redis.firefox:
+    wallabag_core.consumer.redis.firefox:
         class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\CoreBundle\Import\FirefoxImport'
 
     # chrome
-    wallabag_import.queue.redis.chrome:
+    wallabag_core.queue.redis.chrome:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.chrome"
 
-    wallabag_import.producer.redis.chrome:
+    wallabag_core.producer.redis.chrome:
         class: Wallabag\CoreBundle\Redis\Producer
         arguments:
-            - "@wallabag_import.queue.redis.chrome"
+            - "@wallabag_core.queue.redis.chrome"
 
-    wallabag_import.consumer.redis.chrome:
+    wallabag_core.consumer.redis.chrome:
         class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\CoreBundle\Import\ChromeImport'
 
     # shaarli
-    wallabag_import.queue.redis.shaarli:
+    wallabag_core.queue.redis.shaarli:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.shaarli"
 
-    wallabag_import.producer.redis.shaarli:
+    wallabag_core.producer.redis.shaarli:
         class: Wallabag\CoreBundle\Redis\Producer
         arguments:
-            - "@wallabag_import.queue.redis.shaarli"
+            - "@wallabag_core.queue.redis.shaarli"
 
-    wallabag_import.consumer.redis.shaarli:
+    wallabag_core.consumer.redis.shaarli:
         class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\CoreBundle\Import\ShaarliImport'
 
     # pocket html
-    wallabag_import.queue.redis.pocket_html:
+    wallabag_core.queue.redis.pocket_html:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.pocket_html"
 
-    wallabag_import.producer.redis.pocket_html:
+    wallabag_core.producer.redis.pocket_html:
         class: Wallabag\CoreBundle\Redis\Producer
         arguments:
-            - "@wallabag_import.queue.redis.pocket_html"
+            - "@wallabag_core.queue.redis.pocket_html"
 
-    wallabag_import.consumer.redis.pocket_html:
+    wallabag_core.consumer.redis.pocket_html:
         class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\CoreBundle\Import\PocketHtmlImport'
diff --git a/src/Wallabag/CoreBundle/Command/Import/RedisWorkerCommand.php b/src/Wallabag/CoreBundle/Command/Import/RedisWorkerCommand.php
index e952a8726..4c38058b5 100644
--- a/src/Wallabag/CoreBundle/Command/Import/RedisWorkerCommand.php
+++ b/src/Wallabag/CoreBundle/Command/Import/RedisWorkerCommand.php
@@ -39,13 +39,13 @@ class RedisWorkerCommand extends Command
 
         $serviceName = $input->getArgument('serviceName');
 
-        if (!$this->container->has('wallabag_import.queue.redis.' . $serviceName) || !$this->container->has('wallabag_import.consumer.redis.' . $serviceName)) {
+        if (!$this->container->has('wallabag_core.queue.redis.' . $serviceName) || !$this->container->has('wallabag_core.consumer.redis.' . $serviceName)) {
             throw new Exception(sprintf('No queue or consumer found for service name: "%s"', $input->getArgument('serviceName')));
         }
 
         $worker = new QueueWorker(
-            $this->container->get('wallabag_import.queue.redis.' . $serviceName),
-            $this->container->get('wallabag_import.consumer.redis.' . $serviceName),
+            $this->container->get('wallabag_core.queue.redis.' . $serviceName),
+            $this->container->get('wallabag_core.consumer.redis.' . $serviceName),
             (int) $input->getOption('maxIterations')
         );
 
diff --git a/src/Wallabag/CoreBundle/Controller/Import/BrowserController.php b/src/Wallabag/CoreBundle/Controller/Import/BrowserController.php
index c89df2e11..65f957995 100644
--- a/src/Wallabag/CoreBundle/Controller/Import/BrowserController.php
+++ b/src/Wallabag/CoreBundle/Controller/Import/BrowserController.php
@@ -30,9 +30,9 @@ abstract class BrowserController extends AbstractController
             $markAsRead = $form->get('mark_as_read')->getData();
             $name = $this->getUser()->getId() . '.json';
 
-            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
+            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
                 $res = $wallabag
-                    ->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)
+                    ->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
                     ->setMarkAsRead($markAsRead)
                     ->import();
 
@@ -51,7 +51,7 @@ abstract class BrowserController extends AbstractController
                         ]);
                     }
 
-                    unlink($this->getParameter('wallabag_import.resource_dir') . '/' . $name);
+                    unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
                 }
 
                 $this->addFlash('notice', $message);
diff --git a/src/Wallabag/CoreBundle/Controller/Import/DeliciousController.php b/src/Wallabag/CoreBundle/Controller/Import/DeliciousController.php
index e495fe143..c0d9b5084 100644
--- a/src/Wallabag/CoreBundle/Controller/Import/DeliciousController.php
+++ b/src/Wallabag/CoreBundle/Controller/Import/DeliciousController.php
@@ -44,9 +44,9 @@ class DeliciousController extends AbstractController
             $markAsRead = $form->get('mark_as_read')->getData();
             $name = 'delicious_' . $this->getUser()->getId() . '.json';
 
-            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
+            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
                 $res = $delicious
-                    ->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)
+                    ->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
                     ->setMarkAsRead($markAsRead)
                     ->import();
 
@@ -65,7 +65,7 @@ class DeliciousController extends AbstractController
                         ]);
                     }
 
-                    unlink($this->getParameter('wallabag_import.resource_dir') . '/' . $name);
+                    unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
                 }
 
                 $this->addFlash('notice', $message);
diff --git a/src/Wallabag/CoreBundle/Controller/Import/HtmlController.php b/src/Wallabag/CoreBundle/Controller/Import/HtmlController.php
index e6f0af226..c34934e8f 100644
--- a/src/Wallabag/CoreBundle/Controller/Import/HtmlController.php
+++ b/src/Wallabag/CoreBundle/Controller/Import/HtmlController.php
@@ -30,9 +30,9 @@ abstract class HtmlController extends AbstractController
             $markAsRead = $form->get('mark_as_read')->getData();
             $name = $this->getUser()->getId() . '.html';
 
-            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
+            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
                 $res = $wallabag
-                    ->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)
+                    ->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
                     ->setMarkAsRead($markAsRead)
                     ->import();
 
@@ -51,7 +51,7 @@ abstract class HtmlController extends AbstractController
                         ]);
                     }
 
-                    unlink($this->getParameter('wallabag_import.resource_dir') . '/' . $name);
+                    unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
                 }
 
                 $this->addFlash('notice', $message);
diff --git a/src/Wallabag/CoreBundle/Controller/Import/InstapaperController.php b/src/Wallabag/CoreBundle/Controller/Import/InstapaperController.php
index c9999c6dc..655784d22 100644
--- a/src/Wallabag/CoreBundle/Controller/Import/InstapaperController.php
+++ b/src/Wallabag/CoreBundle/Controller/Import/InstapaperController.php
@@ -44,9 +44,9 @@ class InstapaperController extends AbstractController
             $markAsRead = $form->get('mark_as_read')->getData();
             $name = 'instapaper_' . $this->getUser()->getId() . '.csv';
 
-            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
+            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
                 $res = $instapaper
-                    ->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)
+                    ->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
                     ->setMarkAsRead($markAsRead)
                     ->import();
 
@@ -65,7 +65,7 @@ class InstapaperController extends AbstractController
                         ]);
                     }
 
-                    unlink($this->getParameter('wallabag_import.resource_dir') . '/' . $name);
+                    unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
                 }
 
                 $this->addFlash('notice', $message);
diff --git a/src/Wallabag/CoreBundle/Controller/Import/PinboardController.php b/src/Wallabag/CoreBundle/Controller/Import/PinboardController.php
index 8a33f04f1..2e39eff22 100644
--- a/src/Wallabag/CoreBundle/Controller/Import/PinboardController.php
+++ b/src/Wallabag/CoreBundle/Controller/Import/PinboardController.php
@@ -44,9 +44,9 @@ class PinboardController extends AbstractController
             $markAsRead = $form->get('mark_as_read')->getData();
             $name = 'pinboard_' . $this->getUser()->getId() . '.json';
 
-            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
+            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
                 $res = $pinboard
-                    ->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)
+                    ->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
                     ->setMarkAsRead($markAsRead)
                     ->import();
 
@@ -65,7 +65,7 @@ class PinboardController extends AbstractController
                         ]);
                     }
 
-                    unlink($this->getParameter('wallabag_import.resource_dir') . '/' . $name);
+                    unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
                 }
 
                 $this->addFlash('notice', $message);
diff --git a/src/Wallabag/CoreBundle/Controller/Import/ReadabilityController.php b/src/Wallabag/CoreBundle/Controller/Import/ReadabilityController.php
index 8a5988bcb..d7af59322 100644
--- a/src/Wallabag/CoreBundle/Controller/Import/ReadabilityController.php
+++ b/src/Wallabag/CoreBundle/Controller/Import/ReadabilityController.php
@@ -44,9 +44,9 @@ class ReadabilityController extends AbstractController
             $markAsRead = $form->get('mark_as_read')->getData();
             $name = 'readability_' . $this->getUser()->getId() . '.json';
 
-            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
+            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
                 $res = $readability
-                    ->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)
+                    ->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
                     ->setMarkAsRead($markAsRead)
                     ->import();
 
@@ -65,7 +65,7 @@ class ReadabilityController extends AbstractController
                         ]);
                     }
 
-                    unlink($this->getParameter('wallabag_import.resource_dir') . '/' . $name);
+                    unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
                 }
 
                 $this->addFlash('notice', $message);
diff --git a/src/Wallabag/CoreBundle/Controller/Import/WallabagController.php b/src/Wallabag/CoreBundle/Controller/Import/WallabagController.php
index bdc830ba7..669bbb8ab 100644
--- a/src/Wallabag/CoreBundle/Controller/Import/WallabagController.php
+++ b/src/Wallabag/CoreBundle/Controller/Import/WallabagController.php
@@ -33,9 +33,9 @@ abstract class WallabagController extends AbstractController
             $markAsRead = $form->get('mark_as_read')->getData();
             $name = $this->getUser()->getId() . '.json';
 
-            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
+            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
                 $res = $wallabag
-                    ->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)
+                    ->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
                     ->setMarkAsRead($markAsRead)
                     ->import();
 
@@ -54,7 +54,7 @@ abstract class WallabagController extends AbstractController
                         ]);
                     }
 
-                    unlink($this->getParameter('wallabag_import.resource_dir') . '/' . $name);
+                    unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
                 }
 
                 $this->addFlash('notice', $message);
diff --git a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
index 6dfde41fb..754931681 100644
--- a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
+++ b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
@@ -30,8 +30,8 @@ class WallabagCoreExtension extends Extension
         $container->setParameter('wallabag_core.site_credentials.encryption_key_path', $config['encryption_key_path']);
         $container->setParameter('wallabag_core.default_ignore_origin_instance_rules', $config['default_ignore_origin_instance_rules']);
         $container->setParameter('wallabag_core.fonts', $config['fonts']);
-        $container->setParameter('wallabag_import.allow_mimetypes', $config['allow_mimetypes']);
-        $container->setParameter('wallabag_import.resource_dir', $config['resource_dir']);
+        $container->setParameter('wallabag_core.allow_mimetypes', $config['allow_mimetypes']);
+        $container->setParameter('wallabag_core.resource_dir', $config['resource_dir']);
     }
 
     public function getAlias()
diff --git a/src/Wallabag/CoreBundle/Import/ImportCompilerPass.php b/src/Wallabag/CoreBundle/Import/ImportCompilerPass.php
index 02905262a..02fdcc759 100644
--- a/src/Wallabag/CoreBundle/Import/ImportCompilerPass.php
+++ b/src/Wallabag/CoreBundle/Import/ImportCompilerPass.php
@@ -19,7 +19,7 @@ class ImportCompilerPass implements CompilerPassInterface
         );
 
         $taggedServices = $container->findTaggedServiceIds(
-            'wallabag_import.import'
+            'wallabag_core.import'
         );
         foreach ($taggedServices as $id => $tagAttributes) {
             foreach ($tagAttributes as $attributes) {
diff --git a/tests/Wallabag/CoreBundle/Import/ImportCompilerPassTest.php b/tests/Wallabag/CoreBundle/Import/ImportCompilerPassTest.php
index 723d4107c..af6df512f 100644
--- a/tests/Wallabag/CoreBundle/Import/ImportCompilerPassTest.php
+++ b/tests/Wallabag/CoreBundle/Import/ImportCompilerPassTest.php
@@ -27,7 +27,7 @@ class ImportCompilerPassTest extends TestCase
 
         $container
             ->register('foo')
-            ->addTag('wallabag_import.import', ['alias' => 'pocket'])
+            ->addTag('wallabag_core.import', ['alias' => 'pocket'])
         ;
 
         $this->process($container);