diff --git a/app/iscsi_tgt/Makefile b/app/iscsi_tgt/Makefile
index 9502ea76d..f04d034ae 100644
--- a/app/iscsi_tgt/Makefile
+++ b/app/iscsi_tgt/Makefile
@@ -46,7 +46,7 @@ C_SRCS := iscsi_tgt.c
 
 SPDK_LIB_LIST = event_bdev event_copy event_iscsi event_net event_scsi
 SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev iscsi scsi copy trace conf
-SPDK_LIB_LIST += thread util log log_rpc event app_rpc
+SPDK_LIB_LIST += thread util log log_rpc event app_rpc net
 
 ifeq ($(OS),Linux)
 SPDK_LIB_LIST += event_nbd nbd
@@ -54,14 +54,14 @@ endif
 
 LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
 	$(COPY_MODULES_LINKER_ARGS) \
-	$(NET_MODULES_LINKER_ARGS)
+	$(SOCK_MODULES_LINKER_ARGS)
 LIBS += $(SPDK_LIB_LINKER_ARGS)
 LIBS += $(ENV_LINKER_ARGS)
 
 all : $(APP)
 	@:
 
-$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(NET_MODULES_FILES)
+$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(SOCK_MODULES_FILES)
 	$(LINK_C)
 
 clean :
diff --git a/app/spdk_tgt/Makefile b/app/spdk_tgt/Makefile
index 1966b400b..a459ca428 100644
--- a/app/spdk_tgt/Makefile
+++ b/app/spdk_tgt/Makefile
@@ -42,7 +42,7 @@ C_SRCS := spdk_tgt.c
 
 SPDK_LIB_LIST = event_bdev event_copy event_iscsi event_net event_scsi event_nvmf
 SPDK_LIB_LIST += nvmf event log trace conf thread util bdev iscsi scsi copy rpc jsonrpc json
-SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc
+SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc net
 
 ifeq ($(OS),Linux)
 SPDK_LIB_LIST += event_nbd nbd
@@ -55,13 +55,13 @@ endif
 
 LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
 	$(COPY_MODULES_LINKER_ARGS) \
-	$(NET_MODULES_LINKER_ARGS) \
+	$(SOCK_MODULES_LINKER_ARGS) \
 	$(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
 
 all: $(APP)
 	@:
 
-$(APP): $(OBJS) $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(NET_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS)
+$(APP): $(OBJS) $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(SOCK_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS)
 	$(LINK_C)
 
 clean:
diff --git a/app/vhost/Makefile b/app/vhost/Makefile
index 1b5584081..adf2701a6 100644
--- a/app/vhost/Makefile
+++ b/app/vhost/Makefile
@@ -43,18 +43,18 @@ C_SRCS := vhost.c
 SPDK_LIB_LIST = event_bdev event_copy event_net event_scsi event_vhost
 SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev scsi copy trace conf
 SPDK_LIB_LIST += thread util log log_rpc event app_rpc
-SPDK_LIB_LIST += vhost rte_vhost event_nbd nbd
+SPDK_LIB_LIST += vhost rte_vhost event_nbd nbd net
 
 LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
 	$(COPY_MODULES_LINKER_ARGS) \
-	$(NET_MODULES_LINKER_ARGS)
+	$(SOCK_MODULES_LINKER_ARGS)
 LIBS += $(SPDK_LIB_LINKER_ARGS)
 LIBS += $(ENV_LINKER_ARGS)
 
 all : $(APP)
 	@:
 
-$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(NET_MODULES_FILES)
+$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(SOCK_MODULES_FILES)
 	$(LINK_C)
 
 clean :
diff --git a/mk/spdk.modules.mk b/mk/spdk.modules.mk
index 27df83f4e..528a7a973 100644
--- a/mk/spdk.modules.mk
+++ b/mk/spdk.modules.mk
@@ -62,17 +62,17 @@ BLOCKDEV_MODULES_LIST += bdev_pmem
 BLOCKDEV_MODULES_DEPS += -lpmemblk
 endif
 
-NET_MODULES_LIST = net sock
-NET_MODULES_LIST += sock_posix
+SOCK_MODULES_LIST = sock
+SOCK_MODULES_LIST += sock_posix
 
 ifeq ($(CONFIG_VPP),y)
 ifneq ($(CONFIG_VPP_DIR),)
-NET_MODULES_DEPS = -l:libvppinfra.a -l:libsvm.a -l:libvapiclient.a
-NET_MODULES_DEPS += -l:libvppcom.a -l:libvlibmemoryclient.a
+SOCK_MODULES_DEPS = -l:libvppinfra.a -l:libsvm.a -l:libvapiclient.a
+SOCK_MODULES_DEPS += -l:libvppcom.a -l:libvlibmemoryclient.a
 else
-NET_MODULES_DEPS = -lvppcom
+SOCK_MODULES_DEPS = -lvppcom
 endif
-NET_MODULES_LIST += sock_vpp
+SOCK_MODULES_LIST += sock_vpp
 endif
 
 COPY_MODULES_LIST = copy_ioat ioat
@@ -99,9 +99,9 @@ COPY_MODULES_LINKER_ARGS = -Wl,--whole-archive \
 
 COPY_MODULES_FILES = $(call spdk_lib_list_to_files,$(COPY_MODULES_LIST))
 
-NET_MODULES_LINKER_ARGS = -Wl,--whole-archive \
-			   $(NET_MODULES_LIST:%=-lspdk_%) \
-			   $(NET_MODULES_DEPS) \
+SOCK_MODULES_LINKER_ARGS = -Wl,--whole-archive \
+			   $(SOCK_MODULES_LIST:%=-lspdk_%) \
+			   $(SOCK_MODULES_DEPS) \
 			   -Wl,--no-whole-archive
 
-NET_MODULES_FILES = $(call spdk_lib_list_to_files,$(NET_MODULES_LIST))
+SOCK_MODULES_FILES = $(call spdk_lib_list_to_files,$(SOCK_MODULES_LIST))
diff --git a/shared_lib/Makefile b/shared_lib/Makefile
index 1ede8bc88..ffdb97c62 100644
--- a/shared_lib/Makefile
+++ b/shared_lib/Makefile
@@ -57,6 +57,7 @@ SPDK_LIB_LIST += json
 SPDK_LIB_LIST += jsonrpc
 SPDK_LIB_LIST += log
 SPDK_LIB_LIST += log_rpc
+SPDK_LIB_LIST += net
 SPDK_LIB_LIST += nvmf
 SPDK_LIB_LIST += rpc
 SPDK_LIB_LIST += scsi
@@ -77,13 +78,13 @@ endif
 
 LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS)
 LIBS += $(COPY_MODULES_LINKER_ARGS)
-LIBS += $(NET_MODULES_LINKER_ARGS)
+LIBS += $(SOCK_MODULES_LINKER_ARGS)
 LIBS += $(SPDK_LIB_LINKER_ARGS)
 LIBS += $(ENV_LINKER_ARGS)
 
 comma := ,
 
-$(SHARED_LIB): $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(NET_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) $(MAKEFILE_LIST) spdk.map
+$(SHARED_LIB): $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(SOCK_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) $(MAKEFILE_LIST) spdk.map
 	$(Q)echo "  SO $(notdir $@)"; \
 	rm -f $@; \
 	$(CC) -o $@ -shared $(CPPFLAGS) $(LDFLAGS) \