diff --git a/lib/active_fedora/solr_query_builder.rb b/lib/active_fedora/solr_query_builder.rb
index b3c57eb5c..0dfca134b 100644
--- a/lib/active_fedora/solr_query_builder.rb
+++ b/lib/active_fedora/solr_query_builder.rb
@@ -1,5 +1,8 @@
 module ActiveFedora
   module SolrQueryBuilder
+
+    extend Deprecation
+
     class << self
       # Construct a solr query for a list of ids
       # This is used to get a solr response based on the list of ids in an object's RELS-EXT relationhsips
@@ -15,13 +18,13 @@ def construct_query_for_ids(id_array)
       # @param [String] key
       # @param [String] value
       def raw_query(key, value)
-        Deprecation.warn(ActiveFedora::Base, 'ActiveFedora::SolrQueryBuilder.raw_query is deprecated and will be removed in ActiveFedora 10.0. Use .construct_query instead.')
+        Deprecation.warn(ActiveFedora::SolrQueryBuilder, 'ActiveFedora::SolrQueryBuilder.raw_query is deprecated and will be removed in ActiveFedora 10.0. Use .construct_query instead.')
         "_query_:\"{!raw f=#{key}}#{value.gsub('"', '\"')}\""
       end
 
       # @deprecated
       def solr_name(*args)
-        Deprecation.warn(ActiveFedora::Base, 'ActiveFedora::SolrQueryBuilder.solr_name is deprecated and will be removed in ActiveFedora 10.0. Use ActiveFedora.index_field_mapper.solr_name instead.')
+        Deprecation.warn(ActiveFedora::SolrQueryBuilder, 'ActiveFedora::SolrQueryBuilder.solr_name is deprecated and will be removed in ActiveFedora 10.0. Use ActiveFedora.index_field_mapper.solr_name instead.')
         ActiveFedora.index_field_mapper.solr_name(*args)
       end
 
diff --git a/spec/unit/solr_query_builder_spec.rb b/spec/unit/solr_query_builder_spec.rb
index fd9cab872..41083a570 100644
--- a/spec/unit/solr_query_builder_spec.rb
+++ b/spec/unit/solr_query_builder_spec.rb
@@ -3,7 +3,7 @@
 describe ActiveFedora::SolrQueryBuilder do
   describe "raw_query" do
     it "generates a raw query clause" do
-      Deprecation.silence(ActiveFedora::Base) do
+      Deprecation.silence(described_class) do
         expect(described_class.raw_query('id', "my:_ID1_")).to eq '_query_:"{!raw f=id}my:_ID1_"'
       end
     end