diff --git a/classes/api.php b/classes/api.php
index da164aca1..c43a78ebe 100644
--- a/classes/api.php
+++ b/classes/api.php
@@ -308,7 +308,7 @@ class API extends Handler {
 						"/public.php?op=rss&id=-2&key=" .
 						get_feed_access_key(-2, false);
 
-					$p = new Publisher(PUBSUBHUBBUB_HUB);
+					$p = new pubsubhubbub\publisher\Publisher(PUBSUBHUBBUB_HUB);
 					$pubsub_result = $p->publish_update($rss_link);
 				}
 			}
diff --git a/classes/rpc.php b/classes/rpc.php
index 9eb8dbd70..2a92eadbd 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -281,7 +281,7 @@ class RPC extends Handler_Protected {
 				"/public.php?op=rss&id=-2&key=" .
 				get_feed_access_key(-2, false);
 
-			$p = new Publisher(PUBSUBHUBBUB_HUB);
+			$p = new pubsubhubbub\publisher\Publisher(PUBSUBHUBBUB_HUB);
 
 			$pubsub_result = $p->publish_update($rss_link);
 		}
@@ -624,7 +624,7 @@ class RPC extends Handler_Protected {
 				"/public.php?op=rss&id=-2&key=" .
 				get_feed_access_key(-2, false);
 
-			$p = new Publisher(PUBSUBHUBBUB_HUB);
+			$p = new pubsubhubbub\publisher\Publisher(PUBSUBHUBBUB_HUB);
 
 			/* $pubsub_result = */ $p->publish_update($rss_link);
 		}
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index fbb26ef90..fd4a10f13 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -600,7 +600,7 @@
 					$callback_url = get_self_url_prefix() .
 						"/public.php?op=pubsub&id=$feed";
 
-					$s = new Subscriber($feed_hub_url, $callback_url);
+					$s = new Pubsubhubbub\Subscriber\Subscriber($feed_hub_url, $callback_url);
 
 					$rc = $s->subscribe($feed_self_url);
 
@@ -999,7 +999,7 @@
 								"/public.php?op=rss&id=-2&key=" .
 								get_feed_access_key(-2, false, $owner_uid);
 
-							$p = new Publisher(PUBSUBHUBBUB_HUB);
+							$p = new pubsubhubbub\publisher\Publisher(PUBSUBHUBBUB_HUB);
 
 							/* $pubsub_result = */ $p->publish_update($rss_link);
 						}