diff --git a/Makefile b/Makefile
index 772e51e..436d2fa 100644
--- a/Makefile
+++ b/Makefile
@@ -7,14 +7,14 @@ KDIR ?= /lib/modules/$(KVER)/build
 export CONFIG_LEGO_DRIVERS = m
 export CONFIG_LEGO_PORTS = m
 export CONFIG_LEGOEV3_MOTORS = n
-export CONFIG_LEGOEV3_SERVO_MOTORS = m
-export CONFIG_LEGOEV3_DC_MOTORS = m
-export CONFIG_LEGOEV3_TACHO_MOTORS = m
-export CONFIG_LEGOEV3_MSENSORS = m
+export CONFIG_LEGO_SERVO_MOTORS = m
+export CONFIG_LEGO_DC_MOTORS = m
+export CONFIG_LEGO_TACHO_MOTORS = m
+export CONFIG_LEGO_SENSORS = m
 export CONFIG_NXT_ANALOG_SENSORS = m
 export CONFIG_EV3_ANALOG_SENSORS = m
 # I2C sensors require modifications to the core I2C kernel driver
-export CONFIG_LEGOEV3_I2C_SENSORS = n
+export CONFIG_NXT_I2C_SENSORS = n
 export CONFIG_EV3_UART_SENSORS = m
 export CONFIG_WEDO = m
 
@@ -29,14 +29,14 @@ endif
 ifeq ($(CONFIG_LEGOEV3_MOTORS), m)
 KBUILD_CFLAGS += -DCONFIG_LEGOEV3_MOTORS_MODULE
 endif
-ifeq ($(CONFIG_LEGOEV3_SERVO_MOTORS), m)
-KBUILD_CFLAGS += -DCONFIG_LEGOEV3_SERVO_MOTORS_MODULE
+ifeq ($(CONFIG_LEGO_SERVO_MOTORS), m)
+KBUILD_CFLAGS += -DCONFIG_LEGO_SERVO_MOTORS_MODULE
 endif
-ifeq ($(CONFIG_LEGOEV3_TACHO_MOTORS), m)
-KBUILD_CFLAGS += -DCONFIG_LEGOEV3_TACHO_MOTORS_MODULE
+ifeq ($(CONFIG_LEGO_TACHO_MOTORS), m)
+KBUILD_CFLAGS += -DCONFIG_LEGO_TACHO_MOTORS_MODULE
 endif
-ifeq ($(CONFIG_LEGOEV3_MSENSORS), m)
-KBUILD_CFLAGS += -DCONFIG_LEGOEV3_MSENSORS_MODULE
+ifeq ($(CONFIG_LEGO_SENSORS), m)
+KBUILD_CFLAGS += -DCONFIG_LEGO_SENSORS_MODULE
 endif
 ifeq ($(CONFIG_NXT_ANALOG_SENSORS), m)
 KBUILD_CFLAGS += -DCONFIG_NXT_ANALOG_SENSORS_MODULE
@@ -44,8 +44,8 @@ endif
 ifeq ($(CONFIG_EV3_ANALOG_SENSORS), m)
 KBUILD_CFLAGS += -DCONFIG_EV3_ANALOG_SENSORS_MODULE
 endif
-ifeq ($(CONFIG_LEGOEV3_I2C_SENSORS), m)
-KBUILD_CFLAGS += -DCONFIG_LEGOEV3_I2C_SENSORS_MODULE
+ifeq ($(CONFIG_NXT_I2C_SENSORS), m)
+KBUILD_CFLAGS += -DCONFIG_NXT_I2C_SENSORS_MODULE
 endif
 ifeq ($(CONFIG_EV3_UART_SENSORS), m)
 KBUILD_CFLAGS += -DCONFIG_EV3_UART_SENSORS_MODULE
diff --git a/dkms.conf b/dkms.conf
index f65065f..1f0c126 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,4 +1,4 @@
-PACKAGE_VERSION="3.0.1"
+PACKAGE_VERSION="7.0"
 PACKAGE_NAME="lego-modules"
 CLEAN="make clean"
 MAKE[1]="make"
diff --git a/lego b/lego
index cac0145..b3373c0 160000
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit cac0145e19cee723945c729d812abf38f23c7d6a
+Subproject commit b3373c08850ace4cb189076c1294e4978d417d88