diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md
index 30dc85411..c84d753a3 100644
--- a/RELEASE_PROCESS.md
+++ b/RELEASE_PROCESS.md
@@ -9,7 +9,7 @@ During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE` (li
 #### Prepare the release
 
 - Update these files with new information
-    - `app/config/wallabag.yml` (`wallabag_core.version`)
+    - `app/config/wallabag.yml` (`wallabag.version`)
     - `CHANGELOG.md`
 - Create a PR named "Prepare $LAST_WALLABAG_RELEASE release".
 - Wait for test to be ok, merge it.
@@ -19,7 +19,7 @@ During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE` (li
 - [Create the new release on GitHub](https://github.com/wallabag/wallabag/releases/new) by targetting the `master` branch or any appropriate branch (for instance backports).
 - Update [website](https://github.com/wallabag/website) to change MD5 sum and create the release blog post (based on the changelog).
 - Update Dockerfile https://github.com/wallabag/docker (and create a new tag)
-- Put the next patch version suffixed with `-dev` in `app/config/wallabag.yml` (`wallabag_core.version`)
+- Put the next patch version suffixed with `-dev` in `app/config/wallabag.yml` (`wallabag.version`)
 - Drink a :beer:!
 
 ### Target PHP version
diff --git a/app/DoctrineMigrations/Version20190826204730.php b/app/DoctrineMigrations/Version20190826204730.php
index 12ff52b58..59d4e4008 100644
--- a/app/DoctrineMigrations/Version20190826204730.php
+++ b/app/DoctrineMigrations/Version20190826204730.php
@@ -45,7 +45,7 @@ final class Version20190826204730 extends WallabagMigration
 
     public function postUp(Schema $schema): void
     {
-        foreach ($this->container->getParameter('wallabag_core.default_ignore_origin_instance_rules') as $entity) {
+        foreach ($this->container->getParameter('wallabag.default_ignore_origin_instance_rules') as $entity) {
             $previous_rule = $this->container
                 ->get('doctrine.orm.default_entity_manager')
                 ->getConnection()
diff --git a/app/DoctrineMigrations/Version20230728093912.php b/app/DoctrineMigrations/Version20230728093912.php
index fffd22696..74394ecce 100644
--- a/app/DoctrineMigrations/Version20230728093912.php
+++ b/app/DoctrineMigrations/Version20230728093912.php
@@ -37,7 +37,7 @@ final class Version20230728093912 extends WallabagMigration
             'UPDATE ' . $this->getTable('entry') . ' SET is_not_parsed = :isNotParsed WHERE content LIKE :content',
             [
                 'isNotParsed' => true,
-                'content' => str_replace("\n", '', addslashes($this->container->getParameter('wallabag_core.fetching_error_message'))) . '%',
+                'content' => str_replace("\n", '', addslashes($this->container->getParameter('wallabag.fetching_error_message'))) . '%',
             ]
         );
     }
diff --git a/app/config/config.yml b/app/config/config.yml
index b781565b4..7f8a0108d 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -302,7 +302,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.pocket'
-            callback: wallabag_core.consumer.amqp.pocket
+            callback: wallabag.consumer.amqp.pocket
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_readability:
             connection: default
@@ -311,7 +311,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.readability'
-            callback: wallabag_core.consumer.amqp.readability
+            callback: wallabag.consumer.amqp.readability
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_instapaper:
             connection: default
@@ -320,7 +320,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.instapaper'
-            callback: wallabag_core.consumer.amqp.instapaper
+            callback: wallabag.consumer.amqp.instapaper
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_pinboard:
             connection: default
@@ -329,7 +329,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.pinboard'
-            callback: wallabag_core.consumer.amqp.pinboard
+            callback: wallabag.consumer.amqp.pinboard
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_delicious:
             connection: default
@@ -338,7 +338,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.delicious'
-            callback: wallabag_core.consumer.amqp.delicious
+            callback: wallabag.consumer.amqp.delicious
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_wallabag_v1:
             connection: default
@@ -347,7 +347,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.wallabag_v1'
-            callback: wallabag_core.consumer.amqp.wallabag_v1
+            callback: wallabag.consumer.amqp.wallabag_v1
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_wallabag_v2:
             connection: default
@@ -356,7 +356,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.wallabag_v2'
-            callback: wallabag_core.consumer.amqp.wallabag_v2
+            callback: wallabag.consumer.amqp.wallabag_v2
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_elcurator:
             connection: default
@@ -365,7 +365,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.elcurator'
-            callback: wallabag_core.consumer.amqp.elcurator
+            callback: wallabag.consumer.amqp.elcurator
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_firefox:
             connection: default
@@ -374,7 +374,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.firefox'
-            callback: wallabag_core.consumer.amqp.firefox
+            callback: wallabag.consumer.amqp.firefox
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_chrome:
             connection: default
@@ -383,7 +383,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.chrome'
-            callback: wallabag_core.consumer.amqp.chrome
+            callback: wallabag.consumer.amqp.chrome
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_shaarli:
             connection: default
@@ -392,7 +392,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.shaarli'
-            callback: wallabag_core.consumer.amqp.shaarli
+            callback: wallabag.consumer.amqp.shaarli
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_pocket_html:
             connection: default
@@ -401,7 +401,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.pocket_html'
-            callback: wallabag_core.consumer.amqp.pocket_html
+            callback: wallabag.consumer.amqp.pocket_html
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
 
 fos_js_routing:
@@ -432,7 +432,7 @@ sensio_framework_extra:
 
 httplug:
     clients:
-        wallabag_core:
+        wallabag:
             factory: Wallabag\Helper\HttpClientFactory
             config:
                 defaults:
diff --git a/app/config/services.yml b/app/config/services.yml
index 655fb78e8..90d574aeb 100644
--- a/app/config/services.yml
+++ b/app/config/services.yml
@@ -17,11 +17,11 @@ services:
             $defaultLocale: '%kernel.default_locale%'
             $wallabagUrl: '%domain_name%'
             $tablePrefix: "%database_table_prefix%"
-            $encryptionKeyPath: "%wallabag_core.site_credentials.encryption_key_path%"
-            $fetchingErrorMessageTitle: "%wallabag_core.fetching_error_message_title%"
-            $fetchingErrorMessage: '%wallabag_core.fetching_error_message%'
-            $languages: '%wallabag_core.languages%'
-            $lifeTime: '%wallabag_core.cache_lifetime%'
+            $encryptionKeyPath: "%wallabag.site_credentials.encryption_key_path%"
+            $fetchingErrorMessageTitle: "%wallabag.fetching_error_message_title%"
+            $fetchingErrorMessage: '%wallabag.fetching_error_message%'
+            $languages: '%wallabag.languages%'
+            $lifeTime: '%wallabag.cache_lifetime%'
             $cookieFile: "%kernel.cache_dir%/cookiejar.json"
             $logoPath: 'web/img/appicon/apple-touch-icon-152.png'
             $registrationEnabled: '%fosuser_registration%'
@@ -30,7 +30,7 @@ services:
             $senderName: "%scheb_two_factor.email.sender_name%"
             $storeArticleHeaders: '@=service(''craue_config'').get(''store_article_headers'')'
             $supportUrl: '@=service(''craue_config'').get(''wallabag_support_url'')'
-            $fonts: '%wallabag_core.fonts%'
+            $fonts: '%wallabag.fonts%'
 
     Wallabag\:
         resource: '../../src/*'
@@ -46,62 +46,62 @@ services:
     Wallabag\Controller\Import\ChromeController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_chrome_producer'
-            $redisProducer: '@wallabag_core.producer.redis.chrome'
+            $redisProducer: '@wallabag.producer.redis.chrome'
 
     Wallabag\Controller\Import\DeliciousController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_delicious_producer'
-            $redisProducer: '@wallabag_core.producer.redis.delicious'
+            $redisProducer: '@wallabag.producer.redis.delicious'
 
     Wallabag\Controller\Import\ElcuratorController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_elcurator_producer'
-            $redisProducer: '@wallabag_core.producer.redis.elcurator'
+            $redisProducer: '@wallabag.producer.redis.elcurator'
 
     Wallabag\Controller\Import\FirefoxController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_firefox_producer'
-            $redisProducer: '@wallabag_core.producer.redis.firefox'
+            $redisProducer: '@wallabag.producer.redis.firefox'
 
     Wallabag\Controller\Import\InstapaperController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_instapaper_producer'
-            $redisProducer: '@wallabag_core.producer.redis.instapaper'
+            $redisProducer: '@wallabag.producer.redis.instapaper'
 
     Wallabag\Controller\Import\PinboardController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_pinboard_producer'
-            $redisProducer: '@wallabag_core.producer.redis.pinboard'
+            $redisProducer: '@wallabag.producer.redis.pinboard'
 
     Wallabag\Controller\Import\PocketController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_pocket_producer'
-            $redisProducer: '@wallabag_core.producer.redis.pocket'
+            $redisProducer: '@wallabag.producer.redis.pocket'
 
     Wallabag\Controller\Import\ReadabilityController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_readability_producer'
-            $redisProducer: '@wallabag_core.producer.redis.readability'
+            $redisProducer: '@wallabag.producer.redis.readability'
 
     Wallabag\Controller\Import\WallabagV1Controller:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_wallabag_v1_producer'
-            $redisProducer: '@wallabag_core.producer.redis.wallabag_v1'
+            $redisProducer: '@wallabag.producer.redis.wallabag_v1'
 
     Wallabag\Controller\Import\WallabagV2Controller:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_wallabag_v2_producer'
-            $redisProducer: '@wallabag_core.producer.redis.wallabag_v2'
+            $redisProducer: '@wallabag.producer.redis.wallabag_v2'
 
     Wallabag\Controller\Import\ShaarliController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_shaarli_producer'
-            $redisProducer: '@wallabag_core.producer.redis.shaarli'
+            $redisProducer: '@wallabag.producer.redis.shaarli'
 
     Wallabag\Controller\Import\PocketHtmlController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_pocket_html_producer'
-            $redisProducer: '@wallabag_core.producer.redis.pocket_html'
+            $redisProducer: '@wallabag.producer.redis.pocket_html'
 
     Doctrine\DBAL\Connection:
         alias: doctrine.dbal.default_connection
@@ -177,8 +177,8 @@ services:
     Graby\Graby:
         arguments:
             $config:
-                error_message: '%wallabag_core.fetching_error_message%'
-                error_message_title: '%wallabag_core.fetching_error_message_title%'
+                error_message: '%wallabag.fetching_error_message%'
+                error_message_title: '%wallabag.fetching_error_message_title%'
         calls:
             - [ setLogger, [ "@logger" ] ]
         tags:
@@ -188,8 +188,8 @@ services:
         arguments:
             $config: {}
 
-    wallabag_core.http_client:
-        alias: 'httplug.client.wallabag_core'
+    wallabag.http_client:
+        alias: 'httplug.client.wallabag'
 
     Wallabag\SiteConfig\GrabySiteConfigBuilder:
         tags:
@@ -255,8 +255,8 @@ services:
         arguments:
             $databaseDriver: '%database_driver%'
             $databaseName: '%database_name%'
-            $defaultSettings: '%wallabag_core.default_internal_settings%'
-            $defaultIgnoreOriginInstanceRules: '%wallabag_core.default_ignore_origin_instance_rules%'
+            $defaultSettings: '%wallabag.default_internal_settings%'
+            $defaultIgnoreOriginInstanceRules: '%wallabag.default_ignore_origin_instance_rules%'
 
     Wallabag\Mailer\UserMailer:
         arguments:
@@ -270,13 +270,13 @@ services:
 
     Wallabag\Event\Listener\CreateConfigListener:
         arguments:
-            $itemsOnPage: "%wallabag_core.items_on_page%"
-            $feedLimit: "%wallabag_core.feed_limit%"
-            $language: "%wallabag_core.language%"
-            $readingSpeed: "%wallabag_core.reading_speed%"
-            $actionMarkAsRead: "%wallabag_core.action_mark_as_read%"
-            $listMode: "%wallabag_core.list_mode%"
-            $displayThumbnails: "%wallabag_core.display_thumbnails%"
+            $itemsOnPage: "%wallabag.items_on_page%"
+            $feedLimit: "%wallabag.feed_limit%"
+            $language: "%wallabag.language%"
+            $readingSpeed: "%wallabag.reading_speed%"
+            $actionMarkAsRead: "%wallabag.action_mark_as_read%"
+            $listMode: "%wallabag.list_mode%"
+            $displayThumbnails: "%wallabag.display_thumbnails%"
 
     Wallabag\Event\Listener\AuthenticationFailureListener:
         tags:
@@ -286,51 +286,51 @@ services:
         calls:
             - [ setClient, [ '@Symfony\Contracts\HttpClient\HttpClientInterface $pocketClient' ] ]
         tags:
-            -  { name: wallabag_core.import, alias: pocket }
+            -  { name: wallabag.import, alias: pocket }
 
     Wallabag\Import\WallabagV1Import:
         tags:
-            -  { name: wallabag_core.import, alias: wallabag_v1 }
+            -  { name: wallabag.import, alias: wallabag_v1 }
 
     Wallabag\Import\WallabagV2Import:
         tags:
-            -  { name: wallabag_core.import, alias: wallabag_v2 }
+            -  { name: wallabag.import, alias: wallabag_v2 }
 
     Wallabag\Import\ElcuratorImport:
         tags:
-            -  { name: wallabag_core.import, alias: elcurator }
+            -  { name: wallabag.import, alias: elcurator }
 
     Wallabag\Import\ReadabilityImport:
         tags:
-            -  { name: wallabag_core.import, alias: readability }
+            -  { name: wallabag.import, alias: readability }
 
     Wallabag\Import\InstapaperImport:
         tags:
-            -  { name: wallabag_core.import, alias: instapaper }
+            -  { name: wallabag.import, alias: instapaper }
 
     Wallabag\Import\PinboardImport:
         tags:
-            -  { name: wallabag_core.import, alias: pinboard }
+            -  { name: wallabag.import, alias: pinboard }
 
     Wallabag\Import\DeliciousImport:
         tags:
-            -  { name: wallabag_core.import, alias: delicious }
+            -  { name: wallabag.import, alias: delicious }
 
     Wallabag\Import\FirefoxImport:
         tags:
-            -  { name: wallabag_core.import, alias: firefox }
+            -  { name: wallabag.import, alias: firefox }
 
     Wallabag\Import\ChromeImport:
         tags:
-            -  { name: wallabag_core.import, alias: chrome }
+            -  { name: wallabag.import, alias: chrome }
 
     Wallabag\Import\ShaarliImport:
         tags:
-            -  { name: wallabag_core.import, alias: shaarli }
+            -  { name: wallabag.import, alias: shaarli }
 
     Wallabag\Import\PocketHtmlImport:
         tags:
-            -  { name: wallabag_core.import, alias: pocket_html }
+            -  { name: wallabag.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 585ed0f6a..2c01be3bb 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_core.consumer.amqp.pocket:
+    wallabag.consumer.amqp.pocket:
         class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\Import\PocketImport'
 
-    wallabag_core.consumer.amqp.readability:
+    wallabag.consumer.amqp.readability:
         class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\Import\ReadabilityImport'
 
-    wallabag_core.consumer.amqp.instapaper:
+    wallabag.consumer.amqp.instapaper:
         class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\Import\InstapaperImport'
 
-    wallabag_core.consumer.amqp.pinboard:
+    wallabag.consumer.amqp.pinboard:
         class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\Import\PinboardImport'
 
-    wallabag_core.consumer.amqp.delicious:
+    wallabag.consumer.amqp.delicious:
         class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\Import\DeliciousImport'
 
-    wallabag_core.consumer.amqp.wallabag_v1:
+    wallabag.consumer.amqp.wallabag_v1:
         class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\Import\WallabagV1Import'
 
-    wallabag_core.consumer.amqp.wallabag_v2:
+    wallabag.consumer.amqp.wallabag_v2:
         class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\Import\WallabagV2Import'
 
-    wallabag_core.consumer.amqp.elcurator:
+    wallabag.consumer.amqp.elcurator:
         class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\Import\ElcuratorImport'
 
-    wallabag_core.consumer.amqp.firefox:
+    wallabag.consumer.amqp.firefox:
         class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\Import\FirefoxImport'
 
-    wallabag_core.consumer.amqp.chrome:
+    wallabag.consumer.amqp.chrome:
         class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\Import\ChromeImport'
 
-    wallabag_core.consumer.amqp.shaarli:
+    wallabag.consumer.amqp.shaarli:
         class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\Import\ShaarliImport'
 
-    wallabag_core.consumer.amqp.pocket_html:
+    wallabag.consumer.amqp.pocket_html:
         class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\Import\PocketHtmlImport'
diff --git a/app/config/services_redis.yml b/app/config/services_redis.yml
index 86c4f8324..0a6b5be99 100644
--- a/app/config/services_redis.yml
+++ b/app/config/services_redis.yml
@@ -6,193 +6,193 @@ services:
         public: true
 
     # readability
-    wallabag_core.queue.redis.readability:
+    wallabag.queue.redis.readability:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.readability"
 
-    wallabag_core.producer.redis.readability:
+    wallabag.producer.redis.readability:
         class: Wallabag\Redis\Producer
         arguments:
-            - "@wallabag_core.queue.redis.readability"
+            - "@wallabag.queue.redis.readability"
 
-    wallabag_core.consumer.redis.readability:
+    wallabag.consumer.redis.readability:
         class: Wallabag\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\Import\ReadabilityImport'
 
     # instapaper
-    wallabag_core.queue.redis.instapaper:
+    wallabag.queue.redis.instapaper:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.instapaper"
 
-    wallabag_core.producer.redis.instapaper:
+    wallabag.producer.redis.instapaper:
         class: Wallabag\Redis\Producer
         arguments:
-            - "@wallabag_core.queue.redis.instapaper"
+            - "@wallabag.queue.redis.instapaper"
 
-    wallabag_core.consumer.redis.instapaper:
+    wallabag.consumer.redis.instapaper:
         class: Wallabag\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\Import\InstapaperImport'
 
     # pinboard
-    wallabag_core.queue.redis.pinboard:
+    wallabag.queue.redis.pinboard:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.pinboard"
 
-    wallabag_core.producer.redis.pinboard:
+    wallabag.producer.redis.pinboard:
         class: Wallabag\Redis\Producer
         arguments:
-            - "@wallabag_core.queue.redis.pinboard"
+            - "@wallabag.queue.redis.pinboard"
 
-    wallabag_core.consumer.redis.pinboard:
+    wallabag.consumer.redis.pinboard:
         class: Wallabag\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\Import\PinboardImport'
 
     # delicious
-    wallabag_core.queue.redis.delicious:
+    wallabag.queue.redis.delicious:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.delicious"
 
-    wallabag_core.producer.redis.delicious:
+    wallabag.producer.redis.delicious:
         class: Wallabag\Redis\Producer
         arguments:
-            - "@wallabag_core.queue.redis.delicious"
+            - "@wallabag.queue.redis.delicious"
 
-    wallabag_core.consumer.redis.delicious:
+    wallabag.consumer.redis.delicious:
         class: Wallabag\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\Import\DeliciousImport'
 
     # pocket
-    wallabag_core.queue.redis.pocket:
+    wallabag.queue.redis.pocket:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.pocket"
 
-    wallabag_core.producer.redis.pocket:
+    wallabag.producer.redis.pocket:
         class: Wallabag\Redis\Producer
         arguments:
-            - "@wallabag_core.queue.redis.pocket"
+            - "@wallabag.queue.redis.pocket"
 
-    wallabag_core.consumer.redis.pocket:
+    wallabag.consumer.redis.pocket:
         class: Wallabag\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\Import\PocketImport'
 
     # wallabag v1
-    wallabag_core.queue.redis.wallabag_v1:
+    wallabag.queue.redis.wallabag_v1:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.wallabag_v1"
 
-    wallabag_core.producer.redis.wallabag_v1:
+    wallabag.producer.redis.wallabag_v1:
         class: Wallabag\Redis\Producer
         arguments:
-            - "@wallabag_core.queue.redis.wallabag_v1"
+            - "@wallabag.queue.redis.wallabag_v1"
 
-    wallabag_core.consumer.redis.wallabag_v1:
+    wallabag.consumer.redis.wallabag_v1:
         class: Wallabag\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\Import\WallabagV1Import'
 
     # wallabag v2
-    wallabag_core.queue.redis.wallabag_v2:
+    wallabag.queue.redis.wallabag_v2:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.wallabag_v2"
 
-    wallabag_core.producer.redis.wallabag_v2:
+    wallabag.producer.redis.wallabag_v2:
         class: Wallabag\Redis\Producer
         arguments:
-            - "@wallabag_core.queue.redis.wallabag_v2"
+            - "@wallabag.queue.redis.wallabag_v2"
 
-    wallabag_core.consumer.redis.wallabag_v2:
+    wallabag.consumer.redis.wallabag_v2:
         class: Wallabag\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\Import\WallabagV2Import'
 
     # elcurator
-    wallabag_core.queue.redis.elcurator:
+    wallabag.queue.redis.elcurator:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.elcurator"
 
-    wallabag_core.producer.redis.elcurator:
+    wallabag.producer.redis.elcurator:
         class: Wallabag\Redis\Producer
         arguments:
-            - "@wallabag_core.queue.redis.elcurator"
+            - "@wallabag.queue.redis.elcurator"
 
-    wallabag_core.consumer.redis.elcurator:
+    wallabag.consumer.redis.elcurator:
         class: Wallabag\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\Import\ElcuratorImport'
 
     # firefox
-    wallabag_core.queue.redis.firefox:
+    wallabag.queue.redis.firefox:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.firefox"
 
-    wallabag_core.producer.redis.firefox:
+    wallabag.producer.redis.firefox:
         class: Wallabag\Redis\Producer
         arguments:
-            - "@wallabag_core.queue.redis.firefox"
+            - "@wallabag.queue.redis.firefox"
 
-    wallabag_core.consumer.redis.firefox:
+    wallabag.consumer.redis.firefox:
         class: Wallabag\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\Import\FirefoxImport'
 
     # chrome
-    wallabag_core.queue.redis.chrome:
+    wallabag.queue.redis.chrome:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.chrome"
 
-    wallabag_core.producer.redis.chrome:
+    wallabag.producer.redis.chrome:
         class: Wallabag\Redis\Producer
         arguments:
-            - "@wallabag_core.queue.redis.chrome"
+            - "@wallabag.queue.redis.chrome"
 
-    wallabag_core.consumer.redis.chrome:
+    wallabag.consumer.redis.chrome:
         class: Wallabag\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\Import\ChromeImport'
 
     # shaarli
-    wallabag_core.queue.redis.shaarli:
+    wallabag.queue.redis.shaarli:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.shaarli"
 
-    wallabag_core.producer.redis.shaarli:
+    wallabag.producer.redis.shaarli:
         class: Wallabag\Redis\Producer
         arguments:
-            - "@wallabag_core.queue.redis.shaarli"
+            - "@wallabag.queue.redis.shaarli"
 
-    wallabag_core.consumer.redis.shaarli:
+    wallabag.consumer.redis.shaarli:
         class: Wallabag\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\Import\ShaarliImport'
 
     # pocket html
-    wallabag_core.queue.redis.pocket_html:
+    wallabag.queue.redis.pocket_html:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.pocket_html"
 
-    wallabag_core.producer.redis.pocket_html:
+    wallabag.producer.redis.pocket_html:
         class: Wallabag\Redis\Producer
         arguments:
-            - "@wallabag_core.queue.redis.pocket_html"
+            - "@wallabag.queue.redis.pocket_html"
 
-    wallabag_core.consumer.redis.pocket_html:
+    wallabag.consumer.redis.pocket_html:
         class: Wallabag\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\Import\PocketHtmlImport'
diff --git a/app/config/services_test.yml b/app/config/services_test.yml
index 6808f3986..d55228614 100644
--- a/app/config/services_test.yml
+++ b/app/config/services_test.yml
@@ -8,7 +8,7 @@ services:
         alias: fos_user.security.login_manager
         public: true
 
-    wallabag_core.entry_repository.test:
+    wallabag.entry_repository.test:
         alias: Wallabag\Repository\EntryRepository
         public: true
 
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml
index 67b927c4d..c6c869655 100644
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@@ -1,7 +1,7 @@
 parameters:
-    wallabag_core.version: 2.6.8
-    wallabag_core.paypal_url: "https://liberapay.com/wallabag/donate"
-    wallabag_core.languages:
+    wallabag.version: 2.6.8
+    wallabag.paypal_url: "https://liberapay.com/wallabag/donate"
+    wallabag.languages:
         en: 'English'
         fr: 'Français'
         de: 'Deutsch'
@@ -23,20 +23,20 @@ parameters:
         hr: 'Hrvatski'
         cs: 'Čeština'
         el: 'Ελληνικά'
-    wallabag_core.items_on_page: 12
-    wallabag_core.language: '%locale%'
-    wallabag_core.feed_limit: 50
-    wallabag_core.reading_speed: 200
-    wallabag_core.cache_lifetime: 10
-    wallabag_core.action_mark_as_read: 1
-    wallabag_core.list_mode: 0
-    wallabag_core.display_thumbnails: 1
-    wallabag_core.fetching_error_message_title: 'No title found'
-    wallabag_core.fetching_error_message: |
+    wallabag.items_on_page: 12
+    wallabag.language: '%locale%'
+    wallabag.feed_limit: 50
+    wallabag.reading_speed: 200
+    wallabag.cache_lifetime: 10
+    wallabag.action_mark_as_read: 1
+    wallabag.list_mode: 0
+    wallabag.display_thumbnails: 1
+    wallabag.fetching_error_message_title: 'No title found'
+    wallabag.fetching_error_message: |
         wallabag can't retrieve contents for this article. Please <a href="https://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
-    wallabag_core.api_limit_mass_actions: 10
-    wallabag_core.site_credentials.encryption_key_path: "%kernel.project_dir%/data/site-credentials-secret-key.txt"
-    wallabag_core.default_internal_settings:
+    wallabag.api_limit_mass_actions: 10
+    wallabag.site_credentials.encryption_key_path: "%kernel.project_dir%/data/site-credentials-secret-key.txt"
+    wallabag.default_internal_settings:
         -
             name: share_public
             value: 1
@@ -146,14 +146,14 @@ parameters:
             value: 0
             section: entry
 
-    wallabag_core.default_ignore_origin_instance_rules:
+    wallabag.default_ignore_origin_instance_rules:
         -
             rule: host = "feedproxy.google.com"
         -
             rule: host = "feeds.reuters.com"
         -
             rule: _all ~ "https?://www\.lemonde\.fr/tiny.*"
-    wallabag_core.fonts:
+    wallabag.fonts:
         - 'Sans-serif'
         - 'Serif'
         - 'Atkinson Hyperlegible'
@@ -162,5 +162,5 @@ parameters:
         - 'Montserrat'
         - 'OpenDyslexicRegular'
         - 'Oswald'
-    wallabag_core.allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv', 'text/html']
-    wallabag_core.resource_dir: "%kernel.project_dir%/web/uploads/import"
+    wallabag.allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv', 'text/html']
+    wallabag.resource_dir: "%kernel.project_dir%/web/uploads/import"
diff --git a/src/Command/Import/RedisWorkerCommand.php b/src/Command/Import/RedisWorkerCommand.php
index 3a6d3ed68..1259778fb 100644
--- a/src/Command/Import/RedisWorkerCommand.php
+++ b/src/Command/Import/RedisWorkerCommand.php
@@ -40,13 +40,13 @@ class RedisWorkerCommand extends Command
 
         $serviceName = $input->getArgument('serviceName');
 
-        if (!$this->container->has('wallabag_core.queue.redis.' . $serviceName) || !$this->container->has('wallabag_core.consumer.redis.' . $serviceName)) {
+        if (!$this->container->has('wallabag.queue.redis.' . $serviceName) || !$this->container->has('wallabag.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_core.queue.redis.' . $serviceName),
-            $this->container->get('wallabag_core.consumer.redis.' . $serviceName),
+            $this->container->get('wallabag.queue.redis.' . $serviceName),
+            $this->container->get('wallabag.consumer.redis.' . $serviceName),
             (int) $input->getOption('maxIterations')
         );
 
diff --git a/src/Controller/Api/EntryRestController.php b/src/Controller/Api/EntryRestController.php
index 728743068..3b8497fdf 100644
--- a/src/Controller/Api/EntryRestController.php
+++ b/src/Controller/Api/EntryRestController.php
@@ -525,7 +525,7 @@ class EntryRestController extends WallabagRestController
 
         $urls = json_decode($request->query->get('urls', []));
 
-        $limit = $this->getParameter('wallabag_core.api_limit_mass_actions');
+        $limit = $this->getParameter('wallabag.api_limit_mass_actions');
 
         if (\count($urls) > $limit) {
             throw new HttpException(400, 'API limit reached');
@@ -1044,7 +1044,7 @@ class EntryRestController extends WallabagRestController
         }
 
         // if refreshing entry failed, don't save it
-        if ($this->getParameter('wallabag_core.fetching_error_message') === $entry->getContent()) {
+        if ($this->getParameter('wallabag.fetching_error_message') === $entry->getContent()) {
             return new JsonResponse([], 304);
         }
 
diff --git a/src/Controller/Api/WallabagRestController.php b/src/Controller/Api/WallabagRestController.php
index 4e6f7f741..80f0eeb4c 100644
--- a/src/Controller/Api/WallabagRestController.php
+++ b/src/Controller/Api/WallabagRestController.php
@@ -61,7 +61,7 @@ class WallabagRestController extends AbstractFOSRestController
      */
     public function getVersionAction()
     {
-        $version = $this->getParameter('wallabag_core.version');
+        $version = $this->getParameter('wallabag.version');
         $json = $this->serializer->serialize($version, 'json');
 
         return (new JsonResponse())->setJson($json);
@@ -85,7 +85,7 @@ class WallabagRestController extends AbstractFOSRestController
     public function getInfoAction(Config $craueConfig)
     {
         $info = new ApplicationInfo(
-            $this->getParameter('wallabag_core.version'),
+            $this->getParameter('wallabag.version'),
             $this->getParameter('fosuser_registration') && $craueConfig->get('api_user_registration'),
         );
 
diff --git a/src/Controller/EntryController.php b/src/Controller/EntryController.php
index befc0336d..4129b3b02 100644
--- a/src/Controller/EntryController.php
+++ b/src/Controller/EntryController.php
@@ -410,7 +410,7 @@ class EntryController extends AbstractController
         $this->updateEntry($entry, 'entry_reloaded');
 
         // if refreshing entry failed, don't save it
-        if ($this->getParameter('wallabag_core.fetching_error_message') === $entry->getContent()) {
+        if ($this->getParameter('wallabag.fetching_error_message') === $entry->getContent()) {
             $this->addFlash('notice', 'flashes.entry.notice.entry_reloaded_failed');
 
             return $this->redirect($this->generateUrl('view', ['id' => $entry->getId()]));
diff --git a/src/Controller/FeedController.php b/src/Controller/FeedController.php
index e71d4373d..b329f8002 100644
--- a/src/Controller/FeedController.php
+++ b/src/Controller/FeedController.php
@@ -128,7 +128,7 @@ class FeedController extends AbstractController
             $user
         );
 
-        $perPage = $user->getConfig()->getFeedLimit() ?: $this->getParameter('wallabag_core.feed_limit');
+        $perPage = $user->getConfig()->getFeedLimit() ?: $this->getParameter('wallabag.feed_limit');
         $entries->setMaxPerPage($perPage);
 
         if (null === $entries) {
@@ -151,7 +151,7 @@ class FeedController extends AbstractController
                 'entries' => $entries,
                 'user' => $user->getUsername(),
                 'domainName' => $this->getParameter('domain_name'),
-                'version' => $this->getParameter('wallabag_core.version'),
+                'version' => $this->getParameter('wallabag.version'),
                 'tag' => $tag->getSlug(),
                 'updated' => $this->prepareFeedUpdatedDate($entries, $sort),
             ],
@@ -206,7 +206,7 @@ class FeedController extends AbstractController
         $pagerAdapter = new DoctrineORMAdapter($qb->getQuery(), true, false);
         $entries = new Pagerfanta($pagerAdapter);
 
-        $perPage = $user->getConfig()->getFeedLimit() ?: $this->getParameter('wallabag_core.feed_limit');
+        $perPage = $user->getConfig()->getFeedLimit() ?: $this->getParameter('wallabag.feed_limit');
         $entries->setMaxPerPage($perPage);
 
         $url = $this->generateUrl(
@@ -232,7 +232,7 @@ class FeedController extends AbstractController
             'entries' => $entries,
             'user' => $user->getUsername(),
             'domainName' => $this->getParameter('domain_name'),
-            'version' => $this->getParameter('wallabag_core.version'),
+            'version' => $this->getParameter('wallabag.version'),
             'updated' => $this->prepareFeedUpdatedDate($entries),
         ], new Response('', 200, ['Content-Type' => 'application/atom+xml']));
     }
diff --git a/src/Controller/Import/BrowserController.php b/src/Controller/Import/BrowserController.php
index 1ea175909..e4b5307b1 100644
--- a/src/Controller/Import/BrowserController.php
+++ b/src/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_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
+            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag.resource_dir'), $name)) {
                 $res = $wallabag
-                    ->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
+                    ->setFilepath($this->getParameter('wallabag.resource_dir') . '/' . $name)
                     ->setMarkAsRead($markAsRead)
                     ->import();
 
@@ -51,7 +51,7 @@ abstract class BrowserController extends AbstractController
                         ]);
                     }
 
-                    unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
+                    unlink($this->getParameter('wallabag.resource_dir') . '/' . $name);
                 }
 
                 $this->addFlash('notice', $message);
diff --git a/src/Controller/Import/DeliciousController.php b/src/Controller/Import/DeliciousController.php
index 8e128e572..da19b8795 100644
--- a/src/Controller/Import/DeliciousController.php
+++ b/src/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_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
+            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag.resource_dir'), $name)) {
                 $res = $delicious
-                    ->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
+                    ->setFilepath($this->getParameter('wallabag.resource_dir') . '/' . $name)
                     ->setMarkAsRead($markAsRead)
                     ->import();
 
@@ -65,7 +65,7 @@ class DeliciousController extends AbstractController
                         ]);
                     }
 
-                    unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
+                    unlink($this->getParameter('wallabag.resource_dir') . '/' . $name);
                 }
 
                 $this->addFlash('notice', $message);
