diff --git a/Gemfile b/Gemfile
index 88d62baf..ef0e7a95 100644
--- a/Gemfile
+++ b/Gemfile
@@ -39,7 +39,7 @@ group :development do
   gem 'rubocop', require: false
 end
 # NCBO gems (can be from a local dev path or from rubygems/git)
-gem 'goo', github: 'ncbo/goo', branch: 'development'
+gem 'goo', github: 'ncbo/goo', branch: 'feature/solrcloud-alias-indexing-claude'
 gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'development'
 
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 5b4282d2..d5882b39 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,8 +8,8 @@ GIT
 
 GIT
   remote: https://github.com/ncbo/goo.git
-  revision: fa850f46c94e09b6368ed47728b9cce05b7e9d54
-  branch: development
+  revision: 534648570e056c6da12e12e9f019a14459909dcf
+  branch: feature/solrcloud-alias-indexing-claude
   specs:
     goo (0.0.2)
       addressable (~> 2.8)
diff --git a/lib/ontologies_linked_data/models/class.rb b/lib/ontologies_linked_data/models/class.rb
index 754b6cc6..a69aef8f 100644
--- a/lib/ontologies_linked_data/models/class.rb
+++ b/lib/ontologies_linked_data/models/class.rb
@@ -174,7 +174,7 @@ def self.index_schema(schema_generator)
         schema_generator.add_dynamic_field('definition_*', 'text_general', indexed: true, stored: true, multi_valued: true)
       end
 
-      enable_indexing(:term_search_core1) do |schema_generator|
+      enable_indexing(:term_search, :main, bootstrap_collection: :term_search_bootstrap) do |schema_generator|
         index_schema(schema_generator)
       end
 
diff --git a/lib/ontologies_linked_data/models/properties/annotation_property.rb b/lib/ontologies_linked_data/models/properties/annotation_property.rb
index 7e216717..c6ba216c 100644
--- a/lib/ontologies_linked_data/models/properties/annotation_property.rb
+++ b/lib/ontologies_linked_data/models/properties/annotation_property.rb
@@ -36,7 +36,7 @@ class AnnotationProperty < LinkedData::Models::OntologyProperty
               LinkedData::Hypermedia::Link.new("descendants", lambda {|m| "#{self.ontology_link(m)}/properties/#{CGI.escape(m.id.to_s)}/descendants"}, self.uri_type),
               LinkedData::Hypermedia::Link.new("tree", lambda {|m| "#{self.ontology_link(m)}/properties/#{CGI.escape(m.id.to_s)}/tree"}, self.uri_type)
 
-      enable_indexing(:prop_search_core1, :property) do |schema_generator|
+      enable_indexing(:prop_search, :property, bootstrap_collection: :prop_search_bootstrap) do |schema_generator|
         index_schema(schema_generator)
       end
     end
diff --git a/lib/ontologies_linked_data/models/properties/datatype_property.rb b/lib/ontologies_linked_data/models/properties/datatype_property.rb
index 34789dc1..1c1dae15 100644
--- a/lib/ontologies_linked_data/models/properties/datatype_property.rb
+++ b/lib/ontologies_linked_data/models/properties/datatype_property.rb
@@ -36,7 +36,7 @@ class DatatypeProperty < LinkedData::Models::OntologyProperty
               LinkedData::Hypermedia::Link.new("descendants", lambda {|m| "#{self.ontology_link(m)}/properties/#{CGI.escape(m.id.to_s)}/descendants"}, self.uri_type),
               LinkedData::Hypermedia::Link.new("tree", lambda {|m| "#{self.ontology_link(m)}/properties/#{CGI.escape(m.id.to_s)}/tree"}, self.uri_type)
 
-      enable_indexing(:prop_search_core1, :property) do |schema_generator|
+      enable_indexing(:prop_search, :property, bootstrap_collection: :prop_search_bootstrap) do |schema_generator|
         index_schema(schema_generator)
       end
     end
diff --git a/lib/ontologies_linked_data/models/properties/object_property.rb b/lib/ontologies_linked_data/models/properties/object_property.rb
index 3b96216d..c1de8162 100644
--- a/lib/ontologies_linked_data/models/properties/object_property.rb
+++ b/lib/ontologies_linked_data/models/properties/object_property.rb
@@ -36,7 +36,7 @@ class ObjectProperty < LinkedData::Models::OntologyProperty
               LinkedData::Hypermedia::Link.new("descendants", lambda {|m| "#{self.ontology_link(m)}/properties/#{CGI.escape(m.id.to_s)}/descendants"}, self.uri_type),
               LinkedData::Hypermedia::Link.new("tree", lambda {|m| "#{self.ontology_link(m)}/properties/#{CGI.escape(m.id.to_s)}/tree"}, self.uri_type)
 
-      enable_indexing(:prop_search_core1, :property) do |schema_generator|
+      enable_indexing(:prop_search, :property, bootstrap_collection: :prop_search_bootstrap) do |schema_generator|
         index_schema(schema_generator)
       end
     end
diff --git a/lib/ontologies_linked_data/models/properties/ontology_property.rb b/lib/ontologies_linked_data/models/properties/ontology_property.rb
index 7aaa4f54..7d652537 100644
--- a/lib/ontologies_linked_data/models/properties/ontology_property.rb
+++ b/lib/ontologies_linked_data/models/properties/ontology_property.rb
@@ -26,7 +26,7 @@ def self.index_schema(schema_generator)
         end
       end
 
-      enable_indexing(:prop_search_core1, :property) do |schema_generator|
+      enable_indexing(:prop_search, :property, bootstrap_collection: :prop_search_bootstrap) do |schema_generator|
         index_schema(schema_generator)
       end
 
diff --git a/lib/ontologies_linked_data/models/provisional_class.rb b/lib/ontologies_linked_data/models/provisional_class.rb
index a40b936b..9d8c5503 100644
--- a/lib/ontologies_linked_data/models/provisional_class.rb
+++ b/lib/ontologies_linked_data/models/provisional_class.rb
@@ -40,7 +40,7 @@ class ProvisionalClass < LinkedData::Models::Base
                 end
               }, Goo.vocabulary["Ontology"])
 
-      enable_indexing(:term_search_core1) do |schema_generator|
+      enable_indexing(:term_search, :main, bootstrap_collection: :term_search_bootstrap) do |schema_generator|
         Class.index_schema(schema_generator)
       end