diff --git a/README.md b/README.md
index bd9206fe2..a1f70638c 100644
--- a/README.md
+++ b/README.md
@@ -149,9 +149,9 @@ The latest documentation is available [here](https://app.swaggerhub.com/apis/Syl
 
 ### Attributes
 
-If you would like to receive serialized attributes you need to define an array of theirs codes under `shop_api.included_attributes` key. E.g.
+If you would like to receive serialized attributes you need to define an array of theirs codes under `sylius_shop_api.included_attributes` key. E.g.
 ```yml
-shop_api:
+sylius_shop_api:
     included_attributes:
         - "MUG_MATERIAL_CODE"
 ```
diff --git a/UPGRADE.md b/UPGRADE.md
index 5f8373399..e9ddfc1c3 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -1,3 +1,6 @@
+# UPGRADE FROM 1.0.0-beta.18 to 1.0.0-beta.20
+* The configuration key for the shop api is now `sylius_shop_api`.
+
 # UPGRADE FROM 1.0.0-beta.17 to 1.0.0-beta.18
 
 * Customer registration payload changed:
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 23edde634..dd3ee21ef 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -15,7 +15,7 @@ final class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('shop_api');
+        $rootNode = $treeBuilder->root('sylius_shop_api');
 
         $this->buildIncludedAttributesNode($rootNode);
         $this->buildViewClassesNode($rootNode);