diff --git a/src/AKSRT/Shop/Part1.php b/src/AKSRT/Shop/Part1.php
index 7d77128c..969597de 100644
--- a/src/AKSRT/Shop/Part1.php
+++ b/src/AKSRT/Shop/Part1.php
@@ -208,7 +208,7 @@ trait Part1 {
             'url'           => get_author_posts_url($author_id),
             'product_count' => $product_count,
             'contact'       => $contact,
-            'addresses'     => $this->get_user_address_book($author_id),
+            'addresses'     => $this->get_address_book($author_id),
         ];
     }
 
diff --git a/src/AKSRT/Shop/Shop.php b/src/AKSRT/Shop/Shop.php
index f29702d3..c0907c11 100644
--- a/src/AKSRT/Shop/Shop.php
+++ b/src/AKSRT/Shop/Shop.php
@@ -113,7 +113,7 @@ class Shop {
         $detail['shipping'] = $this->product_service()->get_product_shipping_profile($product_id);
         $detail['after_sale'] = $this->product_service()->get_product_after_sale_profile($product_id);
         $detail['marketing'] = $this->product_service()->get_product_marketing_profile($product_id);
-        $detail['checkout_hint'] = $this->get_checkout_hint($detail);
+        $detail['checkout_hint'] = $this->checkout_service()->get_checkout_hint($detail);
         $detail['purchase_enabled'] = ($detail['is_unlimited'] || $detail['stock'] > 0) && $detail['status'] === 'publish';
         $detail['default_quantity'] = 1;
         $detail['options'] = $this->get_product_options($product_id);
@@ -224,7 +224,7 @@ class Shop {
         return [
             'payment_methods' => $this->get_payment_method_options(),
             'shipping_methods' => $this->get_shipping_method_options(),
-            'address_book' => $this->get_user_address_book($user_id),
+            'address_book' => $this->get_address_book($user_id),
             'coupon_enabled' => class_exists('\AKSRT\Payment\Coupon'),
             'currency_symbol' => '¥',
             'pending_orders' => $pending_orders['items'] ?? [],