diff --git a/dts/msm8916/msm8216-samsung-r07.dts b/dts/msm8916/msm8216-samsung-r07.dts
index 54ce80599..64c25cc8b 100644
--- a/dts/msm8916/msm8216-samsung-r07.dts
+++ b/dts/msm8916/msm8216-samsung-r07.dts
@@ -14,6 +14,6 @@
 		model = "Samsung Galaxy Grand Prime 3G (SM-G530H)";
 		compatible = "samsung,fortuna3g", "qcom,msm8916", "lk2nd,device";
 		lk2nd,match-bootloader = "G530H*";
-		#include "msm8916-samsung-gprime.dtsi"
+		#include "msm8916-samsung-fortuna.dtsi"
 	};
 };
diff --git a/dts/msm8916/msm8916-samsung-gprime.dtsi b/dts/msm8916/msm8916-samsung-fortuna.dtsi
similarity index 100%
rename from dts/msm8916/msm8916-samsung-gprime.dtsi
rename to dts/msm8916/msm8916-samsung-fortuna.dtsi
diff --git a/dts/msm8916/msm8916-samsung-r00.dts b/dts/msm8916/msm8916-samsung-r00.dts
index b6edcc5c4..38adb11ea 100644
--- a/dts/msm8916/msm8916-samsung-r00.dts
+++ b/dts/msm8916/msm8916-samsung-r00.dts
@@ -36,6 +36,6 @@
 		qcom,msm-id = <206 0>;
 		qcom,board-id = <0xCE08FF01 1>;
 
-		#include "msm8916-samsung-cprime.dtsi"
+		#include "msm8916-samsung-rossa.dtsi"
 	};
 };
diff --git a/dts/msm8916/msm8916-samsung-r01.dts b/dts/msm8916/msm8916-samsung-r01.dts
index 4640e286b..74b482eb6 100644
--- a/dts/msm8916/msm8916-samsung-r01.dts
+++ b/dts/msm8916/msm8916-samsung-r01.dts
@@ -65,13 +65,13 @@
 		model = "Samsung Galaxy Core Prime LTE (SM-G360F)";
 		compatible = "samsung,coreprimelte", "qcom,msm8916", "lk2nd,device";
 		lk2nd,match-bootloader = "G360F*";
-		#include "msm8916-samsung-cprime.dtsi"
+		#include "msm8916-samsung-rossa.dtsi"
 	};
 
 	rossaltedv {
 		model = "Samsung Galaxy Core Prime LTE (SM-G360G)";
 		compatible = "samsung,rossaltexsa", "qcom,msm8916", "lk2nd,device";
 		lk2nd,match-bootloader = "G360GD*";
-		#include "msm8916-samsung-cprime.dtsi"
+		#include "msm8916-samsung-rossa.dtsi"
 	};
 };
diff --git a/dts/msm8916/msm8916-samsung-r02.dts b/dts/msm8916/msm8916-samsung-r02.dts
index b5ed30dd1..6fd7903ab 100644
--- a/dts/msm8916/msm8916-samsung-r02.dts
+++ b/dts/msm8916/msm8916-samsung-r02.dts
@@ -27,14 +27,14 @@
 		model = "Samsung Galaxy Grand Prime (CAN)";
 		compatible = "samsung,gprimeltecan", "qcom,msm8916", "lk2nd,device";
 		lk2nd,match-bootloader = "G530W*";
-		#include "msm8916-samsung-gprime.dtsi"
+		#include "msm8916-samsung-fortuna.dtsi"
 	};
 
