diff --git a/lib/nvmf/fc_ls.c b/lib/nvmf/fc_ls.c
index 08011eb5d..efa151a07 100644
--- a/lib/nvmf/fc_ls.c
+++ b/lib/nvmf/fc_ls.c
@@ -287,8 +287,8 @@ nvmf_fc_ls_new_association(uint32_t s_id,
 	assoc->subsystem = subsys;
 	assoc->assoc_state = SPDK_NVMF_FC_OBJECT_CREATED;
 	memcpy(assoc->host_id, a_cmd->hostid, FCNVME_ASSOC_HOSTID_LEN);
-	memcpy(assoc->host_nqn, a_cmd->hostnqn, FCNVME_ASSOC_HOSTNQN_LEN);
-	memcpy(assoc->sub_nqn, a_cmd->subnqn, FCNVME_ASSOC_HOSTNQN_LEN);
+	memcpy(assoc->host_nqn, a_cmd->hostnqn, SPDK_NVME_NQN_FIELD_SIZE);
+	memcpy(assoc->sub_nqn, a_cmd->subnqn, SPDK_NVME_NQN_FIELD_SIZE);
 	TAILQ_INIT(&assoc->fc_conns);
 	TAILQ_INIT(&assoc->avail_fc_conns);
 	assoc->ls_del_op_ctx = NULL;
diff --git a/lib/nvmf/nvmf_fc.h b/lib/nvmf/nvmf_fc.h
index f2408d525..dcd3f928c 100644
--- a/lib/nvmf/nvmf_fc.h
+++ b/lib/nvmf/nvmf_fc.h
@@ -367,8 +367,8 @@ struct spdk_nvmf_fc_association {
 	enum spdk_nvmf_fc_object_state assoc_state;
 
 	char host_id[FCNVME_ASSOC_HOSTID_LEN];
-	char host_nqn[FCNVME_ASSOC_HOSTNQN_LEN];
-	char sub_nqn[FCNVME_ASSOC_HOSTNQN_LEN];
+	char host_nqn[SPDK_NVME_NQN_FIELD_SIZE];
+	char sub_nqn[SPDK_NVME_NQN_FIELD_SIZE];
 
 	struct spdk_nvmf_fc_conn *aq_conn; /* connection for admin queue */