diff --git a/examples/tcpblaster/Kconfig b/examples/tcpblaster/Kconfig
index 8a4f32f75..90b85ef89 100644
--- a/examples/tcpblaster/Kconfig
+++ b/examples/tcpblaster/Kconfig
@@ -20,8 +20,8 @@ config EXAMPLES_TCPBLASTER_SENDSIZE
 
 config EXAMPLES_TCPBLASTER_PROGNAME1
 	string "Target1 program name"
-	default "tcpserver" if !EXAMPLES_TCPBLASTER_SERVER1
-	default "tcpclient" if EXAMPLES_TCPBLASTER_SERVER1
+	default "tcpserver" if !EXAMPLES_TCPBLASTER_SERVER
+	default "tcpclient" if EXAMPLES_TCPBLASTER_SERVER
 	depends on BUILD_KERNEL
 	---help---
 		This is the name of the program that will be use when the TcpBlaster
@@ -47,7 +47,7 @@ config EXAMPLES_TCPBLASTER_LOOPBACK
 
 if !EXAMPLES_TCPBLASTER_LOOPBACK
 
-config EXAMPLES_TCPBLASTER_SERVER1
+config EXAMPLES_TCPBLASTER_SERVER
 	bool "Target1 is server"
 	default n
 	depends on !EXAMPLES_TCPBLASTER_LOOPBACK
@@ -69,8 +69,8 @@ if EXAMPLES_TCPBLASTER_TARGET2
 
 config EXAMPLES_TCPBLASTER_PROGNAME2
 	string "Target2 program name"
-	default "tcpserver" if !EXAMPLES_TCPBLASTER_SERVER2
-	default "tcpclient" if EXAMPLES_TCPBLASTER_SERVER2
+	default "tcpserver" if !EXAMPLES_TCPBLASTER_SERVER
+	default "tcpclient" if EXAMPLES_TCPBLASTER_SERVER
 	depends on BUILD_KERNEL
 	---help---
 		This is the name of the Target2 program that will be use when the
diff --git a/examples/tcpblaster/Makefile b/examples/tcpblaster/Makefile
index feff3866c..9553cc0a5 100644
--- a/examples/tcpblaster/Makefile
+++ b/examples/tcpblaster/Makefile
@@ -66,7 +66,7 @@ TARG_OBJS = $(TARG1_COBJS) $(TARGCMN_COBJS)
 
 # Target 1 Application Info
 
-ifeq ($(CONFIG_EXAMPLES_TCPBLASTER_SERVER1),y)
+ifeq ($(CONFIG_EXAMPLES_TCPBLASTER_SERVER),y)
 CONFIG_EXAMPLES_TCPBLASTER_PROGNAME1 ?= tcpserver
 APPNAME1 = tcpserver
 else
@@ -85,7 +85,7 @@ STACKSIZE1 = $(CONFIG_EXAMPLES_TCPBLASTER_STACKSIZE1)
 ifeq ($(CONFIG_EXAMPLES_TCPBLASTER_TARGET2),y)
 
 TARG2_CSRCS =
-ifeq ($(CONFIG_EXAMPLES_TCPBLASTER_SERVER1),y)
+ifeq ($(CONFIG_EXAMPLES_TCPBLASTER_SERVER),y)
 TARG2_CSRCS += tcpblaster_client.c
 else
 TARG2_CSRCS += tcpblaster_server.c
@@ -97,7 +97,7 @@ TARG2_MAINOBJ = $(TARG2_MAINSRC:.c=$(OBJEXT))
 
 # Target 2 Application Info
 
-ifeq ($(CONFIG_EXAMPLES_TCPBLASTER_SERVER1),y)
+ifeq ($(CONFIG_EXAMPLES_TCPBLASTER_SERVER),y)
 CONFIG_EXAMPLES_TCPBLASTER_PROGNAME2 ?= tcpclient
 APPNAME2 = tcpclient
 else