diff --git a/examples/amp-story/amp-story-shopping.html b/examples/amp-story/amp-story-shopping.html
index 69bd69b77f88..9cc0228b8487 100644
--- a/examples/amp-story/amp-story-shopping.html
+++ b/examples/amp-story/amp-story-shopping.html
@@ -48,38 +48,38 @@
             {
                 "items" : [
                    {
-                    "product-id": "lamp",
-                    "product-title": "Brass Lamp",
-                    "product-brand": "Lamp Co",
-                    "product-price": 799.00,
-                    "product-price-currency": "USD",
-                    "product-images": ["https://source.unsplash.com/Ry9WBo3qmoc/500x500"]
+                    "productId": "lamp",
+                    "productTitle": "Brass Lamp",
+                    "productBrand": "Lamp Co",
+                    "productPrice": 799.00,
+                    "productPriceCurrency": "USD",
+                    "productImages": ["https://source.unsplash.com/Ry9WBo3qmoc/500x500"]
                    },
                    {
-                    "product-id": "art",
-                    "product-title": "Abstract Art",
-                    "product-brand": "V. Artsy",
-                    "product-price": 1200.00,
-                    "product-price-currency": "INR",
-                    "product-images": ["https://source.unsplash.com/BdVQU-NDtA8/500x500"]
+                    "productId": "art",
+                    "productTitle": "Abstract Art",
+                    "productBrand": "V. Artsy",
+                    "productPrice": 1200.00,
+                    "productPriceCurrency": "INR",
+                    "productImages": ["https://source.unsplash.com/BdVQU-NDtA8/500x500"]
                    },
                    {
-                    "product-id": "chair",
-                    "product-title": "Yellow chair",
-                    "product-brand": "Chair Co.",
-                    "product-price": 1000.00,
-                    "product-price-currency": "BRL",
-                    "product-tag-text": "The perfectly imperfect yellow chair",
-                    "product-images": ["https://source.unsplash.com/DgQGKKLaVhY/500x500"]
+                    "productId": "chair",
+                    "productTitle": "Yellow chair",
+                    "productBrand": "Chair Co.",
+                    "productPrice": 1000.00,
+                    "productPriceCurrency": "BRL",
+                    "productTagText": "The perfectly imperfect yellow chair",
+                    "productImages": ["https://source.unsplash.com/DgQGKKLaVhY/500x500"]
                    },
                    {
-                    "product-id": "flowers",
-                    "product-title": "Flowers",
-                    "product-brand": "Very Long Flower Company Name",
-                    "product-price": 10.00,
-                    "product-price-currency": "USD",
-                    "product-icon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
-                    "product-images": ["https://source.unsplash.com/SavQfLRm4Do/500x500"]
+                    "productId": "flowers",
+                    "productTitle": "Flowers",
+                    "productBrand": "Very Long Flower Company Name",
+                    "productPrice": 10.00,
+                    "productPriceCurrency": "USD",
+                    "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
+                    "productImages": ["https://source.unsplash.com/SavQfLRm4Do/500x500"]
                    }
                 ]
               }
@@ -105,12 +105,12 @@
             {
                 "items" : [
                    {
-                    "product-id": "art",
-                    "product-title": "Abstract Art",
-                    "product-brand": "V. Artsy",
-                    "product-price": 1200.00,
-                    "product-price-currency": "JPY",
-                    "product-images": ["https://source.unsplash.com/BdVQU-NDtA8/500x500"]
+                    "productId": "art",
+                    "productTitle": "Abstract Art",
+                    "productBrand": "V. Artsy",
+                    "productPrice": 1200.00,
+                    "productPriceCurrency": "JPY",
+                    "productImages": ["https://source.unsplash.com/BdVQU-NDtA8/500x500"]
                    },
                 ]
               }
