diff --git a/lib/searchkick/model.rb b/lib/searchkick/model.rb
index e15b672..c277ecd 100644
--- a/lib/searchkick/model.rb
+++ b/lib/searchkick/model.rb
@@ -8,10 +8,6 @@ module Searchkick
         class_variable_set :@@searchkick_klass, self
         cattr_reader :searchkick_options, :searchkick_env, :searchkick_klass
 
-        def self.searchkick_index
-          searchkick_klass.tire.index
-        end
-
         extend Searchkick::Search
         extend Searchkick::Reindex
         include Searchkick::Similar
@@ -22,16 +18,17 @@ module Searchkick
 
         tire.index_name index_name
 
-        descendants.each do |subclass|
-          subclass.tire.index_name index_name
-        end
-
-        def self.inherited(subclass)
-          subclass.tire.index_name index_name
+        def self.searchkick_index
+          searchkick_klass.tire.index
         end
 
         def reindex
-          tire.update_index
+          index = self.class.searchkick_index
+          if destroyed?
+            index.remove self
+          else
+            index.store self
+          end
         end
 
         unless options[:callbacks] == false
diff --git a/test/inheritance_test.rb b/test/inheritance_test.rb
index e9a5610..1c9022f 100644
--- a/test/inheritance_test.rb
+++ b/test/inheritance_test.rb
@@ -15,7 +15,7 @@ class TestInheritance < Minitest::Unit::TestCase
   end
 
   def test_child_index_name
-    assert_equal "animals_test", Dog.tire.index.name
+    assert_equal "animals_test", Dog.searchkick_index.name
   end
 
   def test_child_search
--
libgit2 0.21.0