diff --git a/conf/machine/am335x-vcu.conf b/conf/machine/am335x-nmhw21.conf
similarity index 57%
rename from conf/machine/am335x-vcu.conf
rename to conf/machine/am335x-nmhw21.conf
index d707073..ca8060f 100644
--- a/conf/machine/am335x-vcu.conf
+++ b/conf/machine/am335x-nmhw21.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
-#@NAME: Vehicle Control Unit (VCU)
-#@DESCRIPTION: Machine configuration for the VCU mainboard
+#@NAME: NetModule HW 21
+#@DESCRIPTION: Machine configuration for the nmhw21 mainboard
 
 require conf/machine/include/ti33x.inc
 
@@ -9,13 +9,13 @@ IMAGE_CLASSES += "image_types"
 
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree"
 
-KERNEL_DEFCONFIG ??= "am335x-vcu_defconfig"
-KERNEL_DEVICETREE = "am335x-vcu-prod1.dtb \
+KERNEL_DEFCONFIG ??= "am335x-nmhw21_defconfig"
+KERNEL_DEVICETREE = "am335x-nmhw21-prod1.dtb \
     "
 KERNEL_IMAGETYPE = "zImage"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule"
-PV_pn-linux-netmodule = "4.14.14-${SRCPV}"
-SRC_URI_pn-linux-netmodule ?= "git://git.netmodule.intranet/nmrouter/linux.git;protocol=ssh;user=gitea;branch=4.14/standard/vcu"
+PV_pn-linux-netmodule = "4.14.77-${SRCPV}"
+SRC_URI_pn-linux-netmodule ?= "git://git.netmodule.intranet/nmrouter/linux.git;protocol=ssh;user=gitea;branch=4.14/standard/nmhw21"
 SRCREV_pn-linux-netmodule ?= "${AUTOREV}"
 
diff --git a/recipes-bsp/u-boot/u-boot-am335x-vcu-v1_git.bb b/recipes-bsp/u-boot/u-boot-am335x-nmhw21-v1_git.bb
similarity index 87%
rename from recipes-bsp/u-boot/u-boot-am335x-vcu-v1_git.bb
rename to recipes-bsp/u-boot/u-boot-am335x-nmhw21-v1_git.bb
index 29af38c..59ba5a9 100644
--- a/recipes-bsp/u-boot/u-boot-am335x-vcu-v1_git.bb
+++ b/recipes-bsp/u-boot/u-boot-am335x-nmhw21-v1_git.bb
@@ -1,15 +1,14 @@
 require u-boot-nm.inc
 
 # Force machine configuration for this recipe
-UBOOT_MACHINE = "am335x_vcu_defconfig"
+UBOOT_MACHINE = "am335x_nmhw21_defconfig"
 
 # Be aware github/netmodule git
 SRC_URI = "git://git.netmodule.intranet/nmrouter/u-boot;protocol=ssh;user=gitea;branch=2016.05-am335x-netmodule"
 
 # Should be updated when a new U-Boot Version is available
 SRCREV ?= "${AUTOREV}"
-PV = "v2016.04+git${SRCPV}"
-# PV = "v2016.04-${SRCREV}"
+PV = "v2016.05+git${SRCPV}"
 
 SPL_BINARY = "MLO"
 UBOOT_SUFFIX = "img"
diff --git a/recipes-connectivity/gpsd/gpsd_3.17.bbappend b/recipes-connectivity/gpsd/gpsd_3.17.bbappend
index 346171c..49239ac 100644
--- a/recipes-connectivity/gpsd/gpsd_3.17.bbappend
+++ b/recipes-connectivity/gpsd/gpsd_3.17.bbappend
@@ -1,5 +1,5 @@
 FILESEXTRAPATHS_prepend_am335x-nrhw20 := "${THISDIR}/${PN}:"
-FILESEXTRAPATHS_prepend_am335x-vcu := "${THISDIR}/${PN}:" 
+FILESEXTRAPATHS_prepend_am335x-nmhw21 := "${THISDIR}/${PN}:" 
 
 #SRC_URI_append = " file://gpsd.service"
 
