diff --git a/targets/brcm2708-bcm2708 b/targets/brcm2708-bcm2708
index 15ebd193..4d4068ab 100644
--- a/targets/brcm2708-bcm2708
+++ b/targets/brcm2708-bcm2708
@@ -1,7 +1,11 @@
 include 'brcm2708.inc'
 
-device('raspberry-pi', 'rpi', {
+device('raspberrypi-model-b', 'rpi', {
 	manifest_aliases = {
+		'raspberrypi-model-b-plus',
+		'raspberrypi-model-b-rev2',
+
+		-- from Gluon 2019.1 and older
 		'raspberry-pi-model-b-rev-2',
 		'raspberry-pi-model-b-plus-rev-1.2',
 	},
diff --git a/targets/brcm2708-bcm2709 b/targets/brcm2708-bcm2709
index e0fbf0cd..e5af9c89 100644
--- a/targets/brcm2708-bcm2709
+++ b/targets/brcm2708-bcm2709
@@ -1,7 +1,8 @@
 include 'brcm2708.inc'
 
-device('raspberry-pi-2', 'rpi-2', {
+device('raspberrypi-2-model-b', 'rpi-2', {
 	manifest_aliases = {
+		-- from Gluon 2019.1 and older
 		'raspberry-pi-2-model-b-rev-1.1',
 	},
 })
diff --git a/targets/brcm2708-bcm2710 b/targets/brcm2708-bcm2710
index fc647365..1cf9ef36 100644
--- a/targets/brcm2708-bcm2710
+++ b/targets/brcm2708-bcm2710
@@ -1,7 +1,10 @@
 include 'brcm2708.inc'
 
-device('raspberry-pi-3', 'rpi-3', {
+device('raspberrypi-3-model-b', 'rpi-3', {
 	manifest_aliases = {
+		'raspberrypi-3-model-b-plus',
+
+		-- from Gluon 2019.1 and older
 		'raspberry-pi-3-model-b-rev-1.2',
 	},
 })