diff --git a/src/Controller/Import/HtmlController.php b/src/Controller/Import/HtmlController.php
index 14352f399..e53cd8a46 100644
--- a/src/Controller/Import/HtmlController.php
+++ b/src/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_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
+            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag.resource_dir'), $name)) {
                 $res = $wallabag
-                    ->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
+                    ->setFilepath($this->getParameter('wallabag.resource_dir') . '/' . $name)
                     ->setMarkAsRead($markAsRead)
                     ->import();
 
@@ -51,7 +51,7 @@ abstract class HtmlController extends AbstractController
                         ]);
                     }
 
-                    unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
+                    unlink($this->getParameter('wallabag.resource_dir') . '/' . $name);
                 }
 
                 $this->addFlash('notice', $message);
diff --git a/src/Controller/Import/InstapaperController.php b/src/Controller/Import/InstapaperController.php
index 34c07f2d6..daf7f6111 100644
--- a/src/Controller/Import/InstapaperController.php
+++ b/src/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_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
+            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag.resource_dir'), $name)) {
                 $res = $instapaper
-                    ->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
+                    ->setFilepath($this->getParameter('wallabag.resource_dir') . '/' . $name)
                     ->setMarkAsRead($markAsRead)
                     ->import();
 
@@ -65,7 +65,7 @@ class InstapaperController extends AbstractController
                         ]);
                     }
 
