diff --git a/include/asterisk/stasis.h b/include/asterisk/stasis.h
index 5cc71f2e23..b63cd297a9 100644
--- a/include/asterisk/stasis.h
+++ b/include/asterisk/stasis.h
@@ -649,7 +649,7 @@ struct stasis_subscription *__stasis_subscribe(struct stasis_topic *topic,
 #define stasis_subscribe(topic, callback, data) __stasis_subscribe(topic, callback, data, __FILE__, __LINE__, __PRETTY_FUNCTION__)
 
 /*!
- * \brief Create a subscription whose callbacks occur on a thread pool
+ * \brief Create a subscription whose callbacks occur on a task pool
  *
  * In addition to being AO2 managed memory (requiring an ao2_cleanup() to free
  * up this reference), the subscription must be explicitly unsubscribed from its
@@ -659,7 +659,7 @@ struct stasis_subscription *__stasis_subscribe(struct stasis_topic *topic,
  * always happen on the same thread. The invocation order of different subscriptions
  * is unspecified.
  *
- * Unlike \ref stasis_subscribe, this function will explicitly use a threadpool to
+ * Unlike \ref stasis_subscribe, this function will explicitly use a taskpool to
  * dispatch items to its \c callback. This form of subscription should be used
  * when many subscriptions may be made to the specified \c topic.
  *
diff --git a/include/asterisk/stasis_internal.h b/include/asterisk/stasis_internal.h
index 678812e48e..b2a26c8cdc 100644
--- a/include/asterisk/stasis_internal.h
+++ b/include/asterisk/stasis_internal.h
@@ -54,7 +54,7 @@
  * \param needs_mailbox Determines whether or not the subscription requires a mailbox.
  *  Subscriptions with mailboxes will be delivered on some non-publisher thread;
  *  subscriptions without mailboxes will be delivered on the publisher thread.
- * \param use_thread_pool Use the thread pool for the subscription. This is only
+ * \param use_task_pool Use the task pool for the subscription. This is only
  *  relevant if \c needs_mailbox is non-zero.
  * \param file, lineno, func
  * \return New \ref stasis_subscription object.
@@ -66,7 +66,7 @@ struct stasis_subscription *internal_stasis_subscribe(
 	stasis_subscription_cb callback,
 	void *data,
 	int needs_mailbox,
-	int use_thread_pool,
+	int use_task_pool,
 	const char *file,
 	int lineno,
 	const char *func);
diff --git a/include/asterisk/stasis_message_router.h b/include/asterisk/stasis_message_router.h
index c0821b601c..b76be9b474 100644
--- a/include/asterisk/stasis_message_router.h
+++ b/include/asterisk/stasis_message_router.h
@@ -63,7 +63,7 @@ struct stasis_message_router *__stasis_message_router_create(
  * \brief Create a new message router object.
  *
  * The subscription created for this message router will dispatch
- * callbacks on a thread pool.
+ * callbacks on a task pool.
  *
  * \param topic Topic to subscribe route to.
  *
diff --git a/main/stasis_message_router.c b/main/stasis_message_router.c
index ff7472e334..ec35e4cc1b 100644
--- a/main/stasis_message_router.c
+++ b/main/stasis_message_router.c
@@ -203,7 +203,7 @@ static void router_dispatch(void *data,
 }
 
 static struct stasis_message_router *stasis_message_router_create_internal(
-	struct stasis_topic *topic, int use_thread_pool, const char *file, int lineno,
+	struct stasis_topic *topic, int use_task_pool, const char *file, int lineno,
 	const char *func)
 {
 	int res;
@@ -223,7 +223,7 @@ static struct stasis_message_router *stasis_message_router_create_internal(
 		return NULL;
 	}
 
-	if (use_thread_pool) {
+	if (use_task_pool) {
 		router->subscription = __stasis_subscribe_pool(topic, router_dispatch, router, file, lineno, func);
 	} else {
 		router->subscription = __stasis_subscribe(topic, router_dispatch, router, file, lineno, func);
diff --git a/tests/test_stasis.c b/tests/test_stasis.c
index 71026a6cce..2b8e1ea413 100644
--- a/tests/test_stasis.c
+++ b/tests/test_stasis.c
@@ -382,8 +382,8 @@ AST_TEST_DEFINE(subscription_pool_messages)
 	case TEST_INIT:
 		info->name = __func__;
 		info->category = test_category;
-		info->summary = "Test subscribe/unsubscribe messages using a threadpool subscription";
-		info->description = "Test subscribe/unsubscribe messages using a threadpool subscription";
+		info->summary = "Test subscribe/unsubscribe messages using a taskpool subscription";
+		info->description = "Test subscribe/unsubscribe messages using a taskpool subscription";
 		return AST_TEST_NOT_RUN;
 	case TEST_EXECUTE:
 		break;
@@ -530,10 +530,10 @@ AST_TEST_DEFINE(publish_pool)
 	case TEST_INIT:
 		info->name = __func__;
 		info->category = test_category;
-		info->summary = "Test publishing with a threadpool";
+		info->summary = "Test publishing with a taskpool";
 		info->description = "Test publishing to a subscriber whose\n"
 			"subscription dictates messages are received through a\n"
-			"threadpool.";
+			"taskpool.";
 		return AST_TEST_NOT_RUN;
 	case TEST_EXECUTE:
 		break;
@@ -793,7 +793,7 @@ AST_TEST_DEFINE(subscription_interleaving)
 			"and publishes messages alternately between the children.\n"
 			"It verifies that the messages are received in the expected\n"
 			"order, for different subscription types: one with a dedicated\n"
-			"thread, the other on the Stasis threadpool.";
+			"thread, the other on the Stasis taskpool.";
 		return AST_TEST_NOT_RUN;
 	case TEST_EXECUTE:
 		break;
@@ -1619,10 +1619,10 @@ AST_TEST_DEFINE(router_pool)
 	case TEST_INIT:
 		info->name = __func__;
 		info->category = test_category;
-		info->summary = "Test message routing via threadpool";
+		info->summary = "Test message routing via taskpool";
 		info->description = "Test simple message routing when\n"
 			"the subscriptions dictate usage of the Stasis\n"
-			"threadpool.";
+			"taskpool.";
 		return AST_TEST_NOT_RUN;
 	case TEST_EXECUTE:
 		break;