diff --git a/makefiles/linux/config_linux_default.mk b/makefiles/linux/config_linux_default.mk
index 2781cba50c..218fb4a605 100644
--- a/makefiles/linux/config_linux_default.mk
+++ b/makefiles/linux/config_linux_default.mk
@@ -58,7 +58,7 @@ MODULES		+= lib/conversion
 # Linux port
 #
 MODULES		+= platforms/linux/px4_layer
-MODULES		+= platforms/linux/drivers/accel
+MODULES		+= platforms/linux/drivers/accelsim
 
 #
 # Unit tests
diff --git a/src/platforms/linux/drivers/accel/module.mk b/src/platforms/linux/drivers/accel/module.mk
deleted file mode 100644
index 71c6c0ebdd..0000000000
--- a/src/platforms/linux/drivers/accel/module.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Simulated accel/mag driver
-#
-
-MODULE_COMMAND	 = accel
-SRCS		 = accel.cpp
-
diff --git a/src/platforms/linux/drivers/accel/accel.cpp b/src/platforms/linux/drivers/accelsim/accelsim.cpp
similarity index 99%
rename from src/platforms/linux/drivers/accel/accel.cpp
rename to src/platforms/linux/drivers/accelsim/accelsim.cpp
index 6efb4772cb..1b5e76839a 100644
--- a/src/platforms/linux/drivers/accel/accel.cpp
+++ b/src/platforms/linux/drivers/accelsim/accelsim.cpp
@@ -32,7 +32,7 @@
  ****************************************************************************/
 
 /**
- * @file accel.cpp
+ * @file accelsim.cpp
  * Driver for a simulated accelerometer / magnetometer.
  */
 
@@ -87,7 +87,7 @@ static const int ERROR = -1;
 #define DIR_READ				(1<<7)
 #define DIR_WRITE				(0<<7)
 
-extern "C" { __EXPORT int accel_main(int argc, char *argv[]); }
+extern "C" { __EXPORT int accelsim_main(int argc, char *argv[]); }
 
 
 class ACCELSIM_mag;
@@ -1236,7 +1236,7 @@ ACCELSIM_mag::measure_trampoline(void *arg)
 /**
  * Local functions in support of the shell command.
  */
-namespace accel
+namespace accelsim
 {
 
 ACCELSIM	*g_dev;
@@ -1324,7 +1324,7 @@ info()
 void
 usage()
 {
-	warnx("Usage: accel 'start', 'info'");
+	warnx("Usage: accelsim 'start', 'info'");
 	warnx("options:");
 	warnx("    -R rotation");
 }
@@ -1332,7 +1332,7 @@ usage()
 } // namespace
 
 int
-accel_main(int argc, char *argv[])
+accelsim_main(int argc, char *argv[])
 {
 	int ch;
 	enum Rotation rotation = ROTATION_NONE;
@@ -1347,7 +1347,7 @@ accel_main(int argc, char *argv[])
 			rotation = (enum Rotation)atoi(myoptarg);
 			break;
 		default:
-			accel::usage();
+			accelsim::usage();
 			return 0;
 		}
 	}
@@ -1358,16 +1358,16 @@ accel_main(int argc, char *argv[])
 	 * Start/load the driver.
 	 */
 	if (!strcmp(verb, "start"))
-		ret = accel::start(rotation);
+		ret = accelsim::start(rotation);
 
 	/*
 	 * Print driver information.
 	 */
 	else if (!strcmp(verb, "info"))
-		ret = accel::info();
+		ret = accelsim::info();
 
 	else {
-		accel::usage();
+		accelsim::usage();
 		return 1;
 	}
 	return ret;
diff --git a/src/platforms/linux/drivers/accelsim/module.mk b/src/platforms/linux/drivers/accelsim/module.mk
new file mode 100644
index 0000000000..dc980c5cc8
--- /dev/null
+++ b/src/platforms/linux/drivers/accelsim/module.mk
@@ -0,0 +1,7 @@
+#
+# Simulated accel/mag driver
+#
+
+MODULE_COMMAND	 = accelsim
+SRCS		 = accelsim.cpp
+