diff --git a/search_api.drush.inc b/search_api.drush.inc
index e403668..07954f8 100644
--- a/search_api.drush.inc
+++ b/search_api.drush.inc
@@ -325,8 +325,8 @@ function drush_search_api_status($index_id = NULL) {
   );
 
   foreach ($indexes as $index) {
-    $indexed = $index->getTracker()->getIndexedItemsCount();
-    $total = $index->getTracker()->getTotalItemsCount();
+    $indexed = $index->getTrackerInstance()->getIndexedItemsCount();
+    $total = $index->getTrackerInstance()->getTotalItemsCount();
 
     $complete = '-';
     if ($total > 0) {
@@ -365,7 +365,7 @@ function drush_search_api_index($index_id = NULL, $limit = NULL, $batch_size = N
   }
 
   foreach ($indexes as $index) {
-    $tracker = $index->getTracker();
+    $tracker = $index->getTrackerInstance();
     $remaining = $tracker->getTotalItemsCount() - $tracker->getIndexedItemsCount();
 
     if (!$remaining) {
diff --git a/search_api.theme.inc b/search_api.theme.inc
index 7de7c73..677cf52 100644
--- a/search_api.theme.inc
+++ b/search_api.theme.inc
@@ -230,7 +230,7 @@ function theme_search_api_index($variables) {
   /** @var $index \Drupal\search_api\IndexInterface */
   $index = $variables['index'];
   $server = $index->hasValidServer() ? $index->getServer() : NULL;
-  $tracker = $index->hasValidTracker() ? $index->getTracker() : NULL;
+  $tracker = $index->hasValidTracker() ? $index->getTrackerInstance() : NULL;
 
   $output = '';
 
diff --git a/search_api_db/tests/src/Kernel/BackendTest.php b/search_api_db/tests/src/Kernel/BackendTest.php
index 5c43111..9cc07fd 100644
--- a/search_api_db/tests/src/Kernel/BackendTest.php
+++ b/search_api_db/tests/src/Kernel/BackendTest.php
@@ -157,8 +157,8 @@ class BackendTest extends KernelTestBase {
     $index = $this->getIndex();
     $this->assertTrue((bool) $index, 'The index was successfully created.');
 
-    $this->assertEquals(5, $index->getTracker()->getTotalItemsCount(), 'Correct item count.');
-    $this->assertEquals(0, $index->getTracker()->getIndexedItemsCount(), 'All items still need to be indexed.');
+    $this->assertEquals(5, $index->getTrackerInstance()->getTotalItemsCount(), 'Correct item count.');
+    $this->assertEquals(0, $index->getTrackerInstance()->getIndexedItemsCount(), 'All items still need to be indexed.');
   }
 
   /**
diff --git a/src/Entity/Index.php b/src/Entity/Index.php
index ee3dbba..e271a10 100644
--- a/src/Entity/Index.php
+++ b/src/Entity/Index.php
@@ -160,9 +160,9 @@ class Index extends ConfigEntityBase implements IndexInterface {
    *
    * @var \Drupal\search_api\Tracker\TrackerInterface|null
    *
-   * @see getTracker()
+   * @see getTrackerInstance()
    */
-  protected $trackerPlugin;
+  protected $trackerInstance;
 
   /**
    * The ID of the server on which data should be indexed.
@@ -371,8 +371,8 @@ class Index extends ConfigEntityBase implements IndexInterface {
   /**
    * {@inheritdoc}
    */
-  public function getTracker() {
-    if (!$this->trackerPlugin) {
+  public function getTrackerInstance() {
+    if (!$this->trackerInstance) {
 
       if (is_null($this->tracker_settings)) {
         $tracker_plugin_configuration = array('index' => $this);
@@ -381,14 +381,14 @@ class Index extends ConfigEntityBase implements IndexInterface {
         $tracker_plugin_configuration = array('index' => $this) + $this->tracker_settings[$plugins[0]]['settings'];
       }
 
-      if (!($this->trackerPlugin = \Drupal::service('plugin.manager.search_api.tracker')->createInstance($this->getTrackerId(), $tracker_plugin_configuration))) {
+      if (!($this->trackerInstance = \Drupal::service('plugin.manager.search_api.tracker')->createInstance($this->getTrackerId(), $tracker_plugin_configuration))) {
         $args['@tracker'] = $this->getTrackerId();
         $args['%index'] = $this->label();
         throw new SearchApiException(new FormattableMarkup('The tracker with ID "@tracker" could not be retrieved for index %index.', $args));
       }
     }
 
-    return $this->trackerPlugin;
+    return $this->trackerInstance;
   }
 
   /**
@@ -771,7 +771,7 @@ class Index extends ConfigEntityBase implements IndexInterface {
    */
   public function indexItems($limit = '-1', $datasource_id = NULL) {
     if ($this->hasValidTracker() && !$this->isReadOnly()) {
-      $tracker = $this->getTracker();
+      $tracker = $this->getTrackerInstance();
       $next_set = $tracker->getRemainingItems($limit, $datasource_id);
       $items = $this->loadItemsMultiple($next_set);
       if ($items) {
@@ -842,7 +842,7 @@ class Index extends ConfigEntityBase implements IndexInterface {
 
     if ($processed_ids) {
       if ($this->hasValidTracker()) {
-        $this->getTracker()->trackItemsIndexed($processed_ids);
+        $this->getTrackerInstance()->trackItemsIndexed($processed_ids);
       }
       // Since we've indexed items now, triggering reindexing would have some
       // effect again. Therefore, we reset the flag.
@@ -887,7 +887,7 @@ class Index extends ConfigEntityBase implements IndexInterface {
       foreach ($ids as $id) {
         $item_ids[] = Utility::createCombinedId($datasource_id, $id);
       }
-      $this->getTracker()->$tracker_method($item_ids);
+      $this->getTrackerInstance()->$tracker_method($item_ids);
       if (!$this->isReadOnly() && $this->getOption('index_directly')) {
         try {
           $items = $this->loadItemsMultiple($item_ids);
@@ -911,7 +911,7 @@ class Index extends ConfigEntityBase implements IndexInterface {
       foreach ($ids as $id) {
         $item_ids[] = Utility::createCombinedId($datasource_id, $id);
       }
-      $this->getTracker()->trackItemsDeleted($item_ids);
+      $this->getTrackerInstance()->trackItemsDeleted($item_ids);
       if (!$this->isReadOnly() && $this->isServerEnabled()) {
         $this->getServer()->deleteItems($this, $item_ids);
       }
@@ -924,7 +924,7 @@ class Index extends ConfigEntityBase implements IndexInterface {
   public function reindex() {
     if ($this->status() && !$this->hasReindexed) {
       $this->hasReindexed = TRUE;
-      $this->getTracker()->trackAllItemsUpdated();
+      $this->getTrackerInstance()->trackAllItemsUpdated();
       \Drupal::moduleHandler()->invokeAll('search_api_index_reindex', array($this, FALSE));
     }
   }
@@ -939,7 +939,7 @@ class Index extends ConfigEntityBase implements IndexInterface {
       if (!$this->hasReindexed) {
         $invoke_hook = TRUE;
         $this->hasReindexed = TRUE;
-        $this->getTracker()->trackAllItemsUpdated();
+        $this->getTrackerInstance()->trackAllItemsUpdated();
       }
       if (!$this->isReadOnly()) {
         $invoke_hook = TRUE;
@@ -1019,7 +1019,7 @@ class Index extends ConfigEntityBase implements IndexInterface {
    */
   public function resetCaches($include_stored = TRUE) {
     $this->datasourcePlugins = NULL;
-    $this->trackerPlugin = NULL;
+    $this->trackerInstance = NULL;
     $this->serverInstance = NULL;
     $this->processorPlugins = NULL;
     $this->cache = array();
@@ -1295,7 +1295,7 @@ class Index extends ConfigEntityBase implements IndexInterface {
     /** @var \Drupal\search_api\IndexInterface[] $entities */
     foreach ($entities as $index) {
       if ($index->hasValidTracker()) {
-        $index->getTracker()->trackAllItemsDeleted();
+        $index->getTrackerInstance()->trackAllItemsDeleted();
       }
       if ($index->hasValidServer()) {
         $index->getServer()->removeIndex($index);
@@ -1574,7 +1574,7 @@ class Index extends ConfigEntityBase implements IndexInterface {
     $plugins = array();
 
     if ($this->hasValidTracker()) {
-      $plugins['tracker'][$this->getTrackerId()] = $this->getTracker();
+      $plugins['tracker'][$this->getTrackerId()] = $this->getTrackerInstance();
     }
     $plugins['processors'] = $this->getProcessors();
     $plugins['datasources'] = $this->getDatasources();
diff --git a/src/Form/IndexForm.php b/src/Form/IndexForm.php
index 069b01e..a6f2e04 100644
--- a/src/Form/IndexForm.php
+++ b/src/Form/IndexForm.php
@@ -262,7 +262,7 @@ class IndexForm extends EntityForm {
       '#title' => $this->t('Tracker'),
       '#description' => $this->t('Select the type of tracker which should be used for keeping track of item changes.'),
       '#options' => $this->getTrackerPluginManager()->getOptionsList(),
-      '#default_value' => $index->hasValidTracker() ? $index->getTracker()->getPluginId() : key($tracker_options),
+      '#default_value' => $index->hasValidTracker() ? $index->getTrackerInstance()->getPluginId() : key($tracker_options),
       '#required' => TRUE,
       '#disabled' => !$index->isNew(),
       '#ajax' => array(
@@ -392,7 +392,7 @@ class IndexForm extends EntityForm {
    */
   public function buildTrackerConfigForm(array &$form, FormStateInterface $form_state, IndexInterface $index) {
     if ($index->hasValidTracker()) {
-      $tracker = $index->getTracker();
+      $tracker = $index->getTrackerInstance();
       // @todo Create, use and save SubFormState already here, not only in
       //   validate(). Also, use proper subset of $form for first parameter?
       if ($config_form = $tracker->buildConfigurationForm(array(), $form_state)) {
@@ -484,7 +484,7 @@ class IndexForm extends EntityForm {
     //   form structure).
     $tracker_id = $form_state->getValue('tracker', NULL);
     if ($this->originalEntity->getTrackerId() == $tracker_id) {
-      $tracker = $this->originalEntity->getTracker();
+      $tracker = $this->originalEntity->getTrackerInstance();
     }
     else {
       $tracker = $this->trackerPluginManager->createInstance($tracker_id, array('index' => $this->originalEntity));
@@ -544,7 +544,7 @@ class IndexForm extends EntityForm {
     //   form structure).
     $tracker_id = $form_state->getValue('tracker', NULL);
     if ($this->originalEntity->getTrackerId() == $tracker_id) {
-      $tracker = $this->originalEntity->getTracker();
+      $tracker = $this->originalEntity->getTrackerInstance();
     }
     else {
       $tracker = $this->trackerPluginManager->createInstance($tracker_id, array('index' => $this->originalEntity));
diff --git a/src/Form/IndexStatusForm.php b/src/Form/IndexStatusForm.php
index 640e795..ad42155 100644
--- a/src/Form/IndexStatusForm.php
+++ b/src/Form/IndexStatusForm.php
@@ -65,7 +65,7 @@ class IndexStatusForm extends FormBase {
           'class' => array('container-inline'),
         ),
       );
-      $has_remaining_items = ($index->getTracker()->getRemainingItemsCount() > 0);
+      $has_remaining_items = ($index->getTrackerInstance()->getRemainingItemsCount() > 0);
       $all_value = $this->t('all', array(), array('context' => 'items to index'));
       $limit = array(
         '#type' => 'textfield',
diff --git a/src/IndexBatchHelper.php b/src/IndexBatchHelper.php
index 9da6463..379a9e8 100644
--- a/src/IndexBatchHelper.php
+++ b/src/IndexBatchHelper.php
@@ -137,7 +137,7 @@ class IndexBatchHelper {
     // Get the remaining item count. When no valid tracker is available then
     // the value will be set to zero which will cause the batch process to
     // stop.
-    $remaining_item_count = ($index->hasValidTracker() ? $index->getTracker()->getRemainingItemsCount() : 0);
+    $remaining_item_count = ($index->hasValidTracker() ? $index->getTrackerInstance()->getRemainingItemsCount() : 0);
 
     // Check if an explicit limit needs to be used.
     if ($context['sandbox']['limit'] > -1) {
diff --git a/src/IndexInterface.php b/src/IndexInterface.php
index a435f35..deac9e8 100644
--- a/src/IndexInterface.php
+++ b/src/IndexInterface.php
@@ -200,7 +200,7 @@ interface IndexInterface extends ConfigEntityInterface {
    * @throws \Drupal\search_api\SearchApiException
    *   Thrown if the tracker couldn't be instantiated.
    */
-  public function getTracker();
+  public function getTrackerInstance();
 
   /**
    * Determines whether this index is lying on a valid server.
diff --git a/src/Task/IndexTaskManager.php b/src/Task/IndexTaskManager.php
index db1b5b8..4cfafcb 100644
--- a/src/Task/IndexTaskManager.php
+++ b/src/Task/IndexTaskManager.php
@@ -99,7 +99,7 @@ class IndexTaskManager implements IndexTaskManagerInterface {
             $item_ids[] = Utility::createCombinedId($datasource_id, $raw_id);
           }
           $added = count($item_ids);
-          $index->getTracker()->trackItemsInserted($item_ids);
+          $index->getTrackerInstance()->trackItemsInserted($item_ids);
         }
       }
     }
@@ -195,7 +195,7 @@ class IndexTaskManager implements IndexTaskManagerInterface {
     if (!isset($datasource_ids)) {
       $this->state->delete($this->getIndexStateKey($index));
       if ($valid_tracker) {
-        $index->getTracker()->trackAllItemsDeleted();
+        $index->getTrackerInstance()->trackAllItemsDeleted();
       }
       return;
     }
@@ -211,7 +211,7 @@ class IndexTaskManager implements IndexTaskManagerInterface {
     foreach ($datasource_ids as $datasource_id) {
       unset($index_state['pages'][$datasource_id]);
       if ($valid_tracker) {
-        $index->getTracker()->trackAllItemsDeleted($datasource_id);
+        $index->getTrackerInstance()->trackAllItemsDeleted($datasource_id);
       }
     }
 
diff --git a/src/Tests/IntegrationTest.php b/src/Tests/IntegrationTest.php
index b21019a..0ef3d1b 100644
--- a/src/Tests/IntegrationTest.php
+++ b/src/Tests/IntegrationTest.php
@@ -430,7 +430,7 @@ class IntegrationTest extends WebTestBase {
    *   The number of tracked items in the test index.
    */
   protected function countTrackedItems() {
-    return $this->getIndex()->getTracker()->getTotalItemsCount();
+    return $this->getIndex()->getTrackerInstance()->getTotalItemsCount();
   }
 
   /**
@@ -440,7 +440,7 @@ class IntegrationTest extends WebTestBase {
    *   The number of unindexed items in the test index.
    */
   protected function countRemainingItems() {
-    return $this->getIndex()->getTracker()->getRemainingItemsCount();
+    return $this->getIndex()->getTrackerInstance()->getRemainingItemsCount();
   }
 
   /**
@@ -771,7 +771,7 @@ class IntegrationTest extends WebTestBase {
 
     $this->drupalPostForm($index_path, array(), $this->t('Index now'));
 
-    $remaining_after = $index->getTracker()->getRemainingItemsCount();
+    $remaining_after = $index->getTrackerInstance()->getRemainingItemsCount();
     $this->assertEqual(0, $remaining_after, 'Items were indexed after removing the "read only" flag.');
 
   }
diff --git a/src/Tests/LanguageIntegrationTest.php b/src/Tests/LanguageIntegrationTest.php
index 5dfec22..0dc654e 100644
--- a/src/Tests/LanguageIntegrationTest.php
+++ b/src/Tests/LanguageIntegrationTest.php
@@ -128,7 +128,7 @@ class LanguageIntegrationTest extends WebTestBase {
   protected function countTrackedItems() {
     /** @var \Drupal\search_api\IndexInterface $index */
     $index = Index::load($this->indexId);
-    return $index->getTracker()->getTotalItemsCount();
+    return $index->getTrackerInstance()->getTotalItemsCount();
   }
 
   /**
diff --git a/src/UnsavedIndexConfiguration.php b/src/UnsavedIndexConfiguration.php
index 8fe07be..ebbd30d 100644
--- a/src/UnsavedIndexConfiguration.php
+++ b/src/UnsavedIndexConfiguration.php
@@ -249,8 +249,8 @@ class UnsavedIndexConfiguration implements IndexInterface, UnsavedConfigurationI
   /**
    * {@inheritdoc}
    */
-  public function getTracker() {
-    return $this->entity->getTracker();
+  public function getTrackerInstance() {
+    return $this->entity->getTrackerInstance();
   }
 
   /**
diff --git a/tests/src/Kernel/CliTest.php b/tests/src/Kernel/CliTest.php
index 70fd5cc..bba9fed 100644
--- a/tests/src/Kernel/CliTest.php
+++ b/tests/src/Kernel/CliTest.php
@@ -101,8 +101,8 @@ class CliTest extends KernelTestBase {
     ));
     $index->save();
 
-    $total_items = $index->getTracker()->getTotalItemsCount();
-    $indexed_items = $index->getTracker()->getIndexedItemsCount();
+    $total_items = $index->getTrackerInstance()->getTotalItemsCount();
+    $indexed_items = $index->getTrackerInstance()->getIndexedItemsCount();
 
     $this->assertEquals($total_items, 2, 'The 2 items are tracked.');
     $this->assertEquals($indexed_items, 0, 'No items are indexed');
@@ -122,8 +122,8 @@ class CliTest extends KernelTestBase {
       'category' => 'item_category'
     ))->save();
 
-    $total_items = $index->getTracker()->getTotalItemsCount();
-    $indexed_items = $index->getTracker()->getIndexedItemsCount();
+    $total_items = $index->getTrackerInstance()->getTotalItemsCount();
+    $indexed_items = $index->getTrackerInstance()->getIndexedItemsCount();
 
     $this->assertEquals($total_items, 4, 'All 4 items are tracked.');
     $this->assertEquals($indexed_items, 2, '2 items are indexed');
diff --git a/tests/src/Kernel/LanguageKernelTest.php b/tests/src/Kernel/LanguageKernelTest.php
index 671a957..b555e77 100644
--- a/tests/src/Kernel/LanguageKernelTest.php
+++ b/tests/src/Kernel/LanguageKernelTest.php
@@ -153,10 +153,10 @@ class LanguageKernelTest extends KernelTestBase {
     $this->assertEquals($expected, $datasource_item_ids, 'Datasource returns correct item ids.');
 
     // Test indexing the new entity.
-    $this->assertEquals(0, $this->index->getTracker()->getIndexedItemsCount(), 'The index is empty.');
-    $this->assertEquals(2, $this->index->getTracker()->getTotalItemsCount(), 'There are two items to be indexed.');
+    $this->assertEquals(0, $this->index->getTrackerInstance()->getIndexedItemsCount(), 'The index is empty.');
+    $this->assertEquals(2, $this->index->getTrackerInstance()->getTotalItemsCount(), 'There are two items to be indexed.');
     $this->index->indexItems();
-    $this->assertEquals(2, $this->index->getTracker()->getIndexedItemsCount(), 'Two items have been indexed.');
+    $this->assertEquals(2, $this->index->getTrackerInstance()->getIndexedItemsCount(), 'Two items have been indexed.');
 
     // Now, make the first entity language-specific by assigning a language.
     $default_langcode = $this->langcodes[0];
@@ -175,8 +175,8 @@ class LanguageKernelTest extends KernelTestBase {
     $this->assertEquals($expected, $datasource_item_ids, 'Datasource returns correct item ids.');
 
     // Test that the index needs to be updated.
-    $this->assertEquals(1, $this->index->getTracker()->getIndexedItemsCount(), 'The updated item needs to be reindexed.');
-    $this->assertEquals(2, $this->index->getTracker()->getTotalItemsCount(), 'There are two items in total.');
+    $this->assertEquals(1, $this->index->getTrackerInstance()->getIndexedItemsCount(), 'The updated item needs to be reindexed.');
+    $this->assertEquals(2, $this->index->getTrackerInstance()->getTotalItemsCount(), 'There are two items in total.');
 
     // Set two translations for the first entity and test that the datasource
     // returns three separate item IDs, one for each translation.
@@ -197,8 +197,8 @@ class LanguageKernelTest extends KernelTestBase {
     $this->assertEquals($expected, $datasource_item_ids, 'Datasource returns correct item ids for a translated entity.');
 
     // Test that the index needs to be updated.
-    $this->assertEquals(1, $this->index->getTracker()->getIndexedItemsCount(), 'The updated items needs to be reindexed.');
-    $this->assertEquals(4, $this->index->getTracker()->getTotalItemsCount(), 'There are four items in total.');
+    $this->assertEquals(1, $this->index->getTrackerInstance()->getIndexedItemsCount(), 'The updated items needs to be reindexed.');
+    $this->assertEquals(4, $this->index->getTrackerInstance()->getTotalItemsCount(), 'There are four items in total.');
 
     // Delete one translation and test that the datasource returns only three
     // items.
@@ -215,10 +215,10 @@ class LanguageKernelTest extends KernelTestBase {
     $this->assertEquals($expected, $datasource_item_ids, 'Datasource returns correct item ids for a translated entity.');
 
     // Test reindexing.
-    $this->assertEquals(3, $this->index->getTracker()->getTotalItemsCount(), 'There are three items in total.');
-    $this->assertEquals(1, $this->index->getTracker()->getIndexedItemsCount(), 'The updated items needs to be reindexed.');
+    $this->assertEquals(3, $this->index->getTrackerInstance()->getTotalItemsCount(), 'There are three items in total.');
+    $this->assertEquals(1, $this->index->getTrackerInstance()->getIndexedItemsCount(), 'The updated items needs to be reindexed.');
     $this->index->indexItems();
-    $this->assertEquals(3, $this->index->getTracker()->getIndexedItemsCount(), 'Three items are indexed.');
+    $this->assertEquals(3, $this->index->getTrackerInstance()->getIndexedItemsCount(), 'Three items are indexed.');
   }
 
 }