diff --git a/package/boot/uboot-tegra/Makefile b/package/boot/uboot-tegra/Makefile
index a42d9cfc277..4b9f7876f80 100644
--- a/package/boot/uboot-tegra/Makefile
+++ b/package/boot/uboot-tegra/Makefile
@@ -23,7 +23,7 @@ endef
 
 define U-Boot/trimslice
   NAME := CompuLab TrimSlice
-  BUILD_DEVICES := trimslice
+  BUILD_DEVICES := compulab_trimslice
   UBOOT_IMAGE := trimslice-mmc.img trimslice-spi.img
   SOC := tegra20
   VENDOR := compulab
diff --git a/target/linux/tegra/image/Makefile b/target/linux/tegra/image/Makefile
index 706cc65d92e..c1aa81beddc 100644
--- a/target/linux/tegra/image/Makefile
+++ b/target/linux/tegra/image/Makefile
@@ -44,16 +44,16 @@ define Device/Default
   KERNEL_NAME := zImage
   KERNEL := kernel-bin
   PROFILES := Default
+  SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
 endef
 
-define Device/trimslice
+define Device/compulab_trimslice
   DEVICE_TITLE := CompuLab TrimSlice
   DEVICE_DTS := tegra20-trimslice
   DEVICE_PACKAGES := kmod-r8169 kmod-rt2800-usb kmod-rtc-em3027 \
 	kmod-usb-storage wpad-mini
-  SUPPORTED_DEVICES := compulab,trimslice
   UBOOT := trimslice-mmc
 endef
-TARGET_DEVICES += trimslice
+TARGET_DEVICES += compulab_trimslice
 
 $(eval $(call BuildImage))