diff --git a/include/spdk/scsi.h b/include/spdk/scsi.h
index 1fa99b772..c70059a9a 100644
--- a/include/spdk/scsi.h
+++ b/include/spdk/scsi.h
@@ -249,7 +249,7 @@ int spdk_scsi_port_construct(struct spdk_scsi_port *port, uint64_t id,
 
 void spdk_scsi_task_construct(struct spdk_scsi_task *task, uint32_t *owner_task_ctr,
 			      struct spdk_scsi_task *parent);
-void spdk_put_task(struct spdk_scsi_task *task);
+void spdk_scsi_task_put(struct spdk_scsi_task *task);
 void spdk_scsi_task_alloc_data(struct spdk_scsi_task *task, uint32_t alloc_len,
 			       uint8_t **data);
 int spdk_scsi_task_build_sense_data(struct spdk_scsi_task *task, int sk, int asc,
diff --git a/lib/iscsi/task.h b/lib/iscsi/task.h
index ac34a0eea..9dfd5939a 100644
--- a/lib/iscsi/task.h
+++ b/lib/iscsi/task.h
@@ -80,7 +80,7 @@ struct spdk_iscsi_task {
 static inline void
 spdk_iscsi_task_put(struct spdk_iscsi_task *task)
 {
-	spdk_put_task(&task->scsi);
+	spdk_scsi_task_put(&task->scsi);
 }
 
 static inline struct spdk_iscsi_pdu *
diff --git a/lib/scsi/task.c b/lib/scsi/task.c
index f2fdaa88f..c0e39cabb 100644
--- a/lib/scsi/task.c
+++ b/lib/scsi/task.c
@@ -39,7 +39,7 @@
 #include <rte_malloc.h>
 
 void
-spdk_put_task(struct spdk_scsi_task *task)
+spdk_scsi_task_put(struct spdk_scsi_task *task)
 {
 	if (!task) {
 		return;
@@ -51,7 +51,7 @@ spdk_put_task(struct spdk_scsi_task *task)
 		struct spdk_bdev_io *bdev_io = task->blockdev_io;
 
 		if (task->parent) {
-			spdk_put_task(task->parent);
+			spdk_scsi_task_put(task->parent);
 			task->parent = NULL;
 		}
 
diff --git a/test/lib/iscsi/common.c b/test/lib/iscsi/common.c
index 867614913..fa6ba9e34 100644
--- a/test/lib/iscsi/common.c
+++ b/test/lib/iscsi/common.c
@@ -19,7 +19,7 @@ spdk_iscsi_task_get(uint32_t *owner_task_ctr, struct spdk_iscsi_task *parent)
 }
 
 void
-spdk_put_task(struct spdk_scsi_task *task)
+spdk_scsi_task_put(struct spdk_scsi_task *task)
 {
 	free(task);
 }
diff --git a/test/lib/scsi/dev/dev_ut.c b/test/lib/scsi/dev/dev_ut.c
index fe8c086bb..8029d093f 100644
--- a/test/lib/scsi/dev/dev_ut.c
+++ b/test/lib/scsi/dev/dev_ut.c
@@ -67,7 +67,7 @@ spdk_get_task(uint32_t *owner_task_ctr)
 }
 
 void
-spdk_put_task(struct spdk_scsi_task *task)
+spdk_scsi_task_put(struct spdk_scsi_task *task)
 {
 	g_task_count--;
 
@@ -250,7 +250,7 @@ dev_queue_mgmt_task_success(void)
 
 	spdk_scsi_dev_queue_mgmt_task(dev, task);
 
-	spdk_put_task(task);
+	spdk_scsi_task_put(task);
 
 	spdk_scsi_dev_destruct(dev);
 }
@@ -272,7 +272,7 @@ dev_queue_task_success(void)
 
 	spdk_scsi_dev_queue_task(dev, task);
 
-	spdk_put_task(task);
+	spdk_scsi_task_put(task);
 
 	spdk_scsi_dev_destruct(dev);
 }
@@ -293,8 +293,8 @@ dev_stop_success(void)
 	/* Enqueue the tasks into dev->task_mgmt_submit_queue*/
 	spdk_scsi_dev_queue_mgmt_task(&dev, task_mgmt);
 
-	spdk_put_task(task);
-	spdk_put_task(task_mgmt);
+	spdk_scsi_task_put(task);
+	spdk_scsi_task_put(task_mgmt);
 }
 
 static void
diff --git a/test/lib/scsi/lun/lun_ut.c b/test/lib/scsi/lun/lun_ut.c
index 8b8030263..04371f662 100644
--- a/test/lib/scsi/lun/lun_ut.c
+++ b/test/lib/scsi/lun/lun_ut.c
@@ -73,7 +73,7 @@ spdk_get_task(uint32_t *owner_task_ctr)
 }
 
 void
