diff --git a/webtools/PLIF/PLIF/Controller.pm b/webtools/PLIF/PLIF/Controller.pm
index 5ff82dabf300..5bdeb16b5c1d 100644
--- a/webtools/PLIF/PLIF/Controller.pm
+++ b/webtools/PLIF/PLIF/Controller.pm
@@ -141,9 +141,9 @@ sub getObject {
     # constructor call
     my $self = shift;
     my($name) = @_;
-    foreach my $service (@{$self->objects}) {
-        if ($service->objectProvides($name)) {
-            return $service;
+    foreach my $object (@{$self->objects}) {
+        if ($object->objectProvides($name)) {
+            return $object;
         }
     }
     return undef;
@@ -173,13 +173,13 @@ sub getObjectList {
     # constructor call
     my $self = shift;
     my($name) = @_;
-    my @services = ();
-    foreach my $service (@{$self->objects}) {
-        if ($service->objectProvides($name)) {
-            push(@services, $service);
+    my @objects = ();
+    foreach my $object (@{$self->objects}) {
+        if ($object->objectProvides($name)) {
+            push(@objects, $object);
         }
     }
-    return @services;
+    return @objects;
 }
 
 sub getCollectingServiceList {
diff --git a/webtools/PLIF/PLIF/ProtocolHelper/Logout/HTTP.pm b/webtools/PLIF/PLIF/ProtocolHelper/Logout/HTTP.pm
index 9e4a83b668da..5d25c00fc644 100644
--- a/webtools/PLIF/PLIF/ProtocolHelper/Logout/HTTP.pm
+++ b/webtools/PLIF/PLIF/ProtocolHelper/Logout/HTTP.pm
@@ -45,10 +45,10 @@ sub provides {
 }
 
 sub objectProvides {
-    my $class = shift;
+    my $self = shift;
     my($service) = @_;
     return ($service eq 'user.login.loggedOutUserHandle.http' or
-            $class->SUPER::provides($service));
+            $self->SUPER::provides($service));
 }
 
 sub objectInit {
diff --git a/webtools/PLIF/PLIF/Service.pm b/webtools/PLIF/PLIF/Service.pm
index 0f69e0b85862..f2fb8fedcf71 100644
--- a/webtools/PLIF/PLIF/Service.pm
+++ b/webtools/PLIF/PLIF/Service.pm
@@ -37,10 +37,10 @@ use PLIF;
 sub provides { return 0; } # stub
 
 # what services the module provides as an object
-sub objectProvides { 
-    my $class = shift;
-    return $class->provides(@_);
-} 
+sub objectProvides {
+    my $self = shift;
+    return $self->provides(@_);
+}
 
 sub dispatch {
     my $self = shift;
diff --git a/webtools/PLIF/PLIF/Service/Components/AdminCommands.pm b/webtools/PLIF/PLIF/Service/Components/AdminCommands.pm
index b5a84bc55587..86cc1561e8ca 100644
--- a/webtools/PLIF/PLIF/Service/Components/AdminCommands.pm
+++ b/webtools/PLIF/PLIF/Service/Components/AdminCommands.pm
@@ -52,10 +52,10 @@ sub provides {
 }
 
 sub objectProvides {
-    my $class = shift;
+    my $self = shift;
     my($service) = @_;
     return ($service eq 'dispatcher.commands' or 
-            $class->SUPER::objectProvides($service));
+            $self->SUPER::objectProvides($service));
 }
 
 # input.verify
diff --git a/webtools/PLIF/PLIF/Service/Session.pm b/webtools/PLIF/PLIF/Service/Session.pm
index 63938d165fa8..6116a9746750 100644
--- a/webtools/PLIF/PLIF/Service/Session.pm
+++ b/webtools/PLIF/PLIF/Service/Session.pm
@@ -34,9 +34,9 @@ use PLIF::Service;
 1;
 
 sub objectProvides {
-    my $class = shift;
+    my $self = shift;
     my($service) = @_;
-    return ($service eq 'session' or $class->SUPER::provides($service));
+    return ($service eq 'session' or $self->SUPER::provides($service));
 }
 
 sub objectInit {