-	gprimeltexx {
+	grandprimelte {
 		model = "Samsung Galaxy Grand Prime (SM-G530FZ)";
-		compatible = "samsung,gprimeltexx", "qcom,msm8916", "lk2nd,device";
+		compatible = "samsung,grandprimelte", "qcom,msm8916", "lk2nd,device";
 		lk2nd,match-bootloader = "G530FZ*";
-		#include "msm8916-samsung-gprime.dtsi"
+		#include "msm8916-samsung-fortuna.dtsi"
 	};
 
 	/*
diff --git a/dts/msm8916/msm8916-samsung-r03.dts b/dts/msm8916/msm8916-samsung-r03.dts
index 76a5c506d..1b391e583 100644
--- a/dts/msm8916/msm8916-samsung-r03.dts
+++ b/dts/msm8916/msm8916-samsung-r03.dts
@@ -42,13 +42,13 @@
 		};
 	};
 
-	gprimeltexx {
+	grandprimelte {
 		model = "Samsung Galaxy Grand Prime (SM-G530FZ)";
-		compatible = "samsung,gprimeltexx", "qcom,msm8916", "lk2nd,device";
+		compatible = "samsung,grandprimelte", "qcom,msm8916", "lk2nd,device";
 		lk2nd,match-bootloader = "G530FZ*";
 		qcom,msm-id = <206 0>;
 		qcom,board-id = <0xCE08FF01 2>;
-		#include "msm8916-samsung-gprime.dtsi"
+		#include "msm8916-samsung-fortuna.dtsi"
 	};
 
 	j5xltecmcc {
@@ -90,6 +90,6 @@
 		model = "Samsung Galaxy Core Prime LTE (SM-G360G)";
 		compatible = "samsung,rossaltexsa", "qcom,msm8916", "lk2nd,device";
 		lk2nd,match-bootloader = "G360GZT*";
-		#include "msm8916-samsung-cprime.dtsi"
+		#include "msm8916-samsung-rossa.dtsi"
 	};
 };
diff --git a/dts/msm8916/msm8916-samsung-r04.dts b/dts/msm8916/msm8916-samsung-r04.dts
index b4db4f115..059e3c9a1 100644
--- a/dts/msm8916/msm8916-samsung-r04.dts
+++ b/dts/msm8916/msm8916-samsung-r04.dts
@@ -73,7 +73,7 @@
 		qcom,msm-id = <206 0>;
 		qcom,board-id = <0xCE08FF01 1>;
 
-		#include "msm8916-samsung-cprime.dtsi"
+		#include "msm8916-samsung-rossa.dtsi"
 	};
 
 	grandmaxlteub {
diff --git a/dts/msm8916/msm8916-samsung-r11.dts b/dts/msm8916/msm8916-samsung-r11.dts
index 5f9a2556c..b748ef994 100644
--- a/dts/msm8916/msm8916-samsung-r11.dts
+++ b/dts/msm8916/msm8916-samsung-r11.dts
@@ -42,6 +42,6 @@
 		model = "Samsung Galaxy Grand Prime (SM-G530Y)";
 		compatible = "samsung,fortunaltezt", "qcom,msm8916", "lk2nd,device";
 		lk2nd,match-bootloader = "G530Y*";
-		#include "msm8916-samsung-gprime.dtsi"
+		#include "msm8916-samsung-fortuna.dtsi"
 	};
 };
diff --git a/dts/msm8916/msm8916-samsung-cprime.dtsi b/dts/msm8916/msm8916-samsung-rossa.dtsi
similarity index 100%
rename from dts/msm8916/msm8916-samsung-cprime.dtsi
rename to dts/msm8916/msm8916-samsung-rossa.dtsi
diff --git a/dts/msm8916/msm8929-samsung-r04.dts b/dts/msm8916/msm8929-samsung-r04.dts
index 7b7013083..ab203f74e 100644
--- a/dts/msm8916/msm8929-samsung-r04.dts
+++ b/dts/msm8916/msm8929-samsung-r04.dts
@@ -46,7 +46,7 @@
 		qcom,msm-id = <248 0>;
 		qcom,board-id = <0xF808FF01 7>;
 
-		#include "msm8916-samsung-gprime.dtsi"
+		#include "msm8916-samsung-fortuna.dtsi"
 	};
 
 	a3 {