-spdk_put_task(struct spdk_scsi_task *task)
+spdk_scsi_task_put(struct spdk_scsi_task *task)
 {
 	g_task_count--;
 
@@ -205,7 +205,7 @@ lun_task_mgmt_execute_abort_task_null_lun_failure(void)
 
 	rc = spdk_scsi_lun_task_mgmt_execute(mgmt_task);
 
-	spdk_put_task(mgmt_task);
+	spdk_scsi_task_put(mgmt_task);
 
 	/* returns -1 since we passed NULL for LUN */
 	CU_ASSERT_TRUE(rc < 0);
@@ -255,8 +255,8 @@ lun_task_mgmt_execute_abort_task_not_supported(void)
 	CU_ASSERT_TRUE(rc < 0);
 	CU_ASSERT(mgmt_task->response == SPDK_SCSI_TASK_MGMT_RESP_REJECT_FUNC_NOT_SUPPORTED);
 
-	spdk_put_task(mgmt_task);
-	spdk_put_task(task);
+	spdk_scsi_task_put(mgmt_task);
+	spdk_scsi_task_put(task);
 
 	lun_destruct(lun);
 
@@ -280,7 +280,7 @@ lun_task_mgmt_execute_abort_task_all_null_lun_failure(void)
 	/* Returns -1 since we passed NULL for lun */
 	CU_ASSERT_TRUE(rc < 0);
 
-	spdk_put_task(mgmt_task);
+	spdk_scsi_task_put(mgmt_task);
 
 	CU_ASSERT_EQUAL(g_task_count, 0);
 }
@@ -326,8 +326,8 @@ lun_task_mgmt_execute_abort_task_all_not_supported(void)
 	CU_ASSERT_TRUE(rc < 0);
 	CU_ASSERT(mgmt_task->response == SPDK_SCSI_TASK_MGMT_RESP_REJECT_FUNC_NOT_SUPPORTED);
 
-	spdk_put_task(mgmt_task);
-	spdk_put_task(task);
+	spdk_scsi_task_put(mgmt_task);
+	spdk_scsi_task_put(task);
 
 	lun_destruct(lun);
 
@@ -349,7 +349,7 @@ lun_task_mgmt_execute_lun_reset_failure(void)
 	/* Returns -1 since we passed NULL for lun */
 	CU_ASSERT_TRUE(rc < 0);
 
-	spdk_put_task(mgmt_task);
+	spdk_scsi_task_put(mgmt_task);
 
 	CU_ASSERT_EQUAL(g_task_count, 0);
 }
@@ -374,7 +374,7 @@ lun_task_mgmt_execute_lun_reset(void)
 	/* Returns success */
 	CU_ASSERT_EQUAL(rc, 0);
 
-	spdk_put_task(mgmt_task);
+	spdk_scsi_task_put(mgmt_task);
 
 	lun_destruct(lun);
 
@@ -401,7 +401,7 @@ lun_task_mgmt_execute_invalid_case(void)
 	/* Returns -1 on passing an invalid value to the switch case */
 	CU_ASSERT_TRUE(rc < 0);
 
-	spdk_put_task(mgmt_task);
+	spdk_scsi_task_put(mgmt_task);
 
 	lun_destruct(lun);
 
@@ -427,7 +427,7 @@ lun_append_task_null_lun_task_cdb_spc_inquiry(void)
 
 	CU_ASSERT_EQUAL(task->status, SPDK_SCSI_STATUS_GOOD);
 
-	spdk_put_task(task);
+	spdk_scsi_task_put(task);
 
 	CU_ASSERT_EQUAL(g_task_count, 0);
 }
@@ -452,7 +452,7 @@ lun_append_task_null_lun_alloc_len_lt_4096(void)
 
 	CU_ASSERT_EQUAL(task->status, SPDK_SCSI_STATUS_GOOD);
 
-	spdk_put_task(task);
+	spdk_scsi_task_put(task);
 
 	CU_ASSERT_EQUAL(g_task_count, 0);
 }
@@ -473,7 +473,7 @@ lun_append_task_null_lun_not_supported(void)
 	/* LUN not supported; task's data transferred should be 0 */
 	CU_ASSERT_EQUAL(task->data_transferred, 0);
 
-	spdk_put_task(task);
+	spdk_scsi_task_put(task);
 
 	CU_ASSERT_EQUAL(g_task_count, 0);
 }
@@ -511,7 +511,7 @@ lun_execute_task_set_full(void)
 	CU_ASSERT(TAILQ_EMPTY(&lun->tasks));
 	CU_ASSERT(task->status == SPDK_SCSI_STATUS_TASK_SET_FULL);
 
-	spdk_put_task(task);
+	spdk_scsi_task_put(task);
 
 	lun_destruct(lun);
 
@@ -550,7 +550,7 @@ lun_execute_scsi_task_pending(void)
 	/* Assert the task has been successfully added to the tasks queue */
 	CU_ASSERT(!TAILQ_EMPTY(&lun->tasks));
 
-	spdk_put_task(task);
+	spdk_scsi_task_put(task);
 
 	lun_destruct(lun);
 
@@ -589,7 +589,7 @@ lun_execute_scsi_task_complete(void)
 	/* Assert the task has not been added to the tasks queue */
 	CU_ASSERT(TAILQ_EMPTY(&lun->tasks));
 
-	spdk_put_task(task);
+	spdk_scsi_task_put(task);
 
 	lun_destruct(lun);