diff --git a/drivers/staging/most/Kconfig b/drivers/staging/most/Kconfig
index 0b9b9b539f70562d2a908e6741df729d0ea2d9fc..2045f7ac508175ddceac9a1267f37dc182e241e2 100644
--- a/drivers/staging/most/Kconfig
+++ b/drivers/staging/most/Kconfig
@@ -1,10 +1,15 @@
 menuconfig MOST
-        tristate "MOST driver"
+        tristate "MOST support"
 	depends on HAS_DMA
-        select MOSTCORE
         default n
         ---help---
-          This option allows you to enable support for MOST Network transceivers.
+	  Say Y here if you want to enable MOST support.
+	  This driver needs at least one additional component to enable the
+	  desired access from userspace (e.g. character devices) and one that
+	  matches the network controller's hardware interface (e.g. USB).
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called most_core.
 
           If in doubt, say N here.
 
@@ -12,8 +17,6 @@ menuconfig MOST
 
 if MOST
 
-source "drivers/staging/most/mostcore/Kconfig"
-
 source "drivers/staging/most/aim-cdev/Kconfig"
 
 source "drivers/staging/most/aim-network/Kconfig"
diff --git a/drivers/staging/most/Makefile b/drivers/staging/most/Makefile
index f5bbb9deaab56f1c7119d531dacb7a7443357ff3..7f6aa9c515fadb659e0c509db772116a83f4e852 100644
--- a/drivers/staging/most/Makefile
+++ b/drivers/staging/most/Makefile
@@ -1,5 +1,8 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_MOSTCORE)	+= mostcore/
+obj-$(CONFIG_MOST) += most_core.o
+most_core-y := core.o
+ccflags-y += -Idrivers/staging/
+
 obj-$(CONFIG_AIM_CDEV)	+= aim-cdev/
 obj-$(CONFIG_AIM_NETWORK)	+= aim-network/
 obj-$(CONFIG_AIM_SOUND)	+= aim-sound/
diff --git a/drivers/staging/most/aim-cdev/Makefile b/drivers/staging/most/aim-cdev/Makefile
index 0bcc6c637b7597eba9a7b8878d414cea974e46d5..b7afcb40997d371d6849c66eb366beccf2db521c 100644
--- a/drivers/staging/most/aim-cdev/Makefile
+++ b/drivers/staging/most/aim-cdev/Makefile
@@ -1,4 +1,4 @@
 obj-$(CONFIG_AIM_CDEV) += aim_cdev.o
 
 aim_cdev-objs := cdev.o
-ccflags-y += -Idrivers/staging/most/mostcore/
\ No newline at end of file
+ccflags-y += -Idrivers/staging/
diff --git a/drivers/staging/most/aim-cdev/cdev.c b/drivers/staging/most/aim-cdev/cdev.c
index 5010c7bf87721b99cac7beddb69b844cb631d6da..3ae9246c0c5c258c7812812da3e89e87eb8c6b86 100644
--- a/drivers/staging/most/aim-cdev/cdev.c
+++ b/drivers/staging/most/aim-cdev/cdev.c
@@ -16,7 +16,7 @@
 #include <linux/kfifo.h>
 #include <linux/uaccess.h>
 #include <linux/idr.h>
-#include "mostcore.h"
+#include "most/core.h"
 
 static dev_t aim_devno;
 static struct class *aim_class;
diff --git a/drivers/staging/most/aim-network/Makefile b/drivers/staging/most/aim-network/Makefile
index 840c1dd9487352473c0842647f30170244bbbb8e..a874aac8d285dce0d8a0ef4ca8d4a1956ae7a926 100644
--- a/drivers/staging/most/aim-network/Makefile
+++ b/drivers/staging/most/aim-network/Makefile
@@ -1,4 +1,4 @@
 obj-$(CONFIG_AIM_NETWORK) += aim_network.o
 
 aim_network-objs := networking.o
-ccflags-y += -Idrivers/staging/most/mostcore/
+ccflags-y += -Idrivers/staging/
diff --git a/drivers/staging/most/aim-network/networking.c b/drivers/staging/most/aim-network/networking.c
index d98eb893d44c4e5d88e174de818905b3ecfebfcc..5e082d7d0e8258ee52376f91832c7959ce6b0501 100644
--- a/drivers/staging/most/aim-network/networking.c
+++ b/drivers/staging/most/aim-network/networking.c
@@ -15,7 +15,7 @@
 #include <linux/list.h>
 #include <linux/wait.h>
 #include <linux/kobject.h>
-#include "mostcore.h"
+#include "most/core.h"
 
 #define MEP_HDR_LEN 8
 #define MDP_HDR_LEN 16
