diff --git a/overlay_templates/ADC.template b/overlay_templates/ADC.template
index a786628..c60a4f8 100644
--- a/overlay_templates/ADC.template
+++ b/overlay_templates/ADC.template
@@ -7,7 +7,7 @@
         __overlay__{
             iio-hwmon {
                 compatible = "iio-hwmon";
-                oemname$index = "$name";
+                oemname$index = "$Name";
             };
         };
 
diff --git a/overlay_templates/IntelFanConnector.template b/overlay_templates/IntelFanConnector.template
index 1e0aad7..4343831 100644
--- a/overlay_templates/IntelFanConnector.template
+++ b/overlay_templates/IntelFanConnector.template
@@ -8,7 +8,7 @@
             #address-cells = <1>;
             #size-cells = <0>;
             status = "okay";
-            oemname$pwm = "$name";
+            oemname$pwm = "$Name";
             fan@$pwm {
                 reg = <$pwm>;
                 aspeed,fan-tach-ch = /bits/ 8 <$tachs>;
diff --git a/overlay_templates/IntelFruDevice.template b/overlay_templates/IntelFruDevice.template
index 0ebb322..a55309e 100644
--- a/overlay_templates/IntelFruDevice.template
+++ b/overlay_templates/IntelFruDevice.template
@@ -8,10 +8,10 @@
             #address-cells = <1>;
             #size-cells = <0>;
             status = "okay";
-            eeprom@$name {
+            eeprom@$Name {
                 compatible = "atmel,24c02";
                 reg = <$address>;
-                oemname1 = "$name";
+                oemname1 = "$Name";
                 pagesize = <64>;
             };
         };
diff --git a/overlay_templates/PCA9543Mux.template b/overlay_templates/PCA9543Mux.template
index 3a0cb1c..49257c4 100644
--- a/overlay_templates/PCA9543Mux.template
+++ b/overlay_templates/PCA9543Mux.template
@@ -6,18 +6,18 @@
         target = <&i2c$bus>;
         __overlay__{
             status = "okay";
-            smbus_mux@$name {
+            smbus_mux@$Name {
                 compatible = "nxp,pca9543";
                 reg = <$address>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                oemname1 = "$name";
-                $name_0: $name@0 {
+                oemname1 = "$Name";
+                $Name_0: $Name@0 {
                     #address-cells = <1>;
                     #size-cells = <0>;
                     reg = <0>;
                 };
-                $name_1: $name@1 {
+                $Name_1: $Name@1 {
                     #address-cells = <1>;
                     #size-cells = <0>;
                     reg = <1>;
diff --git a/overlay_templates/PCA9545Mux.template b/overlay_templates/PCA9545Mux.template
index 930a5ee..9da50a5 100644
--- a/overlay_templates/PCA9545Mux.template
+++ b/overlay_templates/PCA9545Mux.template
@@ -6,28 +6,28 @@
         target = <&i2c$bus>;
         __overlay__{
             status = "okay";
-            smbus_mux@$name {
+            smbus_mux@$Name {
                 compatible = "nxp,pca9545";
                 reg = <$address>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                oemname1 = "$name";
-                $name_0: $name@0 {
+                oemname1 = "$Name";
+                $Name_0: $Name@0 {
                     #address-cells = <1>;
                     #size-cells = <0>;
                     reg = <0>;
                 };
-                $name_1: $name@1 {
+                $Name_1: $Name@1 {
                     #address-cells = <1>;
                     #size-cells = <0>;
                     reg = <1>;
                 };
-                $name_2: $name@2{
+                $Name_2: $Name@2{
                     #address-cells = <1>;
                     #size-cells = <0>;
                     reg = <2>;
                 };
-                $name_3: $name@3{
+                $Name_3: $Name@3{
                     #address-cells = <1>;
                     #size-cells = <0>;
                     reg = <3>;
diff --git a/overlay_templates/SkylakeCPU.template b/overlay_templates/SkylakeCPU.template
index 90672c8..cbaa49a 100644
--- a/overlay_templates/SkylakeCPU.template
+++ b/overlay_templates/SkylakeCPU.template
@@ -10,7 +10,7 @@
 
             peci-client@Skylake_CPU_$cpu_id {
                 compatible = "intel,peci-client", "simple-mfd";
-                oemname1 = "$name";
+                oemname1 = "$Name";
                 reg = <$address>;
                 status = "okay";
             };
diff --git a/overlay_templates/TMP421.template b/overlay_templates/TMP421.template
index 3d32d71..70b2ab4 100644
--- a/overlay_templates/TMP421.template
+++ b/overlay_templates/TMP421.template
@@ -8,11 +8,11 @@
             #address-cells = <1>;
             #size-cells = <0>;
             status = "okay";
-            tmp421@$name$name1 {
+            tmp421@$Name$Name1 {
                 compatible = "ti,tmp421";
                 reg = <$address>;
-                oemname1 = "$name";
-                oemname2 = "$name1";
+                oemname1 = "$Name";
+                oemname2 = "$Name1";
                 scale = "-3";
             };
         };
diff --git a/overlay_templates/TMP75.template b/overlay_templates/TMP75.template
index b60e467..69d70ca 100644
--- a/overlay_templates/TMP75.template
+++ b/overlay_templates/TMP75.template
@@ -8,10 +8,10 @@
             #address-cells = <1>;
             #size-cells = <0>;
             status = "okay";
-            tmp75@$name {
+            tmp75@$Name {
                 compatible = "ti,tmp75";
                 reg = <$address>;
-                oemname1 = "$name";
+                oemname1 = "$Name";
                 scale = "-3";
             };
         };
diff --git a/overlay_templates/pmbus.template b/overlay_templates/pmbus.template
index 11d2338..b48780b 100644
--- a/overlay_templates/pmbus.template
+++ b/overlay_templates/pmbus.template
@@ -8,10 +8,10 @@
             #address-cells = <1>;
             #size-cells = <0>;
             status = "okay";
-            pmbus@$name {
+            pmbus@$Name {
                 compatible = "pmbus";
                 reg = <$address>;
-                oemname1 = "$name";
+                oemname1 = "$Name";
             };
         };
     };