diff --git a/InventoryInStorePickupSales/Model/Order/Email/ReadyForPickupSender.php b/InventoryInStorePickupSales/Model/Order/Email/ReadyForPickupSender.php
index 36c1fe980c6d..9ecb50e4393f 100644
--- a/InventoryInStorePickupSales/Model/Order/Email/ReadyForPickupSender.php
+++ b/InventoryInStorePickupSales/Model/Order/Email/ReadyForPickupSender.php
@@ -111,6 +111,9 @@ protected function prepareTemplate(Order $order)
             'order' => $order,
             'store' => $order->getStore(),
             'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
+            'order_data' => [
+                'customer_name' => $order->getCustomerName()
+            ]
         ];
         $transportObject = new DataObject($transport);
 
diff --git a/InventoryInStorePickupSales/view/frontend/email/order_ready_for_pickup.html b/InventoryInStorePickupSales/view/frontend/email/order_ready_for_pickup.html
index 1298a04bf43c..19abaecf03f5 100644
--- a/InventoryInStorePickupSales/view/frontend/email/order_ready_for_pickup.html
+++ b/InventoryInStorePickupSales/view/frontend/email/order_ready_for_pickup.html
@@ -4,16 +4,13 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Your %store_name order is ready for pickup" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Your %store_name order is ready for pickup" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var order.getEmailCustomerNote()":"Email Order Note",
-"var order.getCustomerName()":"Customer Name",
-"var store.getFrontendName()":"Store Name",
+"var store.frontend_name":"Store Name",
 "var order.increment_id":"Order Id",
 "var formattedShippingAddress|raw":"Shipping Address",
-"var order.getShippingDescription()":"Shipping Description",
-"var store.getFrontendName()|escape":"Store Name",
-"var order.getCustomerName()":"Customer Name"
+"var order.shipping_description":"Shipping Description",
+"var order_data.customer_name":"Customer Name"
 } @-->
 
 {{template config_path="design/email/header_template"}}
@@ -21,9 +18,9 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%customer_name," customer_name=$order.getCustomerName()}}</p>
+            <p class="greeting">{{trans "%customer_name," customer_name=$order_data.customer_name}}</p>
             <p>
-                {{trans "Your order placed from %store_name is ready for pickup." store_name=$store.getFrontendName()}}
+                {{trans "Your order placed from %store_name is ready for pickup." store_name=$store.frontend_name}}
             </p>
         </td>
     </tr>
@@ -46,7 +43,7 @@ <h3>{{trans "Shipping Info"}}</h3>
                 <tr>
                     <td class="method-info">
                         <h3>{{trans "Shipping Method"}}</h3>
-                        <p>{{var order.getShippingDescription()}}</p>
+                        <p>{{var order.shipping_description}}</p>
                     </td>
                 </tr>
             </table>