diff --git a/overlay_templates/ADC.template b/overlay_templates/ADC.template
index c60a4f8..d8e4175 100644
--- a/overlay_templates/ADC.template
+++ b/overlay_templates/ADC.template
@@ -1,13 +1,13 @@
 /dts-v1/;
 /plugin/;
 / {
-    compatible = "$platform";
+    compatible = "$Platform";
     fragment@0{
         target-path = "/";
         __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 4343831..a835f69 100644
--- a/overlay_templates/IntelFanConnector.template
+++ b/overlay_templates/IntelFanConnector.template
@@ -1,17 +1,17 @@
 /dts-v1/;
 /plugin/;
 / {
-    compatible = "$platform";
+    compatible = "$Platform";
     fragment@0{
         target = <&pwm_tacho>;
         __overlay__{
             #address-cells = <1>;
             #size-cells = <0>;
             status = "okay";
-            oemname$pwm = "$Name";
-            fan@$pwm {
-                reg = <$pwm>;
-                aspeed,fan-tach-ch = /bits/ 8 <$tachs>;
+            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 33cba50..34a97e3 100644
--- a/overlay_templates/IntelFruDevice.template
+++ b/overlay_templates/IntelFruDevice.template
@@ -1,16 +1,16 @@
 /dts-v1/;
 /plugin/;
 / {
-    compatible = "$platform";
+    compatible = "$Platform";
     fragment@0{
-        target = <&i2c$bus>;
+        target = <&i2c$Bus>;
         __overlay__{
             #address-cells = <1>;
             #size-cells = <0>;
             status = "okay";
-            $Name: eeprom@$address {
+            $Name: eeprom@$Address {
                 compatible = "atmel,24c02";
-                reg = <0x$address>;
+                reg = <0x$Address>;
                 oemname1 = "$Name";
                 pagesize = <64>;
             };
diff --git a/overlay_templates/PCA9543Mux.template b/overlay_templates/PCA9543Mux.template
index d85a6c3..bb4b9ea 100644
--- a/overlay_templates/PCA9543Mux.template
+++ b/overlay_templates/PCA9543Mux.template
@@ -1,14 +1,14 @@
 /dts-v1/;
 /plugin/;
 / {
-    compatible = "$platform";
+    compatible = "$Platform";
     fragment@0{
-        target = <&i2c$bus>;
+        target = <&i2c$Bus>;
         __overlay__{
             status = "okay";
-            $Name: smbus_mux@$address {
+            $Name: smbus_mux@$Address {
                 compatible = "nxp,pca9543";
-                reg = <0x$address>;
+                reg = <0x$Address>;
                 #address-cells = <1>;
                 #size-cells = <0>;
                 oemname1 = "$Name";
diff --git a/overlay_templates/PCA9545Mux.template b/overlay_templates/PCA9545Mux.template
index a106277..7108b80 100644
--- a/overlay_templates/PCA9545Mux.template
+++ b/overlay_templates/PCA9545Mux.template
@@ -1,14 +1,14 @@
 /dts-v1/;
 /plugin/;
 / {
-    compatible = "$platform";
+    compatible = "$Platform";
     fragment@0{
-        target = <&i2c$bus>;
+        target = <&i2c$Bus>;
         __overlay__{
             status = "okay";
-            $Name: smbus_mux@$address {
+            $Name: smbus_mux@$Address {
                 compatible = "nxp,pca9545";
-                reg = <0x$address>;
+                reg = <0x$Address>;
                 #address-cells = <1>;
                 #size-cells = <0>;
                 oemname1 = "$Name";
diff --git a/overlay_templates/SkylakeCPU.template b/overlay_templates/SkylakeCPU.template
index 34b10dd..882a144 100644
--- a/overlay_templates/SkylakeCPU.template
+++ b/overlay_templates/SkylakeCPU.template
@@ -1,17 +1,17 @@
 /dts-v1/;
 /plugin/;
 / {
-    compatible = "$platform";
+    compatible = "$Platform";
     fragment@0{
         target = <&peci0>;
         __overlay__{
             #address-cells = <1>;
             #size-cells = <0>;
 
-            Skylake_CPU_$cpu_id: peci-client@$address {
+            Skylake_CPU_$CpuID: peci-client@$Address {
                 compatible = "intel,peci-client";
                 oemname1 = "$Name";
-                reg = <0x$address>;
+                reg = <0x$Address>;
                 status = "okay";
             };
         };
diff --git a/overlay_templates/Symbol.template b/overlay_templates/Symbol.template
index 7d430b2..f6ec38d 100644
--- a/overlay_templates/Symbol.template
+++ b/overlay_templates/Symbol.template
@@ -1,11 +1,11 @@
 /dts-v1/;
 /plugin/;
 / {
-    compatible = "$platform";
+    compatible = "$Platform";
     fragment@0{
         target-path = "/__symbols__";
         __overlay__{
-           i2c$bus = "$path";
+           i2c$Bus = "$Path";
         };
     };
 };
\ No newline at end of file
diff --git a/overlay_templates/TMP421.template b/overlay_templates/TMP421.template
index 745d824..b819651 100644
--- a/overlay_templates/TMP421.template
+++ b/overlay_templates/TMP421.template
@@ -1,16 +1,16 @@
 /dts-v1/;
 /plugin/;
 / {
-    compatible = "$platform";
+    compatible = "$Platform";
     fragment@0{
-        target = <&i2c$bus>;
+        target = <&i2c$Bus>;
         __overlay__{
             #address-cells = <1>;
             #size-cells = <0>;
             status = "okay";
-            $Name$Name1: tmp421@$address {
+            $Name$Name1: tmp421@$Address {
                 compatible = "ti,tmp421";
-                reg = <0x$address>;
+                reg = <0x$Address>;
                 oemname1 = "$Name";
                 oemname2 = "$Name1";
                 scale = "-3";
diff --git a/overlay_templates/TMP75.template b/overlay_templates/TMP75.template
index ddb5607..164c9ec 100644
--- a/overlay_templates/TMP75.template
+++ b/overlay_templates/TMP75.template
@@ -1,16 +1,16 @@
 /dts-v1/;
 /plugin/;
 / {
-    compatible = "$platform";
+    compatible = "$Platform";
     fragment@0{
-        target = <&i2c$bus>;
+        target = <&i2c$Bus>;
         __overlay__{
             #address-cells = <1>;
             #size-cells = <0>;
             status = "okay";
-            $Name: tmp75@$address {
+            $Name: tmp75@$Address {
                 compatible = "ti,tmp75";
-                reg = <0x$address>;
+                reg = <0x$Address>;
                 oemname1 = "$Name";
                 scale = "-3";
             };
diff --git a/overlay_templates/pmbus.template b/overlay_templates/pmbus.template
index 7aca62a..ce1df8e 100644
--- a/overlay_templates/pmbus.template
+++ b/overlay_templates/pmbus.template
@@ -1,16 +1,16 @@
 /dts-v1/;
 /plugin/;
 / {
-    compatible = "$platform";
+    compatible = "$Platform";
     fragment@0{
-        target = <&i2c$bus>;
+        target = <&i2c$Bus>;
         __overlay__{
             #address-cells = <1>;
             #size-cells = <0>;
             status = "okay";
-            $Name: pmbus@$address {
+            $Name: pmbus@$Address {
                 compatible = "pmbus";
-                reg = <0x$address>;
+                reg = <0x$Address>;
                 oemname1 = "$Name";
             };
         };