@@ -154,39 +154,39 @@
             {
               "items" : [
                 {
-                  "product-id": "lamp-rtl",
-                  "product-title": "Brass Lamp",
-                  "product-brand": "Lamp Co",
-                  "product-price": 799.00,
-                  "product-price-currency": "AED",
-                  "product-tag-text": " حبا حبا حبا سعادةا سعادة",
-                  "product-images": ["https://source.unsplash.com/Ry9WBo3qmoc/500x500"]
+                  "productId": "lamp-rtl",
+                  "productTitle": "Brass Lamp",
+                  "productBrand": "Lamp Co",
+                  "productPrice": 799.00,
+                  "productPriceCurrency": "AED",
+                  "productTagText": " حبا حبا حبا سعادةا سعادة",
+                  "productImages": ["https://source.unsplash.com/Ry9WBo3qmoc/500x500"]
                 },
                 {
-                  "product-id": "art-rtl",
-                  "product-title": "Abstract Art",
-                  "product-brand": "V. Artsy",
-                  "product-price-currency": "AED",
-                  "product-price": 1200.00,
-                  "product-tag-text": "حبا حب سعادة قط حبا حب سعادة قط ",
-                  "product-images": ["https://source.unsplash.com/BdVQU-NDtA8/500x500"]
+                  "productId": "art-rtl",
+                  "productTitle": "Abstract Art",
+                  "productBrand": "V. Artsy",
+                  "productPriceCurrency": "AED",
+                  "productPrice": 1200.00,
+                  "productTagText": "حبا حب سعادة قط حبا حب سعادة قط ",
+                  "productImages": ["https://source.unsplash.com/BdVQU-NDtA8/500x500"]
                 },
                 {
-                  "product-id": "chair-rtl",
-                  "product-title": "Yellow chair",
-                  "product-brand": "Chair Co.",
-                  "product-price": 1000.00,
-                  "product-price-currency": "AED",
-                  "product-images": ["https://source.unsplash.com/DgQGKKLaVhY/500x500"]
+                  "productId": "chair-rtl",
+                  "productTitle": "Yellow chair",
+                  "productBrand": "Chair Co.",
+                  "productPrice": 1000.00,
+                  "productPriceCurrency": "AED",
+                  "productImages": ["https://source.unsplash.com/DgQGKKLaVhY/500x500"]
                  },
                  {
-                  "product-id": "flowers-rtl",
-                  "product-title": "Flowers",
-                  "product-brand": "Very Long Flower Company Name",
-                  "product-price": 10.00,
-                  "product-price-currency": "AED",
-                  "product-icon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
-                  "product-images": ["https://source.unsplash.com/SavQfLRm4Do/500x500"]
+                  "productId": "flowers-rtl",
+                  "productTitle": "Flowers",
+                  "productBrand": "Very Long Flower Company Name",
+                  "productPrice": 10.00,
+                  "productPriceCurrency": "AED",
+                  "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
+                  "productImages": ["https://source.unsplash.com/SavQfLRm4Do/500x500"]
                  }
               ]
             }
diff --git a/examples/amp-story/shopping/remote.json b/examples/amp-story/shopping/remote.json
index 82bdf8ac46f6..028fa22c6883 100644
--- a/examples/amp-story/shopping/remote.json
+++ b/examples/amp-story/shopping/remote.json
@@ -1,12 +1,12 @@
 {
   "items": [
     {
-      "product-id": "art",
-      "product-title": "Abstract Art",
-      "product-brand": "V. Artsy",
-      "product-price": 1200.0,
-      "product-price-currency": "JPY",
-      "product-images": ["https://source.unsplash.com/BdVQU-NDtA8/500x500"]
+      "productId": "art",
+      "productTitle": "Abstract Art",
+      "productBrand": "V. Artsy",
+      "productPrice": 1200.0,
+      "productPriceCurrency": "JPY",
+      "productImages": ["https://source.unsplash.com/BdVQU-NDtA8/500x500"]
     }
   ]
 }
