diff --git a/app/nvmf_tgt/conf.c b/app/nvmf_tgt/conf.c
index d24804304..7f5169711 100644
--- a/app/nvmf_tgt/conf.c
+++ b/app/nvmf_tgt/conf.c
@@ -617,7 +617,7 @@ spdk_nvmf_construct_subsystem(const char *name,
 			}
 
 			SPDK_NOTICELOG("Attaching block device %s to subsystem %s\n",
-				       spdk_bdev_get_name(bdev), subsystem->subnqn);
+				       spdk_bdev_get_name(bdev), spdk_nvmf_subsystem_get_nqn(subsystem));
 
 		}
 	}
diff --git a/app/nvmf_tgt/nvmf_tgt.c b/app/nvmf_tgt/nvmf_tgt.c
index cfb482e7e..798a99b78 100644
--- a/app/nvmf_tgt/nvmf_tgt.c
+++ b/app/nvmf_tgt/nvmf_tgt.c
@@ -255,7 +255,7 @@ nvmf_tgt_shutdown_subsystem_by_nqn(const char *nqn)
 	struct nvmf_tgt_subsystem *tgt_subsystem, *subsys_tmp;
 
 	TAILQ_FOREACH_SAFE(tgt_subsystem, &g_subsystems, tailq, subsys_tmp) {
-		if (strcmp(tgt_subsystem->subsystem->subnqn, nqn) == 0) {
+		if (strcmp(spdk_nvmf_subsystem_get_nqn(tgt_subsystem->subsystem), nqn) == 0) {
 			nvmf_tgt_delete_subsystem(tgt_subsystem);
 			return 0;
 		}