diff --git a/lib/puppet/indirector/hiera.rb b/lib/puppet/indirector/hiera.rb
index b36be061e..2e2905eb5 100644
--- a/lib/puppet/indirector/hiera.rb
+++ b/lib/puppet/indirector/hiera.rb
@@ -1,26 +1,26 @@
 require 'puppet/indirector/terminus'
 
 class Puppet::Indirector::Hiera < Puppet::Indirector::Terminus
   def initialize(*args)
     if ! Puppet.features.hiera?
-      raise "Hiera terminus not supported without hiera gem"
+      raise "Hiera terminus not supported without hiera library"
     end
     super
   end
 
   def find(request)
     facts = Puppet::Node::Facts.indirection.find(request.options[:host]).values
     hiera.lookup(request.key, nil, facts, nil, nil)
   end
 
   private
 
   def self.hiera
     @hiera || Hiera.new(:config => Puppet.settings[:hiera_config])
   end
 
   def hiera
     self.class.hiera
   end
 end
 
diff --git a/spec/unit/indirector/hiera_spec.rb b/spec/unit/indirector/hiera_spec.rb
index e7cd5f7ed..e114c31b4 100644
--- a/spec/unit/indirector/hiera_spec.rb
+++ b/spec/unit/indirector/hiera_spec.rb
@@ -1,94 +1,94 @@
 require 'spec_helper'
 require 'puppet/indirector/hiera'
 
 describe Puppet::Indirector::Hiera do
   include PuppetSpec::Files
 
   before do
     Puppet.settings[:hiera_config] = {}
     Puppet::Indirector::Terminus.stubs(:register_terminus_class)
     Puppet::Indirector::Indirection.stubs(:instance).returns(indirection)
 
     module Testing; end
     @hiera_class = class Testing::Hiera < Puppet::Indirector::Hiera
       self
     end
   end
 
   let(:model)   { mock('model') }
   let(:options) { {:host => 'foo' } }
 
   let(:request_integer) do
     stub('request', :key => "integer", :options => options)
   end
 
   let(:request_string) do
     stub('request', :key => "string", :options => options)
   end
 
   let(:request_array) do
     stub('request', :key => "array", :options => options)
   end
 
   let(:request_hash) do
     stub('request', :key => "hash", :options => options)
   end
 
   let(:indirection) do
     stub('indirection', :name => :none, :register_terminus_type => nil,
       :model => model)
   end
 
   let(:facts) do
     { 'fqdn' => 'agent.testing.com' }
   end
   let(:facter_obj) { stub(:values => facts) }
 
   it "should be the default data_binding terminus" do
     Puppet.settings[:data_binding_terminus].should == 'hiera'
   end
 
   it "should raise an error if we don't have the hiera feature" do
     Puppet.features.expects(:hiera?).returns(false)
     lambda { @hiera_class.new }.should raise_error RuntimeError,
-      "Hiera terminus not supported without hiera gem"
+      "Hiera terminus not supported without hiera library"
   end
 
   describe "the behavior of the find method", :if => Puppet.features.hiera? do
     before do
       Puppet.settings[:hiera_config] = {
         :yaml      => { :datadir => datadir },
         :hierarchy => ['global'],
         :logger    => 'noop'
       }
       Puppet::Node::Facts.indirection.expects(:find).with('foo').
         returns(facter_obj)
     end
 
     let(:datadir)     { my_fixture_dir }
     let(:data_binder) { @hiera_class.new }
 
     it "support looking up an integer" do
       data_binder.find(request_integer).should == 3000
     end
 
     it "should support looking up a string" do
       data_binder.find(request_string).should == 'apache'
     end
 
     it "should support looking up an array" do
       data_binder.find(request_array).should == [
         '0.ntp.puppetlabs.com',
         '1.ntp.puppetlabs.com',
       ]
     end
 
     it "should support looking up a hash" do
       data_binder.find(request_hash).should == {
         'user'  => 'Hightower',
         'group' => 'admin',
         'mode'  => '0644'
       }
     end
   end
 end