diff --git a/examples/visual-tests/amp-story/amp-story-shopping-lang-de.html b/examples/visual-tests/amp-story/amp-story-shopping-lang-de.html
index 6445d291a2b6..408284cb9bf7 100644
--- a/examples/visual-tests/amp-story/amp-story-shopping-lang-de.html
+++ b/examples/visual-tests/amp-story/amp-story-shopping-lang-de.html
@@ -49,38 +49,38 @@
             {
                 "items" : [
                    {
-                    "product-id": "lamp",
-                    "product-title": "Brass Lamp",
-                    "product-brand": "Lamp Co",
-                    "product-price": 799.00,
-                    "product-price-currency": "USD",
-                    "product-images": ["https://source.unsplash.com/Ry9WBo3qmoc/500x500"]
+                    "productId": "lamp",
+                    "productTitle": "Brass Lamp",
+                    "productBrand": "Lamp Co",
+                    "productPrice": 799.00,
+                    "productPriceCurrency": "USD",
+                    "productImages": ["https://source.unsplash.com/Ry9WBo3qmoc/500x500"]
                    },
                    {
-                    "product-id": "art",
-                    "product-title": "Abstract Art",
-                    "product-brand": "V. Artsy",
-                    "product-price": 1200.00,
-                    "product-price-currency": "INR",
-                    "product-images": ["https://source.unsplash.com/BdVQU-NDtA8/500x500"]
+                    "productId": "art",
+                    "productTitle": "Abstract Art",
+                    "productBrand": "V. Artsy",
+                    "productPrice": 1200.00,
+                    "productPriceCurrency": "INR",
+                    "productImages": ["https://source.unsplash.com/BdVQU-NDtA8/500x500"]
                    },
                    {
-                    "product-id": "chair",
-                    "product-title": "Yellow chair",
-                    "product-brand": "Chair Co.",
-                    "product-price": 1000.00,
-                    "product-price-currency": "BRL",
-                    "product-tag-text": "The perfectly imperfect yellow chair",
-                    "product-images": ["https://source.unsplash.com/DgQGKKLaVhY/500x500"]
+                    "productId": "chair",
+                    "productTitle": "Yellow chair",
+                    "productBrand": "Chair Co.",
+                    "productPrice": 1000.00,
+                    "productPriceCurrency": "BRL",
+                    "productTagText": "The perfectly imperfect yellow chair",
+                    "productImages": ["https://source.unsplash.com/DgQGKKLaVhY/500x500"]
                    },
                    {
-                    "product-id": "flowers",
-                    "product-title": "Flowers",
-                    "product-brand": "Very Long Flower Company Name",
-                    "product-price": 10.00,
-                    "product-price-currency": "USD",
-                    "product-icon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
-                    "product-images": ["https://source.unsplash.com/SavQfLRm4Do/500x500"]
+                    "productId": "flowers",
+                    "productTitle": "Flowers",
+                    "productBrand": "Very Long Flower Company Name",
+                    "productPrice": 10.00,
+                    "productPriceCurrency": "USD",
+                    "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
+                    "productImages": ["https://source.unsplash.com/SavQfLRm4Do/500x500"]
                    }
                 ]
               }
@@ -106,12 +106,12 @@
             {
                 "items" : [
                    {
-                    "product-id": "art",
-                    "product-title": "Abstract Art",
-                    "product-brand": "V. Artsy",
-                    "product-price": 1200.00,
-                    "product-price-currency": "JPY",
-                    "product-images": ["https://source.unsplash.com/BdVQU-NDtA8/500x500"]
+                    "productId": "art",
+                    "productTitle": "Abstract Art",
+                    "productBrand": "V. Artsy",
+                    "productPrice": 1200.00,
+                    "productPriceCurrency": "JPY",
+                    "productImages": ["https://source.unsplash.com/BdVQU-NDtA8/500x500"]
                    },
                 ]
               }