diff --git a/drivers/staging/most/aim-sound/Makefile b/drivers/staging/most/aim-sound/Makefile
index beba9586fd285fbf01b2299de0c12aa9dfc46241..d41b85baa83f6a407eadf6e9d0ce004ab58f54e9 100644
--- a/drivers/staging/most/aim-sound/Makefile
+++ b/drivers/staging/most/aim-sound/Makefile
@@ -1,4 +1,4 @@
 obj-$(CONFIG_AIM_SOUND) += aim_sound.o
 
 aim_sound-objs := sound.o
-ccflags-y += -Idrivers/staging/most/mostcore/
+ccflags-y += -Idrivers/staging/
diff --git a/drivers/staging/most/aim-sound/sound.c b/drivers/staging/most/aim-sound/sound.c
index d84a6e1b56a1d8231bed998d931b42a7fc6c6c3b..5826f710c92535c3b8f430b998cbfd1fca81aa8a 100644
--- a/drivers/staging/most/aim-sound/sound.c
+++ b/drivers/staging/most/aim-sound/sound.c
@@ -16,7 +16,7 @@
 #include <sound/pcm_params.h>
 #include <linux/sched.h>
 #include <linux/kthread.h>
-#include <mostcore.h>
+#include <most/core.h>
 
 #define DRIVER_NAME "sound"
 
diff --git a/drivers/staging/most/aim-v4l2/Makefile b/drivers/staging/most/aim-v4l2/Makefile
index 69a7524b466c95e83ca5e75a634b332e5ae04f03..a8e8b4930355a94d1f5ea8c9581df224a2210bc5 100644
--- a/drivers/staging/most/aim-v4l2/Makefile
+++ b/drivers/staging/most/aim-v4l2/Makefile
@@ -2,4 +2,4 @@ obj-$(CONFIG_AIM_V4L2) += aim_v4l2.o
 
 aim_v4l2-objs := video.o
 
-ccflags-y += -Idrivers/staging/most/mostcore/
+ccflags-y += -Idrivers/staging/
diff --git a/drivers/staging/most/aim-v4l2/video.c b/drivers/staging/most/aim-v4l2/video.c
index 72e9a9a5d8b345e0c55fae59289e3721f3d0173d..3c813ed7f3ec97df55b1a4e46e5e9d131c86ad14 100644
--- a/drivers/staging/most/aim-v4l2/video.c
+++ b/drivers/staging/most/aim-v4l2/video.c
@@ -21,7 +21,7 @@
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-fh.h>
 
-#include "mostcore.h"
+#include "most/core.h"
 
 #define V4L2_AIM_MAX_INPUT  1
 
diff --git a/drivers/staging/most/mostcore/core.c b/drivers/staging/most/core.c
similarity index 99%
rename from drivers/staging/most/mostcore/core.c
rename to drivers/staging/most/core.c
index cb70e1029a93b854fbe1853d4bd5889accc092ee..8fe3f2ecd4e416c4555f3ce48bf185d002de708a 100644
--- a/drivers/staging/most/mostcore/core.c
+++ b/drivers/staging/most/core.c
@@ -21,7 +21,7 @@
 #include <linux/kthread.h>
 #include <linux/dma-mapping.h>
 #include <linux/idr.h>
-#include "mostcore.h"
+#include <most/core.h>
 
 #define MAX_CHANNELS	64
 #define STRING_SIZE	80
diff --git a/drivers/staging/most/mostcore/mostcore.h b/drivers/staging/most/core.h
similarity index 99%
rename from drivers/staging/most/mostcore/mostcore.h
rename to drivers/staging/most/core.h
index f6fdba0c5eaff200a70e268a53c24be75204ed60..5577e87351962839ed33794e62871d461eafcce6 100644
--- a/drivers/staging/most/mostcore/mostcore.h
+++ b/drivers/staging/most/core.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * mostcore.h - Interface between MostCore,
+ * most.h - Interface between MostCore,
  *   Hardware Dependent Module (HDM) and Application Interface Module (AIM).
  *
  * Copyright (C) 2013-2015, Microchip Technology Germany II GmbH & Co. KG
diff --git a/drivers/staging/most/hdm-dim2/Makefile b/drivers/staging/most/hdm-dim2/Makefile
index 6bbee879a8ea10bef0073e83785fa7a120ab7e10..b66492bf7674eb713d458947d3429db5e765aa07 100644
--- a/drivers/staging/most/hdm-dim2/Makefile
+++ b/drivers/staging/most/hdm-dim2/Makefile
@@ -1,5 +1,5 @@
 obj-$(CONFIG_HDM_DIM2) += hdm_dim2.o
 
 hdm_dim2-objs := dim2_hdm.o dim2_hal.o dim2_sysfs.o
