diff --git a/system/gs2200m/.gitignore b/wireless/gs2200m/.gitignore
similarity index 100%
rename from system/gs2200m/.gitignore
rename to wireless/gs2200m/.gitignore
diff --git a/system/gs2200m/Kconfig b/wireless/gs2200m/Kconfig
similarity index 76%
rename from system/gs2200m/Kconfig
rename to wireless/gs2200m/Kconfig
index 561dbc4cf..6281b587e 100644
--- a/system/gs2200m/Kconfig
+++ b/wireless/gs2200m/Kconfig
@@ -3,7 +3,7 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
-config SYSTEM_GS2200M
+config WIRELESS_GS2200M
 	tristate "Telit GS2200M usrsock daemon"
 	default n
 	depends on NET_USRSOCK && WL_GS2200M
@@ -12,16 +12,16 @@ config SYSTEM_GS2200M
 	---help---
 		Enable support for the gs2200m usrsock daemon
 
-if SYSTEM_GS2200M
-config SYSTEM_GS2200M_PROGNAME
+if WIRELESS_GS2200M
+config WIRELESS_GS2200M_PROGNAME
 	string "gs2200m program name"
 	default "gs2200m"
 
-config SYSTEM_GS2200M_PRIORITY
+config WIRELESS_GS2200M_PRIORITY
 	int "gs2200m task priority"
 	default 50
 
-config SYSTEM_GS2200M_STACKSIZE
+config WIRELESS_GS2200M_STACKSIZE
 	int "gs2200m stack size"
 	default 2048
 
diff --git a/system/gs2200m/Make.defs b/wireless/gs2200m/Make.defs
similarity index 94%
rename from system/gs2200m/Make.defs
rename to wireless/gs2200m/Make.defs
index 54e32ae9f..c34288fee 100644
--- a/system/gs2200m/Make.defs
+++ b/wireless/gs2200m/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/system/gs2200m/Make.defs
+# apps/wireless/gs2200m/Make.defs
 # Adds selected applications to apps/ build
 #
 #   Copyright 2019 Sony Home Entertainment & Sound Products Inc.
@@ -34,6 +34,6 @@
 #
 ############################################################################
 
-ifneq ($(CONFIG_SYSTEM_GS2200M),)
-CONFIGURED_APPS += system/gs2200m
+ifneq ($(CONFIG_WIRELESS_GS2200M),)
+CONFIGURED_APPS += wireless/gs2200m
 endif
diff --git a/system/gs2200m/Makefile b/wireless/gs2200m/Makefile
similarity index 83%
rename from system/gs2200m/Makefile
rename to wireless/gs2200m/Makefile
index b5d994576..cab8c57f4 100644
--- a/system/gs2200m/Makefile
+++ b/wireless/gs2200m/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/system/gs2200m/Makefile
+# apps/wireless/gs2200m/Makefile
 #
 #   Copyright 2019 Sony Video & Sound Products Inc.
 #   Author: Masayuki Ishikawa <Masayuki.Ishikawa@jp.sony.com>
@@ -37,20 +37,20 @@
 
 # gs2200m command
 
-CONFIG_SYSTEM_GS2200M_PRIORITY ?= SCHED_PRIORITY_DEFAULT
-CONFIG_SYSTEM_GS2200M_STACKSIZE ?= 2048
+CONFIG_WIRELESS_GS2200M_PRIORITY ?= SCHED_PRIORITY_DEFAULT
+CONFIG_WIRELESS_GS2200M_STACKSIZE ?= 2048
 
 APPNAME = gs2200m
-PRIORITY = $(CONFIG_SYSTEM_GS2200M_PRIORITY)
-STACKSIZE = $(CONFIG_SYSTEM_GS2200M_STACKSIZE)
+PRIORITY = $(CONFIG_WIRELESS_GS2200M_PRIORITY)
+STACKSIZE = $(CONFIG_WIRELESS_GS2200M_STACKSIZE)
 
-CONFIG_SYSTEM_GS2200M_PROGNAME ?= gs2200m$(EXEEXT)
-PROGNAME = $(CONFIG_SYSTEM_GS2200M_PROGNAME)
+CONFIG_WIRELESS_GS2200M_PROGNAME ?= gs2200m$(EXEEXT)
+PROGNAME = $(CONFIG_WIRELESS_GS2200M_PROGNAME)
 
 # Files
 
 MAINSRC = gs2200m_main.c
 
-MODULE = CONFIG_SYSTEM_GS2200M
+MODULE = CONFIG_WIRELESS_GS2200M
 
 include $(APPDIR)/Application.mk
diff --git a/system/gs2200m/gs2200m_main.c b/wireless/gs2200m/gs2200m_main.c
similarity index 99%
rename from system/gs2200m/gs2200m_main.c
rename to wireless/gs2200m/gs2200m_main.c
index 5097b652e..a73097900 100644
--- a/system/gs2200m/gs2200m_main.c
+++ b/wireless/gs2200m/gs2200m_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/gs2200m/gs2200m_main.c
+ * apps/wireless/gs2200m_main.c
  *
  *   Copyright 2019 Sony Home Entertainment & Sound Products Inc.
  *   Author: Masayuki Ishikawa <Masayuki.Ishikawa@jp.sony.com>