@@ -155,40 +155,40 @@
             {
               "items" : [
                 {
-                  "product-id": "lamp-rtl",
-                  "product-title": "Brass Lamp",
-                  "product-brand": "Lamp Co",
-                  "product-price": 799.00,
-                  "product-price-currency": "AED",
-                  "product-tag-text": " حبا حبا حبا سعادةا سعادة",
-                  "product-images": ["https://source.unsplash.com/Ry9WBo3qmoc/500x500"]
+                  "productId": "lamp-rtl",
+                  "productTitle": "Brass Lamp",
+                  "productBrand": "Lamp Co",
+                  "productPrice": 799.00,
+                  "productPriceCurrency": "AED",
+                  "productTagText": " حبا حبا حبا سعادةا سعادة",
+                  "productImages": ["https://source.unsplash.com/Ry9WBo3qmoc/500x500"]
                 },
                 {
-                  "product-id": "art-rtl",
-                  "product-title": "Abstract Art",
-                  "product-brand": "V. Artsy",
-                  "product-price-currency": "AED",
-                  "product-price": 1200.00,
-                  "product-tag-text": "حبا حب سعادة قط حبا حب سعادة قط ",
-                  "product-images": ["https://source.unsplash.com/BdVQU-NDtA8/500x500"]
+                  "productId": "art-rtl",
+                  "productTitle": "Abstract Art",
+                  "productBrand": "V. Artsy",
+                  "productPriceCurrency": "AED",
+                  "productPrice": 1200.00,
+                  "productTagText": "حبا حب سعادة قط حبا حب سعادة قط ",
+                  "productImages": ["https://source.unsplash.com/BdVQU-NDtA8/500x500"]
                 },
                 {
-                  "product-id": "chair-rtl",
-                  "product-title": "Yellow chair",
-                  "product-brand": "Chair Co.",
-                  "product-price": 1000.00,
-                  "product-price-currency": "AED",
-                  "product-icon": "/examples/visual-tests/amp-story/img/shopping/nest-home-icon.png",
-                  "product-images": ["https://source.unsplash.com/DgQGKKLaVhY/500x500"]
+                  "productId": "chair-rtl",
+                  "productTitle": "Yellow chair",
+                  "productBrand": "Chair Co.",
+                  "productPrice": 1000.00,
+                  "productPriceCurrency": "AED",
+                  "productIcon": "/examples/visual-tests/amp-story/img/shopping/nest-home-icon.png",
+                  "productImages": ["https://source.unsplash.com/DgQGKKLaVhY/500x500"]
                  },
                  {
-                  "product-id": "flowers-rtl",
-                  "product-title": "Flowers",
-                  "product-brand": "Very Long Flower Company Name",
-                  "product-price": 10.00,
-                  "product-price-currency": "AED",
-                  "product-icon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
-                  "product-images": ["https://source.unsplash.com/SavQfLRm4Do/500x500"]
+                  "productId": "flowers-rtl",
+                  "productTitle": "Flowers",
+                  "productBrand": "Very Long Flower Company Name",
+                  "productPrice": 10.00,
+                  "productPriceCurrency": "AED",
+                  "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
+                  "productImages": ["https://source.unsplash.com/SavQfLRm4Do/500x500"]
                  }
               ]
             }
diff --git a/examples/visual-tests/amp-story/amp-story-shopping.html b/examples/visual-tests/amp-story/amp-story-shopping.html
index a92200bd9eee..4727992933b8 100644
--- a/examples/visual-tests/amp-story/amp-story-shopping.html
+++ b/examples/visual-tests/amp-story/amp-story-shopping.html
@@ -47,38 +47,38 @@
             {
                 "items" : [
                    {
-                    "product-id": "lamp",
-                    "product-title": "Brass Lamp",
-                    "product-brand": "Lamp Co",
-                    "product-price": 799.00,
-                    "product-price-currency": "USD",
-                    "product-images": ["https://source.unsplash.com/Ry9WBo3qmoc/500x500"]
+                    "productId": "lamp",
+                    "productTitle": "Brass Lamp",
+                    "productBrand": "Lamp Co",
+                    "productPrice": 799.00,
+                    "productPriceCurrency": "USD",
+                    "productImages": ["https://source.unsplash.com/Ry9WBo3qmoc/500x500"]
                    },
                    {
-                    "product-id": "art",
-                    "product-title": "Abstract Art",
-                    "product-brand": "V. Artsy",
-                    "product-price": 1200.00,
-                    "product-price-currency": "INR",
-                    "product-images": ["https://source.unsplash.com/BdVQU-NDtA8/500x500"]
+                    "productId": "art",
+                    "productTitle": "Abstract Art",
+                    "productBrand": "V. Artsy",
+                    "productPrice": 1200.00,
+                    "productPriceCurrency": "INR",
+                    "productImages": ["https://source.unsplash.com/BdVQU-NDtA8/500x500"]
                    },
                    {
-                    "product-id": "chair",
-                    "product-title": "Yellow chair",
-                    "product-brand": "Chair Co.",
-                    "product-price": 1000.00,
-                    "product-price-currency": "BRL",
-                    "product-tag-text": "The perfectly imperfect yellow chair",
-                    "product-images": ["https://source.unsplash.com/DgQGKKLaVhY/500x500"]
+                    "productId": "chair",
+                    "productTitle": "Yellow chair",
+                    "productBrand": "Chair Co.",
+                    "productPrice": 1000.00,
+                    "productPriceCurrency": "BRL",
+                    "productTagText": "The perfectly imperfect yellow chair",
+                    "productImages": ["https://source.unsplash.com/DgQGKKLaVhY/500x500"]
                    },
                    {
-                    "product-id": "flowers",
-                    "product-title": "Flowers",
-                    "product-brand": "Very Long Flower Company Name",
-                    "product-price": 10.00,
-                    "product-price-currency": "USD",
-                    "product-icon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
-                    "product-images": ["https://source.unsplash.com/SavQfLRm4Do/500x500"]
+                    "productId": "flowers",
+                    "productTitle": "Flowers",
+                    "productBrand": "Very Long Flower Company Name",
+                    "productPrice": 10.00,
+                    "productPriceCurrency": "USD",
+                    "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
+                    "productImages": ["https://source.unsplash.com/SavQfLRm4Do/500x500"]
                    }
                 ]
               }
