7 files changed, 21 insertions, 16 deletions
diff --git a/lib/puppet/file_serving/content.rb b/lib/puppet/file_serving/content.rb
index 53e52cd2d..38ca80fb0 100644
--- a/lib/puppet/file_serving/content.rb
+++ b/lib/puppet/file_serving/content.rb
@@ -11,7 +11,7 @@ require 'puppet/file_serving/terminus_selector'
 # asked for.
 class Puppet::FileServing::Content
     extend Puppet::Indirector
-    indirects :file_content, :terminus_class => :file, :extend => Puppet::FileServing::TerminusSelector
+    indirects :file_content, :extend => Puppet::FileServing::TerminusSelector
 
     attr_reader :path
 
diff --git a/lib/puppet/file_serving/metadata.rb b/lib/puppet/file_serving/metadata.rb
index 29a395c6a..73e1f53d4 100644
--- a/lib/puppet/file_serving/metadata.rb
+++ b/lib/puppet/file_serving/metadata.rb
@@ -6,13 +6,14 @@ require 'puppet'
 require 'puppet/indirector'
 require 'puppet/file_serving'
 require 'puppet/util/checksums'
+require 'puppet/file_serving/terminus_selector'
 
 # A class that handles retrieving file metadata.
 class Puppet::FileServing::Metadata
     include Puppet::Util::Checksums
 
     extend Puppet::Indirector
-    indirects :file_metadata, :terminus_class => :ral
+    indirects :file_metadata, :extend => Puppet::FileServing::TerminusSelector
 
     attr_reader :path, :owner, :group, :mode, :checksum_type, :checksum
 
diff --git a/lib/puppet/indirector/file_content/local.rb b/lib/puppet/indirector/file_content/local.rb
index bb9dc6998..34d1c7794 100644
--- a/lib/puppet/indirector/file_content/local.rb
+++ b/lib/puppet/indirector/file_content/local.rb
@@ -6,7 +6,7 @@ require 'puppet/file_serving/content'
 require 'puppet/indirector/file_content'
 require 'puppet/indirector/file'
 
-class Puppet::Indirector::FileContent::File < Puppet::Indirector::File
+class Puppet::Indirector::FileContent::Local < Puppet::Indirector::File
     desc "Retrieve file contents from disk."
 
     def find(path)
diff --git a/lib/puppet/indirector/file_metadata/local.rb b/lib/puppet/indirector/file_metadata/local.rb
index 5777b1774..f6cfa1f1c 100644
--- a/lib/puppet/indirector/file_metadata/local.rb
+++ b/lib/puppet/indirector/file_metadata/local.rb
@@ -6,7 +6,7 @@ require 'puppet/file_serving/metadata'
 require 'puppet/indirector/file_metadata'
 require 'puppet/indirector/code'
 
-class Puppet::Indirector::FileMetadata::Ral < Puppet::Indirector::Code
+class Puppet::Indirector::FileMetadata::Local < Puppet::Indirector::Code
     desc "Retrieve file metadata using Puppet's Resource Abstraction Layer.
         Returns everything about the file except its content."
 
diff --git a/spec/unit/file_serving/metadata.rb b/spec/unit/file_serving/metadata.rb
index c93465a45..f54a6feb6 100755
--- a/spec/unit/file_serving/metadata.rb
+++ b/spec/unit/file_serving/metadata.rb
@@ -8,6 +8,10 @@ describe Puppet::FileServing::Metadata do
     it "should indirect file_metadata" do
         Puppet::FileServing::Metadata.indirection.name.should == :file_metadata
     end
+
+    it "should should include the TerminusSelector module in its indirection" do
+        Puppet::FileServing::Metadata.indirection.metaclass.included_modules.should include(Puppet::FileServing::TerminusSelector)
+    end
 end
 
 describe Puppet::FileServing::Metadata, " when initializing" do
diff --git a/spec/unit/indirector/file_content/local.rb b/spec/unit/indirector/file_content/local.rb
index 08f66acb6..81ebd8ed0 100755
--- a/spec/unit/indirector/file_content/local.rb
+++ b/spec/unit/indirector/file_content/local.rb
@@ -5,25 +5,25 @@
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-require 'puppet/indirector/file_content/file'
+require 'puppet/indirector/file_content/local'
 
-describe Puppet::Indirector::FileContent::File do
+describe Puppet::Indirector::FileContent::Local do
     it "should be registered with the file_content indirection" do
-        Puppet::Indirector::Terminus.terminus_class(:file_content, :file).should equal(Puppet::Indirector::FileContent::File)
+        Puppet::Indirector::Terminus.terminus_class(:file_content, :local).should equal(Puppet::Indirector::FileContent::Local)
     end
 
     it "should be a subclass of the File terminus" do
-        Puppet::Indirector::FileContent::File.superclass.should equal(Puppet::Indirector::File)
+        Puppet::Indirector::FileContent::Local.superclass.should equal(Puppet::Indirector::File)
     end
 end
 
-describe Puppet::Indirector::FileContent::File, "when finding a single file" do
+describe Puppet::Indirector::FileContent::Local, "when finding a single local" do
     before do
-        @content = Puppet::Indirector::FileContent::File.new
-        @path = "/my/file"
+        @content = Puppet::Indirector::FileContent::Local.new
+        @path = "/my/local"
     end
 
-    it "should return nil if the file does not exist"
+    it "should return nil if the local does not exist"
 
-    it "should return a Content instance with the path set to the file if the file exists"
+    it "should return a Content instance with the path set to the local if the local exists"
 end
diff --git a/spec/unit/indirector/file_metadata/local.rb b/spec/unit/indirector/file_metadata/local.rb
index 0b0219980..26837b911 100755
--- a/spec/unit/indirector/file_metadata/local.rb
+++ b/spec/unit/indirector/file_metadata/local.rb
@@ -5,10 +5,10 @@
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-require 'puppet/indirector/file_metadata/ral'
+require 'puppet/indirector/file_metadata/local'
 
-describe Puppet::Indirector::FileMetadata::Ral do
+describe Puppet::Indirector::FileMetadata::Local do
     it "should be registered with the file_metadata indirection" do
-        Puppet::Indirector::Terminus.terminus_class(:file_metadata, :ral).should equal(Puppet::Indirector::FileMetadata::Ral)
+        Puppet::Indirector::Terminus.terminus_class(:file_metadata, :local).should equal(Puppet::Indirector::FileMetadata::Local)
     end
 end