2 files changed, 13 insertions, 13 deletions
diff --git a/test/client/pelement.rb b/test/client/resource.rb
index 8c8e76963..51fe7ba7e 100755
--- a/test/client/pelement.rb
+++ b/test/client/resource.rb
@@ -3,19 +3,19 @@
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
-require 'puppet/client/pelement'
+require 'puppet/client/resource'
 require 'puppet/server'
 require 'puppettest'
 
 # $Id$
 
-class TestPElementClient < Test::Unit::TestCase
+class TestResourceClient < Test::Unit::TestCase
     include PuppetTest::ServerTest
 
-    def mkpelementserver
+    def mkresourceserver
         handlers = {
             :CA => {}, # so that certs autogenerate
-            :PElement => {},
+            :Resource => {},
         }
 
         return mkserver(handlers)
@@ -24,19 +24,19 @@ class TestPElementClient < Test::Unit::TestCase
     def mkclient
         client = nil
         assert_nothing_raised {
-            client = Puppet::Client::PElement.new(:Server => "localhost",
+            client = Puppet::Client::Resource.new(:Server => "localhost",
                 :Port => @@port)
         }
 
         return client
     end
 
-    def test_pelements
+    def test_resources
         file = tempfile()
         text = "yayness\n"
         File.open(file, "w") { |f| f.print text }
 
-        mkpelementserver()
+        mkresourceserver()
 
         client = mkclient()
 
diff --git a/test/server/pelement.rb b/test/server/resource.rb
index c86dadc11..218b65f74 100755
--- a/test/server/pelement.rb
+++ b/test/server/resource.rb
@@ -3,12 +3,12 @@
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
-require 'puppet/server/pelement'
+require 'puppet/server/resource'
 require 'puppettest'
 require 'base64'
 require 'cgi'
 
-class TestPElementServer < Test::Unit::TestCase
+class TestResourceServer < Test::Unit::TestCase
     include PuppetTest::ServerTest
 
     def verify_described(type, described)
@@ -39,7 +39,7 @@ class TestPElementServer < Test::Unit::TestCase
         server = nil
 
         assert_nothing_raised do
-            server = Puppet::Server::PElement.new()
+            server = Puppet::Server::Resource.new()
         end
 
         # The first run we create the file on the copy, the second run
@@ -119,7 +119,7 @@ class TestPElementServer < Test::Unit::TestCase
         server = nil
 
         assert_nothing_raised do
-            server = Puppet::Server::PElement.new()
+            server = Puppet::Server::Resource.new()
         end
 
         [   [nil],
@@ -177,7 +177,7 @@ class TestPElementServer < Test::Unit::TestCase
         #Puppet.err Puppet::Type::ParsedType::Port.path
         server = nil
         assert_nothing_raised do
-            server = Puppet::Server::PElement.new()
+            server = Puppet::Server::Resource.new()
         end
 
         require 'etc'
@@ -239,7 +239,7 @@ class TestPElementServer < Test::Unit::TestCase
     def test_apply
         server = nil
         assert_nothing_raised do
-            server = Puppet::Server::PElement.new()
+            server = Puppet::Server::Resource.new()
         end
 
         file = tempfile()