diff --git a/includes/init.php b/includes/init.php
index ecc6f84..746060c 100644
--- a/includes/init.php
+++ b/includes/init.php
@@ -20,7 +20,7 @@ add_action( 'user_register', function( $user_id ) {
 
 add_action( 'pterotype_init', function() {
     \pterotype\schema\run_migrations();
-    \pterotype\actors\pterotype\initialize_actors();
+    \pterotype\actors\initialize_actors();
     if ( ! empty( ob_get_contents() ) ) {
         \pterotype\util\log( 'init.log', ob_get_contents(), false );
     }
@@ -28,7 +28,7 @@ add_action( 'pterotype_init', function() {
 
 add_action( 'pterotype_load', function() {
     \pterotype\schema\run_migrations();
-    \pterotype\async\pterotype\init_tasks();
+    \pterotype\async\init_tasks();
 } );
 
 add_action( 'generate_rewrite_rules', '\pterotype\webfinger\generate_rewrite_rules', 111 );
diff --git a/includes/server/inbox.php b/includes/server/inbox.php
index 7fca103..c79c7e6 100644
--- a/includes/server/inbox.php
+++ b/includes/server/inbox.php
@@ -92,7 +92,7 @@ function forward_activity( $actor_slug, $activity ) {
     if ( count( $collections ) === 0 ) {
         return;
     }
-    \pterotype\deliver\pterotype\deliver_activity( $actor_slug, $activity );
+    \pterotype\deliver\deliver_activity( $actor_slug, $activity );
 }
 
 function references_local_object( $object, $depth ) {
diff --git a/includes/server/outbox.php b/includes/server/outbox.php
index 2134902..4d9280a 100644
--- a/includes/server/outbox.php
+++ b/includes/server/outbox.php
@@ -161,7 +161,7 @@ function get_outbox( $actor_slug ) {
 }
 
 function deliver_activity( $actor_slug, $activity ) {
-    \pterotype\deliver\pterotype\deliver_activity( $actor_slug, $activity );
+    \pterotype\deliver\deliver_activity( $actor_slug, $activity );
     $activity = \pterotype\objects\strip_private_fields( $activity );
     return $activity;
 }