@@ -104,12 +104,12 @@
             {
                 "items" : [
                    {
-                    "product-id": "art",
-                    "product-title": "Abstract Art",
-                    "product-brand": "V. Artsy",
-                    "product-price": 1200.00,
-                    "product-price-currency": "JPY",
-                    "product-images": ["https://source.unsplash.com/BdVQU-NDtA8/500x500"]
+                    "productId": "art",
+                    "productTitle": "Abstract Art",
+                    "productBrand": "V. Artsy",
+                    "productPrice": 1200.00,
+                    "productPriceCurrency": "JPY",
+                    "productImages": ["https://source.unsplash.com/BdVQU-NDtA8/500x500"]
                    },
                 ]
               }
@@ -153,40 +153,40 @@
             {
               "items" : [
                 {
-                  "product-id": "lamp-rtl",
-                  "product-title": "Brass Lamp",
-                  "product-brand": "Lamp Co",
-                  "product-price": 799.00,
-                  "product-price-currency": "AED",
-                  "product-tag-text": " حبا حبا حبا سعادةا سعادة",
-                  "product-images": ["https://source.unsplash.com/Ry9WBo3qmoc/500x500"]
+                  "productId": "lamp-rtl",
+                  "productTitle": "Brass Lamp",
+                  "productBrand": "Lamp Co",
+                  "productPrice": 799.00,
+                  "productPriceCurrency": "AED",
+                  "productTagText": " حبا حبا حبا سعادةا سعادة",
+                  "productImages": ["https://source.unsplash.com/Ry9WBo3qmoc/500x500"]
                 },
                 {
-                  "product-id": "art-rtl",
-                  "product-title": "Abstract Art",
-                  "product-brand": "V. Artsy",
-                  "product-price-currency": "AED",
-                  "product-price": 1200.00,
-                  "product-tag-text": "حبا حب سعادة قط حبا حب سعادة قط",
-                  "product-images": ["https://source.unsplash.com/BdVQU-NDtA8/500x500"]
+                  "productId": "art-rtl",
+                  "productTitle": "Abstract Art",
+                  "productBrand": "V. Artsy",
+                  "productPriceCurrency": "AED",
+                  "productPrice": 1200.00,
+                  "productTagText": "حبا حب سعادة قط حبا حب سعادة قط",
+                  "productImages": ["https://source.unsplash.com/BdVQU-NDtA8/500x500"]
                 },
                 {
-                  "product-id": "chair-rtl",
-                  "product-title": "Yellow chair",
-                  "product-brand": "Chair Co.",
-                  "product-price": 1000.00,
-                  "product-price-currency": "AED",
-                  "product-icon": "/examples/visual-tests/amp-story/img/shopping/nest-home-icon.png",
-                  "product-images": ["https://source.unsplash.com/DgQGKKLaVhY/500x500"]
+                  "productId": "chair-rtl",
+                  "productTitle": "Yellow chair",
+                  "productBrand": "Chair Co.",
+                  "productPrice": 1000.00,
+                  "productPriceCurrency": "AED",
+                  "productIcon": "/examples/visual-tests/amp-story/img/shopping/nest-home-icon.png",
+                  "productImages": ["https://source.unsplash.com/DgQGKKLaVhY/500x500"]
                  },
                  {
-                  "product-id": "flowers-rtl",
-                  "product-title": "Flowers",
-                  "product-brand": "Very Long Flower Company Name",
-                  "product-price": 10.00,
-                  "product-price-currency": "AED",
-                  "product-icon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
-                  "product-images": ["https://source.unsplash.com/SavQfLRm4Do/500x500"]
+                  "productId": "flowers-rtl",
+                  "productTitle": "Flowers",
+                  "productBrand": "Very Long Flower Company Name",
+                  "productPrice": 10.00,
+                  "productPriceCurrency": "AED",
+                  "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
+                  "productImages": ["https://source.unsplash.com/SavQfLRm4Do/500x500"]
                  }
               ]
             }
