diff --git a/modules/cart/src/Form/AddToCartForm.php b/modules/cart/src/Form/AddToCartForm.php
index 1875851..d1e40af 100644
--- a/modules/cart/src/Form/AddToCartForm.php
+++ b/modules/cart/src/Form/AddToCartForm.php
@@ -103,7 +103,7 @@ class AddToCartForm extends ContentEntityForm {
   public function submitForm(array &$form, FormStateInterface $form_state) {
     parent::submitForm($form, $form_state);
 
-    $line_item_type_storage = $this->entityManager->getStorage('commerce_line_item_type');
+    $line_item_type_storage = $this->entityTypeManager->getStorage('commerce_line_item_type');
     /** @var \Drupal\commerce_order\Entity\LineItemInterface $line_item */
     $line_item = $this->entity;
     /** @var \Drupal\commerce\PurchasableEntityInterface $purchased_entity */
diff --git a/modules/order/src/Form/OrderForm.php b/modules/order/src/Form/OrderForm.php
index 5777e48..fa65020 100644
--- a/modules/order/src/Form/OrderForm.php
+++ b/modules/order/src/Form/OrderForm.php
@@ -102,7 +102,7 @@ class OrderForm extends ContentEntityForm {
       $form['meta']['date'] = $this->fieldAsReadOnly($this->t('Placed'), $date);
     }
     // Show the order's store only if there are multiple available.
-    $store_query = $this->entityManager->getStorage('commerce_store')->getQuery();
+    $store_query = $this->entityTypeManager->getStorage('commerce_store')->getQuery();
     $store_count = $store_query->count()->execute();
     if ($store_count > 1) {
       $store_link = $order->getStore()->toLink()->toString();
diff --git a/modules/order/src/LineItemViewsData.php b/modules/order/src/LineItemViewsData.php
index 21550d6..c652855 100644
--- a/modules/order/src/LineItemViewsData.php
+++ b/modules/order/src/LineItemViewsData.php
@@ -20,7 +20,7 @@ class LineItemViewsData extends EntityViewsData {
     unset($data['commerce_line_item']['purchased_entity']['relationship']);
 
     // Collect all purchasable entity types.
-    $line_item_types = $this->entityManager->getStorage('commerce_line_item_type')->loadMultiple();
+    $line_item_types = $this->entityTypeManager->getStorage('commerce_line_item_type')->loadMultiple();
     $entity_type_ids = [];
     /** @var \Drupal\commerce_order\Entity\LineItemTypeInterface $line_item_type */
     foreach ($line_item_types as $line_item_type) {
@@ -33,7 +33,7 @@ class LineItemViewsData extends EntityViewsData {
     // Provide a relationship for each entity type found.
     foreach ($entity_type_ids as $entity_type_id) {
       /** @var \Drupal\Core\Entity\EntityTypeInterface $entity_type */
-      $entity_type = $this->entityManager->getDefinition($entity_type_id);
+      $entity_type = $this->entityTypeManager->getDefinition($entity_type_id);
       $data['commerce_line_item'][$entity_type_id] = [
         'relationship' => [
           'title' => $entity_type->getLabel(),
diff --git a/modules/product/src/Form/ProductForm.php b/modules/product/src/Form/ProductForm.php
index 2d8a4c8..621b46f 100644
--- a/modules/product/src/Form/ProductForm.php
+++ b/modules/product/src/Form/ProductForm.php
@@ -55,7 +55,7 @@ class ProductForm extends ContentEntityForm {
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     // Skip building the form if there are no available stores.
-    $store_query = $this->entityManager->getStorage('commerce_store')->getQuery();
+    $store_query = $this->entityTypeManager->getStorage('commerce_store')->getQuery();
     if ($store_query->count()->execute() == 0) {
       $link = Link::createFromRoute('Add a new store.', 'entity.commerce_store.add_page');
       $form['warning'] = [
diff --git a/modules/store/src/Plugin/views/field/Store.php b/modules/store/src/Plugin/views/field/Store.php
index ae0ea83..5bc541a 100644
--- a/modules/store/src/Plugin/views/field/Store.php
+++ b/modules/store/src/Plugin/views/field/Store.php
@@ -44,7 +44,7 @@ class Store extends Field {
    * {@inheritdoc}
    */
   public function access(AccountInterface $account) {
-    $store_query = $this->entityManager->getStorage('commerce_store')->getQuery();
+    $store_query = $this->entityTypeManager->getStorage('commerce_store')->getQuery();
     $store_count = $store_query->count()->execute();
     if ($this->options['hide_single_store'] && $store_count <= 1) {
       return FALSE;
diff --git a/modules/store/src/StoreListBuilder.php b/modules/store/src/StoreListBuilder.php
index 90b0694..063d283 100644
--- a/modules/store/src/StoreListBuilder.php
+++ b/modules/store/src/StoreListBuilder.php
@@ -30,7 +30,7 @@ class StoreListBuilder extends EntityListBuilder {
     $row['name']['data'] = [
       '#type' => 'link',
       '#title' => $entity->label(),
-    ] + $entity->urlInfo()->toRenderArray();
+    ] + $entity->toUrl()->toRenderArray();
     $row['type'] = $store_type->label();
 
     return $row + parent::buildRow($entity);
diff --git a/src/Plugin/views/field/EntityBundle.php b/src/Plugin/views/field/EntityBundle.php
index 4a68bae..cdc525d 100644
--- a/src/Plugin/views/field/EntityBundle.php
+++ b/src/Plugin/views/field/EntityBundle.php
@@ -44,7 +44,7 @@ class EntityBundle extends Field {
    * {@inheritdoc}
    */
   public function access(AccountInterface $account) {
-    $bundles = $this->entityManager->getBundleInfo($this->getEntityType());
+    $bundles = $this->entityTypeManager->getBundleInfo($this->getEntityType());
     if ($this->options['hide_single_bundle'] && count($bundles) <= 1) {
       return FALSE;
     }
diff --git a/src/Plugin/views/filter/EntityBundle.php b/src/Plugin/views/filter/EntityBundle.php
index 09c3a78..4e69a7c 100644
--- a/src/Plugin/views/filter/EntityBundle.php
+++ b/src/Plugin/views/filter/EntityBundle.php
@@ -53,7 +53,7 @@ class EntityBundle extends Bundle {
    * {@inheritdoc}
    */
   public function access(AccountInterface $account) {
-    $bundles = $this->entityManager->getBundleInfo($this->getEntityType());
+    $bundles = $this->entityTypeManager->getBundleInfo($this->getEntityType());
     if ($this->options['expose']['hide_single_bundle'] && count($bundles) <= 1) {
       return FALSE;
     }