7 files changed, 32 insertions, 32 deletions
diff --git a/lib/puppet/file_serving/terminus_selector.rb b/lib/puppet/file_serving/terminus_selector.rb
index aa08f087e..06b53ddb1 100644
--- a/lib/puppet/file_serving/terminus_selector.rb
+++ b/lib/puppet/file_serving/terminus_selector.rb
@@ -9,11 +9,11 @@ require 'puppet/file_serving'
 # in file-serving indirections.  This is necessary because
 # the terminus varies based on the URI asked for.
 module Puppet::FileServing::TerminusSelector
-    PROTOCOL_MAP = {"puppet" => :rest, "file" => :local, "puppetmounts" => :file_server}
+    PROTOCOL_MAP = {"puppet" => :rest, "file" => :file, "puppetmounts" => :file_server}
 
     # Pick an appropriate terminus based on the protocol.
     def select_terminus(full_uri, options = {})
-        # Short-circuit to :local if it's a fully-qualified path.
+        # Short-circuit to :file if it's a fully-qualified path.
         return PROTOCOL_MAP["file"] if full_uri =~ /^#{::File::SEPARATOR}/
         begin
             uri = URI.parse(URI.escape(full_uri))
diff --git a/lib/puppet/indirector/file_content/local.rb b/lib/puppet/indirector/file_content/file.rb
index a9c45d59e..4503a7919 100644
--- a/lib/puppet/indirector/file_content/local.rb
+++ b/lib/puppet/indirector/file_content/file.rb
@@ -8,7 +8,7 @@ require 'puppet/util/uri_helper'
 require 'puppet/indirector/file_content'
 require 'puppet/indirector/file'
 
-class Puppet::Indirector::FileContent::Local < Puppet::Indirector::File
+class Puppet::Indirector::FileContent::File < Puppet::Indirector::File
     desc "Retrieve file contents from disk."
 
     include Puppet::Util::URIHelper
diff --git a/lib/puppet/indirector/file_metadata/local.rb b/lib/puppet/indirector/file_metadata/file.rb
index d696bc769..823c26c36 100644
--- a/lib/puppet/indirector/file_metadata/local.rb
+++ b/lib/puppet/indirector/file_metadata/file.rb
@@ -8,7 +8,7 @@ require 'puppet/indirector/file_metadata'
 require 'puppet/util/uri_helper'
 require 'puppet/indirector/code'
 
-class Puppet::Indirector::FileMetadata::Local < Puppet::Indirector::Code
+class Puppet::Indirector::FileMetadata::File < Puppet::Indirector::Code
     desc "Retrieve file metadata directly from the local filesystem."
 
     include Puppet::Util::URIHelper
diff --git a/spec/lib/shared_behaviours/file_serving.rb b/spec/lib/shared_behaviours/file_serving.rb
index b0aa14fc0..6eaec6850 100644
--- a/spec/lib/shared_behaviours/file_serving.rb
+++ b/spec/lib/shared_behaviours/file_serving.rb
@@ -36,15 +36,15 @@ describe "Puppet::FileServing::Files", :shared => true do
         @test_class.find(uri)
     end
 
-    it "should use the local terminus when the 'file' URI scheme is used" do
+    it "should use the file terminus when the 'file' URI scheme is used" do
         uri = "file:///mymod/my/file"
-        @indirection.terminus(:local).expects(:find).with(uri)
+        @indirection.terminus(:file).expects(:find).with(uri)
         @test_class.find(uri)
     end
 
-    it "should use the local terminus when a fully qualified path is provided" do
+    it "should use the file terminus when a fully qualified path is provided" do
         uri = "/mymod/my/file"
-        @indirection.terminus(:local).expects(:find).with(uri)
+        @indirection.terminus(:file).expects(:find).with(uri)
         @test_class.find(uri)
     end
 end
diff --git a/spec/unit/file_serving/terminus_selector.rb b/spec/unit/file_serving/terminus_selector.rb
index 046f71bdc..9c2c01bfd 100755
--- a/spec/unit/file_serving/terminus_selector.rb
+++ b/spec/unit/file_serving/terminus_selector.rb
@@ -65,17 +65,17 @@ describe Puppet::FileServing::TerminusSelector, " when being used to select term
         @object.select_terminus("puppet:///module/file").should == :rest
     end
 
-    it "should choose :local when the protocol is 'file'" do
-        @object.select_terminus("file://host/module/file").should == :local
+    it "should choose :file when the protocol is 'file'" do
+        @object.select_terminus("file://host/module/file").should == :file
     end
 
-    it "should choose :local when the URI is a normal path name" do
-        @object.select_terminus("/module/file").should == :local
+    it "should choose :file when the URI is a normal path name" do
+        @object.select_terminus("/module/file").should == :file
     end
 