diff --git a/recipes-connectivity/modemmanager/modemmanager-debug_1.6.0.bb b/recipes-connectivity/modemmanager/modemmanager-debug_1.6.0.bb
index f258f54..845cd4d 100644
--- a/recipes-connectivity/modemmanager/modemmanager-debug_1.6.0.bb
+++ b/recipes-connectivity/modemmanager/modemmanager-debug_1.6.0.bb
@@ -13,6 +13,6 @@ do_install_append_am335x-nrhw20() {
     sed -i 's/ExecStart=.*/ExecStart=\/usr\/sbin\/ModemManager --debug/g' ${D}/lib/systemd/system/ModemManager.service
 }
 
-do_install_append_am335x-vcu() {
+do_install_append_am335x-nmhw21() {
     sed -i 's/ExecStart=.*/ExecStart=\/usr\/sbin\/ModemManager --debug/g' ${D}/lib/systemd/system/ModemManager.service
 }
diff --git a/recipes-connectivity/modemmanager/modemmanager-debug_1.8.0.bb b/recipes-connectivity/modemmanager/modemmanager-debug_1.8.0.bb
index 50f76ec..d1302c1 100644
--- a/recipes-connectivity/modemmanager/modemmanager-debug_1.8.0.bb
+++ b/recipes-connectivity/modemmanager/modemmanager-debug_1.8.0.bb
@@ -13,7 +13,7 @@ do_install_append_am335x-nrhw20() {
     sed -i 's/ExecStart=.*/ExecStart=\/usr\/sbin\/ModemManager --debug/g' ${D}/lib/systemd/system/ModemManager.service
 }
 
-do_install_append_am335x-vcu() {
+do_install_append_am335x-nmhw21() {
     sed -i 's/ExecStart=.*/ExecStart=\/usr\/sbin\/ModemManager --debug/g' ${D}/lib/systemd/system/ModemManager.service
 }
 
diff --git a/recipes-connectivity/tibluetooth/tibluetooth.bb b/recipes-connectivity/tibluetooth/tibluetooth.bb
index f537043..836f6d3 100644
--- a/recipes-connectivity/tibluetooth/tibluetooth.bb
+++ b/recipes-connectivity/tibluetooth/tibluetooth.bb
@@ -52,7 +52,7 @@ do_install_am335x-nrhw20 () {
 }
 
 
-install_vcu () {
+install_nmhw21 () {
     install -d ${D}${systemd_unitdir}/system/
     install -m 0644 tibluetooth-vcu.service ${D}${systemd_unitdir}/system/tibluetooth.service
 
@@ -60,6 +60,6 @@ install_vcu () {
     install -m 0644 TIInit_11.8.32.bts ${D}/lib/firmware/ti-connectivity/
 }
 
-do_install_am335x-vcu () {
-    install_vcu
+do_install_am335x-nmhw21 () {
+    install_nmhw21
 }
diff --git a/recipes-kernel/linux/linux-netmodule_git.bb b/recipes-kernel/linux/linux-netmodule_git.bb
index 943c10d..637d4bd 100755
--- a/recipes-kernel/linux/linux-netmodule_git.bb
+++ b/recipes-kernel/linux/linux-netmodule_git.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2013 NetModule AG
+# Copyright (C) 2018 NetModule AG
 
 inherit kernel
 
@@ -7,9 +7,9 @@ DESCRIPTION = "Linux kernel for various NetModule hardware"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
-SRC_URI = "git://git.netmodule.intranet/nmrouter/linux.git;protocol=ssh;user=gitea;branch=4.14/standard/vcu"
+SRC_URI = "git://git.netmodule.intranet/nmrouter/linux.git;protocol=ssh;user=gitea;branch=4.14/standard/nmhw21"
 SRCREV ?= "${AUTOREV}"
-PV ?= "4.14.14-${SRCPV}"
+PV ?= "4.14.77-${SRCPV}"
 
 PR = "r0"