-                    unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
+                    unlink($this->getParameter('wallabag.resource_dir') . '/' . $name);
                 }
 
                 $this->addFlash('notice', $message);
diff --git a/src/Controller/Import/PinboardController.php b/src/Controller/Import/PinboardController.php
index 330f573d3..791f0e0f7 100644
--- a/src/Controller/Import/PinboardController.php
+++ b/src/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_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
+            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag.resource_dir'), $name)) {
                 $res = $pinboard
-                    ->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
+                    ->setFilepath($this->getParameter('wallabag.resource_dir') . '/' . $name)
                     ->setMarkAsRead($markAsRead)
                     ->import();
 
@@ -65,7 +65,7 @@ class PinboardController extends AbstractController
                         ]);
                     }
 
-                    unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
+                    unlink($this->getParameter('wallabag.resource_dir') . '/' . $name);
                 }
 
                 $this->addFlash('notice', $message);
diff --git a/src/Controller/Import/ReadabilityController.php b/src/Controller/Import/ReadabilityController.php
index 63a43e4a2..6943d60e7 100644
--- a/src/Controller/Import/ReadabilityController.php
+++ b/src/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_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
+            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag.resource_dir'), $name)) {
                 $res = $readability
-                    ->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
+                    ->setFilepath($this->getParameter('wallabag.resource_dir') . '/' . $name)
                     ->setMarkAsRead($markAsRead)
                     ->import();
 