-    # This is so that we only choose modules over mounts, not local
-    it "should choose :local when the protocol is 'file' and the fully qualified path starts with '/modules'" do
-        @object.select_terminus("file://host/modules/file").should == :local
+    # This is so that we only choose modules over mounts, not file
+    it "should choose :file when the protocol is 'file' and the fully qualified path starts with '/modules'" do
+        @object.select_terminus("file://host/modules/file").should == :file
     end
 
     it "should fail when a protocol other than :puppet, :file, or :puppetmounts is used" do
diff --git a/spec/unit/indirector/file_content/local.rb b/spec/unit/indirector/file_content/file.rb
index 442667518..da2c90770 100755
--- a/spec/unit/indirector/file_content/local.rb
+++ b/spec/unit/indirector/file_content/file.rb
@@ -5,21 +5,21 @@
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-require 'puppet/indirector/file_content/local'
+require 'puppet/indirector/file_content/file'
 
-describe Puppet::Indirector::FileContent::Local do
+describe Puppet::Indirector::FileContent::File do
     it "should be registered with the file_content indirection" do
-        Puppet::Indirector::Terminus.terminus_class(:file_content, :local).should equal(Puppet::Indirector::FileContent::Local)
+        Puppet::Indirector::Terminus.terminus_class(:file_content, :file).should equal(Puppet::Indirector::FileContent::File)
     end
 
     it "should be a subclass of the File terminus" do
-        Puppet::Indirector::FileContent::Local.superclass.should equal(Puppet::Indirector::File)
+        Puppet::Indirector::FileContent::File.superclass.should equal(Puppet::Indirector::File)
     end
 end
 
-describe Puppet::Indirector::FileContent::Local, "when finding a single file" do
+describe Puppet::Indirector::FileContent::File, "when finding a single file" do
     it "should return a Content instance created with the full path to the file if the file exists" do
-        @content = Puppet::Indirector::FileContent::Local.new
+        @content = Puppet::Indirector::FileContent::File.new
         @uri = "file:///my/local"
 
         FileTest.expects(:exists?).with("/my/local").returns true
@@ -28,7 +28,7 @@ describe Puppet::Indirector::FileContent::Local, "when finding a single file" do
     end
 
     it "should pass the :links setting on to the created Content instance if the file exists" do
-        @content = Puppet::Indirector::FileContent::Local.new
+        @content = Puppet::Indirector::FileContent::File.new
         @uri = "file:///my/local"
 
         FileTest.expects(:exists?).with("/my/local").returns true
@@ -37,7 +37,7 @@ describe Puppet::Indirector::FileContent::Local, "when finding a single file" do
     end
 
     it "should return nil if the file does not exist" do
-        @content = Puppet::Indirector::FileContent::Local.new
+        @content = Puppet::Indirector::FileContent::File.new
         @uri = "file:///my/local"
 
         FileTest.expects(:exists?).with("/my/local").returns false
@@ -45,9 +45,9 @@ describe Puppet::Indirector::FileContent::Local, "when finding a single file" do
     end
 end
 
-describe Puppet::Indirector::FileContent::Local, "when searching for multiple files" do
+describe Puppet::Indirector::FileContent::File, "when searching for multiple files" do
     before do
-        @content = Puppet::Indirector::FileContent::Local.new
+        @content = Puppet::Indirector::FileContent::File.new
         @uri = "file:///my/local"
     end
 
diff --git a/spec/unit/indirector/file_metadata/local.rb b/spec/unit/indirector/file_metadata/file.rb
index 289aee449..c88d559a7 100755
--- a/spec/unit/indirector/file_metadata/local.rb
+++ b/spec/unit/indirector/file_metadata/file.rb
@@ -5,17 +5,17 @@
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-require 'puppet/indirector/file_metadata/local'
+require 'puppet/indirector/file_metadata/file'
 
-describe Puppet::Indirector::FileMetadata::Local do
+describe Puppet::Indirector::FileMetadata::File do
     it "should be registered with the file_metadata indirection" do
-        Puppet::Indirector::Terminus.terminus_class(:file_metadata, :local).should equal(Puppet::Indirector::FileMetadata::Local)
+        Puppet::Indirector::Terminus.terminus_class(:file_metadata, :file).should equal(Puppet::Indirector::FileMetadata::File)
     end
 end
 
-describe Puppet::Indirector::FileMetadata::Local, "when finding a single file" do
+describe Puppet::Indirector::FileMetadata::File, "when finding a single file" do
     before do
-        @metadata = Puppet::Indirector::FileMetadata::Local.new
+        @metadata = Puppet::Indirector::FileMetadata::File.new
         @uri = "file:///my/local"
 
         @data = mock 'metadata'
@@ -51,9 +51,9 @@ describe Puppet::Indirector::FileMetadata::Local, "when finding a single file" d
     end
 end
 
-describe Puppet::Indirector::FileMetadata::Local, "when searching for multiple files" do
+describe Puppet::Indirector::FileMetadata::File, "when searching for multiple files" do
     before do
-        @metadata = Puppet::Indirector::FileMetadata::Local.new
+        @metadata = Puppet::Indirector::FileMetadata::File.new
         @uri = "file:///my/local"
     end