diff --git a/extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.js b/extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.js
index d39218af2196..beb6f52d8890 100644
--- a/extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.js
+++ b/extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.js
@@ -136,20 +136,20 @@ export class AmpStoryShoppingAttachment extends AMP.BaseElement {
             <div class="i-amphtml-amp-story-shopping-plp-card">
               <div
                 class="i-amphtml-amp-story-shopping-plp-card-image"
-                style={`background-image: url("${data['product-images'][0]}")`}
+                style={`background-image: url("${data['productImages'][0]}")`}
               ></div>
               <div class="i-amphtml-amp-story-shopping-plp-card-brand">
-                {data['product-brand']}
+                {data['productBrand']}
               </div>
               <div class="i-amphtml-amp-story-shopping-plp-card-title">
-                {data['product-title']}
+                {data['productTitle']}
               </div>
               <div class="i-amphtml-amp-story-shopping-plp-card-price">
                 {formatI18nNumber(
                   this.localizationService_,
                   this.element,
-                  data['product-price-currency'],
-                  data['product-price']
+                  data['productPriceCurrency'],
+                  data['productPrice']
                 )}
               </div>
             </div>
diff --git a/extensions/amp-story-shopping/0.1/amp-story-shopping-config.js b/extensions/amp-story-shopping/0.1/amp-story-shopping-config.js
index 4ba8057a2425..744bc79f6b4d 100644
--- a/extensions/amp-story-shopping/0.1/amp-story-shopping-config.js
+++ b/extensions/amp-story-shopping/0.1/amp-story-shopping-config.js
@@ -25,14 +25,14 @@ export class AmpStoryShoppingConfig extends AMP.BaseElement {
   }
 
   /**
-   * Keys product data to product-ids and adds them to the store service.
+   * Keys product data to productIds and adds them to the store service.
    * @param {!ShoppingConfigDef} shoppingConfig
    * @private
    */
   addShoppingDataFromConfig_(shoppingConfig) {
     const productIDtoProduct = {};
     for (const item of shoppingConfig['items']) {
-      productIDtoProduct[item['product-id']] = item;
+      productIDtoProduct[item['productId']] = item;
     }
     this.storeService_.dispatch(Action.ADD_SHOPPING_DATA, productIDtoProduct);
     //TODO(#36412): Add call to validate config here.
diff --git a/extensions/amp-story-shopping/0.1/amp-story-shopping-tag.js b/extensions/amp-story-shopping/0.1/amp-story-shopping-tag.js
index 5ea89adfa52b..062ee437a34a 100644
--- a/extensions/amp-story-shopping/0.1/amp-story-shopping-tag.js
+++ b/extensions/amp-story-shopping/0.1/amp-story-shopping-tag.js
@@ -150,24 +150,24 @@ export class AmpStoryShoppingTag extends AMP.BaseElement {
           <span
             class="amp-story-shopping-tag-pill-image"
             style={
-              this.tagData_['product-icon'] && {
+              this.tagData_['productIcon'] && {
                 backgroundImage:
-                  'url(' + this.tagData_['product-icon'] + ') !important',
+                  'url(' + this.tagData_['productIcon'] + ') !important',
                 backgroundSize: 'cover !important',
               }
             }
           ></span>
           <span class="amp-story-shopping-tag-pill-text">
-            {(this.tagData_['product-tag-text'] && (
+            {(this.tagData_['productTagText'] && (
               <span class="amp-story-shopping-product-tag-text">
-                {this.tagData_['product-tag-text']}
+                {this.tagData_['productTagText']}
               </span>
             )) ||
               formatI18nNumber(
                 this.localizationService_,
                 this.element,
-                this.tagData_['product-price-currency'],
-                this.tagData_['product-price']
+                this.tagData_['productPriceCurrency'],
+                this.tagData_['productPrice']
               )}
           </span>
         </span>
diff --git a/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-attachment.js b/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-attachment.js
index be9cb4ad9f87..6cf0891930a7 100644
--- a/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-attachment.js
+++ b/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-attachment.js
@@ -69,12 +69,12 @@ describes.realWin(
     async function dispatchTestShoppingData() {
       const shoppingData = {
         'lamp': {
-          'product-id': 'lamp',
-          'product-title': 'Brass Lamp',
-          'product-brand': 'Lamp Co',
-          'product-price': 799.0,
-          'product-price-currency': 'USD',
-          'product-images': ['https://source.unsplash.com/Ry9WBo3qmoc/500x500'],
+          'productId': 'lamp',
+          'productTitle': 'Brass Lamp',
+          'productBrand': 'Lamp Co',
+          'productPrice': 799.0,
+          'productPriceCurrency': 'USD',
+          'productImages': ['https://source.unsplash.com/Ry9WBo3qmoc/500x500'],
         },
       };
       storeService.dispatch(Action.CHANGE_PAGE, {
diff --git a/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-config.js b/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-config.js
index c5ba1a84e024..f41183bc1d96 100644
--- a/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-config.js
+++ b/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-config.js
@@ -73,7 +73,7 @@ describes.realWin(
       element.setAttribute('src', exampleURL);
 
       const expectedRemoteResult = JSON.parse(
-        '{"art":{"product-id": "art","product-title": "Abstract Art","product-brand": "V. Artsy","product-price": 1200.0,"product-price-currency": "JPY","product-images": ["https://source.unsplash.com/BdVQU-NDtA8/500x500"]}}'
+        '{"art":{"productId": "art","productTitle": "Abstract Art","productBrand": "V. Artsy","productPrice": 1200.0,"productPriceCurrency": "JPY","productImages": ["https://source.unsplash.com/BdVQU-NDtA8/500x500"]}}'
       );
 
       expect(storeService.get(StateProperty.SHOPPING_DATA)).to.deep.eql(
diff --git a/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-tag.js b/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-tag.js
index c898d4e50930..5ca24dff6415 100644
--- a/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-tag.js
+++ b/extensions/amp-story-shopping/0.1/test/test-amp-story-shopping-tag.js
@@ -58,7 +58,7 @@ describes.realWin(
 
     async function shoppingDataDispatchStoreService() {
       const shoppingData = {
-        'sunglasses': {'product-title': 'Spectacular Spectacles'},
+        'sunglasses': {'productTitle': 'Spectacular Spectacles'},
       };
       storeService.dispatch(Action.ADD_SHOPPING_DATA, shoppingData);
     }
@@ -86,10 +86,10 @@ describes.realWin(
 
     it('should set active product in store service when shopping tag is clicked', async () => {
       const tagData = {
-        'product-id': 'sunglasses',
-        'product-title': 'Spectacular Spectacles',
-        'product-price': '400',
-        'product-icon':
+        'productId': 'sunglasses',
+        'productTitle': 'Spectacular Spectacles',
+        'productPrice': '400',
+        'productIcon':
           '/examples/visual-tests/amp-story/img/shopping/nest-audio-icon.png',
       };
 
diff --git a/extensions/amp-story/1.0/amp-story-store-service.js b/extensions/amp-story/1.0/amp-story-store-service.js
index 389899d4530f..5c1bea4e5235 100644
--- a/extensions/amp-story/1.0/amp-story-store-service.js
+++ b/extensions/amp-story/1.0/amp-story-store-service.js
@@ -74,14 +74,14 @@ export let InteractiveReactData;
 
 /**
  * @typedef {{
- *   product-id: string,
- *   product-title: string,
- *   product-brand: string,
- *   product-price: number,
- *   product-price-currency: string,
- *   product-icon: string,
- *   product-tag-text: ?string,
- *   product-images: !Array<string>,
+ *   productId: string,
+ *   productTitle: string,
+ *   productBrand: string,
+ *   productPrice: number,
+ *   productPriceCurrency: string,
+ *   productIcon: string,
+ *   productTagText: ?string,
+ *   productImages: !Array<string>,
  * }}
  */
 export let ShoppingConfigDataDef;