-ccflags-y += -Idrivers/staging/most/mostcore/
+ccflags-y += -Idrivers/staging/
 ccflags-y += -Idrivers/staging/most/aim-network/
diff --git a/drivers/staging/most/hdm-dim2/dim2_hdm.c b/drivers/staging/most/hdm-dim2/dim2_hdm.c
index 312f4f75ef063677e5fec7241d8ba49352aec3f5..fedd2d06742a88548f49613a1c2e4cd637b9e0c9 100644
--- a/drivers/staging/most/hdm-dim2/dim2_hdm.c
+++ b/drivers/staging/most/hdm-dim2/dim2_hdm.c
@@ -19,7 +19,7 @@
 #include <linux/sched.h>
 #include <linux/kthread.h>
 
-#include <mostcore.h>
+#include "most/core.h"
 #include "dim2_hal.h"
 #include "dim2_hdm.h"
 #include "dim2_errors.h"
diff --git a/drivers/staging/most/hdm-i2c/Makefile b/drivers/staging/most/hdm-i2c/Makefile
index 03a4a59b1f9fd3862b0dee49c61cd3f6d6c10c27..6ddc78aae3d96c76a36866134e3bea900e99b4de 100644
--- a/drivers/staging/most/hdm-i2c/Makefile
+++ b/drivers/staging/most/hdm-i2c/Makefile
@@ -1,3 +1,3 @@
 obj-$(CONFIG_HDM_I2C) += hdm_i2c.o
 
-ccflags-y += -Idrivers/staging/most/mostcore/
+ccflags-y += -Idrivers/staging/
diff --git a/drivers/staging/most/hdm-i2c/hdm_i2c.c b/drivers/staging/most/hdm-i2c/hdm_i2c.c
index ed6793a1bc9332271cc24dee9b16ee0d77bb20ae..c73c76d0a6d55579a7e90b86bb5ef9744999fc90 100644
--- a/drivers/staging/most/hdm-i2c/hdm_i2c.c
+++ b/drivers/staging/most/hdm-i2c/hdm_i2c.c
@@ -15,7 +15,7 @@
 #include <linux/interrupt.h>
 #include <linux/err.h>
 
-#include <mostcore.h>
+#include "most/core.h"
 
 enum { CH_RX, CH_TX, NUM_CHANNELS };
 
diff --git a/drivers/staging/most/hdm-usb/Makefile b/drivers/staging/most/hdm-usb/Makefile
index 6bbacb41e94b7172e726f7bca755795ceb30c55e..4fea7c2a775505f5db74b84e5dae1df34a471c92 100644
--- a/drivers/staging/most/hdm-usb/Makefile
+++ b/drivers/staging/most/hdm-usb/Makefile
@@ -1,4 +1,4 @@
 obj-$(CONFIG_HDM_USB) += hdm_usb.o
 
-ccflags-y += -Idrivers/staging/most/mostcore/
+ccflags-y += -Idrivers/staging/
 ccflags-y += -Idrivers/staging/most/aim-network/
diff --git a/drivers/staging/most/hdm-usb/hdm_usb.c b/drivers/staging/most/hdm-usb/hdm_usb.c
index c01b93bb134f8c8b62cb7007ca17ce1964bb1418..f036614a1da6e1e3890e212cda851bdecba3c762 100644
--- a/drivers/staging/most/hdm-usb/hdm_usb.c
+++ b/drivers/staging/most/hdm-usb/hdm_usb.c
@@ -23,7 +23,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/etherdevice.h>
 #include <linux/uaccess.h>
-#include "mostcore.h"
+#include "most/core.h"
 
 #define USB_MTU			512
 #define NO_ISOCHRONOUS_URB	0
diff --git a/drivers/staging/most/mostcore/Kconfig b/drivers/staging/most/mostcore/Kconfig
deleted file mode 100644
index 47172546d7280ee6d10f9bb35d5339b3a58d8c6a..0000000000000000000000000000000000000000
--- a/drivers/staging/most/mostcore/Kconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# MOSTCore configuration
-#
-
-config MOSTCORE
-	tristate "MOST Core"
-	depends on HAS_DMA
-
-	---help---
-	  Say Y here if you want to enable MOST support.
-	  This device driver needs at least an additional AIM and HDM to work.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called mostcore.
diff --git a/drivers/staging/most/mostcore/Makefile b/drivers/staging/most/mostcore/Makefile
deleted file mode 100644
index a078f01cf7c227c6ff2621467eb8dff1eee9a9d3..0000000000000000000000000000000000000000
--- a/drivers/staging/most/mostcore/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-obj-$(CONFIG_MOSTCORE) += mostcore.o
-
-mostcore-objs := core.o