@@ -65,7 +65,7 @@ class ReadabilityController extends AbstractController
                         ]);
                     }
 
-                    unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
+                    unlink($this->getParameter('wallabag.resource_dir') . '/' . $name);
                 }
 
                 $this->addFlash('notice', $message);
diff --git a/src/Controller/Import/WallabagController.php b/src/Controller/Import/WallabagController.php
index 655841b25..12700f902 100644
--- a/src/Controller/Import/WallabagController.php
+++ b/src/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_core.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_core.resource_dir'), $name)) {
+            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag.resource_dir'), $name)) {
                 $res = $wallabag
-                    ->setFilepath($this->getParameter('wallabag_core.resource_dir') . '/' . $name)
+                    ->setFilepath($this->getParameter('wallabag.resource_dir') . '/' . $name)
                     ->setMarkAsRead($markAsRead)
                     ->import();
 
@@ -54,7 +54,7 @@ abstract class WallabagController extends AbstractController
                         ]);
                     }
 
-                    unlink($this->getParameter('wallabag_core.resource_dir') . '/' . $name);
+                    unlink($this->getParameter('wallabag.resource_dir') . '/' . $name);
                 }
 
                 $this->addFlash('notice', $message);
diff --git a/src/Controller/StaticController.php b/src/Controller/StaticController.php
index 30463ece6..fda356851 100644
--- a/src/Controller/StaticController.php
+++ b/src/Controller/StaticController.php
@@ -29,8 +29,8 @@ class StaticController extends AbstractController
         return $this->render(
             'Static/about.html.twig',
             [
-                'version' => $this->getParameter('wallabag_core.version'),
-                'paypal_url' => $this->getParameter('wallabag_core.paypal_url'),
+                'version' => $this->getParameter('wallabag.version'),
+                'paypal_url' => $this->getParameter('wallabag.paypal_url'),
             ]
         );
     }
