diff --git a/etc/proxy-server.conf-sample b/etc/proxy-server.conf-sample
index 04fb01fa68..4ae7596392 100644
--- a/etc/proxy-server.conf-sample
+++ b/etc/proxy-server.conf-sample
@@ -8,9 +8,9 @@
 # key_file = /etc/swift/proxy.key
 
 [pipeline:main]
-pipeline = healthcheck cache auth proxy
+pipeline = healthcheck cache auth proxy-server
 
-[app:proxy]
+[app:proxy-server]
 use = egg:swift#proxy
 # log_name = proxy-server
 # log_facility = LOG_LOCAL0
diff --git a/swift/account/reaper.py b/swift/account/reaper.py
index d93b363719..02f1ab76ad 100644
--- a/swift/account/reaper.py
+++ b/swift/account/reaper.py
@@ -107,7 +107,7 @@ class AccountReaper(Daemon):
         sleep(random.random() * self.interval)
         while True:
             begin = time()
-            self.reap_once()
+            self.run_once()
             elapsed = time() - begin
             if elapsed < self.interval:
                 sleep(self.interval - elapsed)
@@ -116,7 +116,7 @@ class AccountReaper(Daemon):
         """
         Main entry point when running the reaper in 'once' mode, where it will
         do a single pass over all accounts on the server. This is called
-        repeatedly by :func:`reap_forever`. This will call :func:`reap_device`
+        repeatedly by :func:`run_forever`. This will call :func:`reap_device`
         once for each device on the server.
         """
         self.logger.debug('Begin devices pass: %s' % self.devices)
diff --git a/swift/common/db_replicator.py b/swift/common/db_replicator.py
index c777930fce..81396d1f8f 100644
--- a/swift/common/db_replicator.py
+++ b/swift/common/db_replicator.py
@@ -432,7 +432,7 @@ class Replicator(Daemon):
         """
         while True:
             try:
-                self.replicate_once()
+                self.run_once()
             except:
                 self.logger.exception('ERROR trying to replicate')
             sleep(self.run_pause)