diff --git a/src/DataFixtures/IgnoreOriginInstanceRuleFixtures.php b/src/DataFixtures/IgnoreOriginInstanceRuleFixtures.php
index f40490063..31833e31a 100644
--- a/src/DataFixtures/IgnoreOriginInstanceRuleFixtures.php
+++ b/src/DataFixtures/IgnoreOriginInstanceRuleFixtures.php
@@ -22,7 +22,7 @@ class IgnoreOriginInstanceRuleFixtures extends Fixture implements ContainerAware
 
     public function load(ObjectManager $manager): void
     {
-        foreach ($this->container->getParameter('wallabag_core.default_ignore_origin_instance_rules') as $ignore_origin_instance_rule) {
+        foreach ($this->container->getParameter('wallabag.default_ignore_origin_instance_rules') as $ignore_origin_instance_rule) {
             $newIgnoreOriginInstanceRule = new IgnoreOriginInstanceRule();
             $newIgnoreOriginInstanceRule->setRule($ignore_origin_instance_rule['rule']);
             $manager->persist($newIgnoreOriginInstanceRule);
diff --git a/src/DataFixtures/InternalSettingFixtures.php b/src/DataFixtures/InternalSettingFixtures.php
index 77dddeaaa..f9d6c9385 100644
--- a/src/DataFixtures/InternalSettingFixtures.php
+++ b/src/DataFixtures/InternalSettingFixtures.php
@@ -22,7 +22,7 @@ class InternalSettingFixtures extends Fixture implements ContainerAwareInterface
 
     public function load(ObjectManager $manager): void
     {
-        foreach ($this->container->getParameter('wallabag_core.default_internal_settings') as $setting) {
+        foreach ($this->container->getParameter('wallabag.default_internal_settings') as $setting) {
             $newSetting = new InternalSetting();
             $newSetting->setName($setting['name']);
             $newSetting->setValue($setting['value']);
diff --git a/src/Import/ImportCompilerPass.php b/src/Import/ImportCompilerPass.php
index 16e366762..29fa5c08b 100644
--- a/src/Import/ImportCompilerPass.php
+++ b/src/Import/ImportCompilerPass.php
@@ -19,7 +19,7 @@ class ImportCompilerPass implements CompilerPassInterface
         );
 
         $taggedServices = $container->findTaggedServiceIds(
-            'wallabag_core.import'
+            'wallabag.import'
         );
         foreach ($taggedServices as $id => $tagAttributes) {
             foreach ($tagAttributes as $attributes) {
diff --git a/tests/Command/ReloadEntryCommandTest.php b/tests/Command/ReloadEntryCommandTest.php
index 6ae9c8652..2f7a783ca 100644
--- a/tests/Command/ReloadEntryCommandTest.php
+++ b/tests/Command/ReloadEntryCommandTest.php
@@ -82,7 +82,7 @@ class ReloadEntryCommandTest extends WallabagCoreTestCase
 
         $reloadedEntries = $this->getTestClient()
             ->getContainer()
-            ->get('wallabag_core.entry_repository.test')
+            ->get('wallabag.entry_repository.test')
             ->findById([$this->adminEntry->getId(), $this->bobEntry->getId()]);
 
         foreach ($reloadedEntries as $reloadedEntry) {
@@ -107,7 +107,7 @@ class ReloadEntryCommandTest extends WallabagCoreTestCase
             'interactive' => false,
         ]);
 
-        $entryRepository = $this->getTestClient()->getContainer()->get('wallabag_core.entry_repository.test');
+        $entryRepository = $this->getTestClient()->getContainer()->get('wallabag.entry_repository.test');
 
         $reloadedAdminEntry = $entryRepository->find($this->adminEntry->getId());
         $this->assertNotEmpty($reloadedAdminEntry->getContent());
@@ -128,7 +128,7 @@ class ReloadEntryCommandTest extends WallabagCoreTestCase
             '--only-not-parsed' => true,
         ]);
 
-        $entryRepository = $this->getTestClient()->getContainer()->get('wallabag_core.entry_repository.test');
+        $entryRepository = $this->getTestClient()->getContainer()->get('wallabag.entry_repository.test');
 
         $reloadedBobParsedEntry = $entryRepository->find($this->bobParsedEntry->getId());
         $this->assertEmpty($reloadedBobParsedEntry->getContent());
diff --git a/tests/Controller/Api/WallabagRestControllerTest.php b/tests/Controller/Api/WallabagRestControllerTest.php
index bc72c1610..d73115cd6 100644
--- a/tests/Controller/Api/WallabagRestControllerTest.php
+++ b/tests/Controller/Api/WallabagRestControllerTest.php
@@ -16,7 +16,7 @@ class WallabagRestControllerTest extends WallabagApiTestCase
 
         $content = json_decode($client->getResponse()->getContent(), true);
 
-        $this->assertSame($client->getContainer()->getParameter('wallabag_core.version'), $content);
+        $this->assertSame($client->getContainer()->getParameter('wallabag.version'), $content);
     }
 
     public function testGetInfo()
diff --git a/tests/Controller/EntryControllerTest.php b/tests/Controller/EntryControllerTest.php
index da9c04645..e2f297810 100644
--- a/tests/Controller/EntryControllerTest.php
+++ b/tests/Controller/EntryControllerTest.php
@@ -541,7 +541,7 @@ class EntryControllerTest extends WallabagCoreTestCase
             ->getRepository(Entry::class)
             ->find($entry->getId());
 
-        $this->assertNotSame($client->getContainer()->getParameter('wallabag_core.fetching_error_message'), $newContent->getContent());
+        $this->assertNotSame($client->getContainer()->getParameter('wallabag.fetching_error_message'), $newContent->getContent());
     }
 
     public function testEdit()
diff --git a/tests/Import/ImportCompilerPassTest.php b/tests/Import/ImportCompilerPassTest.php
index a5685ad2d..111341df6 100644
--- a/tests/Import/ImportCompilerPassTest.php
+++ b/tests/Import/ImportCompilerPassTest.php
@@ -27,7 +27,7 @@ class ImportCompilerPassTest extends TestCase
 
         $container
             ->register('foo')
-            ->addTag('wallabag_core.import', ['alias' => 'pocket'])
+            ->addTag('wallabag.import', ['alias' => 'pocket'])
         ;
 
         $this->process($container);