diff --git a/resources/ui/adw/fire.ui b/resources/ui/adw/fire.ui
index b424437..f278814 100644
--- a/resources/ui/adw/fire.ui
+++ b/resources/ui/adw/fire.ui
@@ -69,7 +69,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
             <property name="value-pos">left</property>
             <property name="width-request">300</property>
             <property name="adjustment">
-              <object class="GtkAdjustment" id="flame-scale">
+              <object class="GtkAdjustment" id="fire-scale">
                 <property name="upper">3</property>
                 <property name="lower">0.1</property>
                 <property name="step-increment">0.01</property>
@@ -79,7 +79,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
           </object>
         </child>
         <child>
-          <object class="GtkButton" id="reset-flame-scale">
+          <object class="GtkButton" id="reset-fire-scale">
             <property name="icon-name">edit-clear-symbolic</property>
             <property name="valign">center</property>
             <property name="tooltip-text" translatable="yes">Reset to Default Value</property>
@@ -102,7 +102,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
             <property name="value-pos">left</property>
             <property name="width-request">300</property>
             <property name="adjustment">
-              <object class="GtkAdjustment" id="flame-movement-speed">
+              <object class="GtkAdjustment" id="fire-movement-speed">
                 <property name="upper">2.0</property>
                 <property name="lower">-2.0</property>
                 <property name="step-increment">0.01</property>
@@ -112,7 +112,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
           </object>
         </child>
         <child>
-          <object class="GtkButton" id="reset-flame-movement-speed">
+          <object class="GtkButton" id="reset-fire-movement-speed">
             <property name="icon-name">edit-clear-symbolic</property>
             <property name="valign">center</property>
             <property name="tooltip-text" translatable="yes">Reset to Default Value</property>
@@ -128,14 +128,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
       <object class="AdwActionRow">
         <property name="title" translatable="yes">3D Noise</property>
         <property name="subtitle" translatable="yes">Creates a more dynamic fire but requires more GPU power.</property>
-        <property name="activatable-widget">flame-3d-noise</property>
+        <property name="activatable-widget">fire-3d-noise</property>
         <child>
-          <object class="GtkSwitch" id="flame-3d-noise">
+          <object class="GtkSwitch" id="fire-3d-noise">
             <property name="valign">center</property>
           </object>
         </child>
         <child>
-          <object class="GtkButton" id="reset-flame-3d-noise">
+          <object class="GtkButton" id="reset-fire-3d-noise">
             <property name="icon-name">edit-clear-symbolic</property>
             <property name="valign">center</property>
             <property name="tooltip-text" translatable="yes">Reset to Default Value</property>
diff --git a/resources/ui/gtk3/fire.ui b/resources/ui/gtk3/fire.ui
index a047ffe..010fb6a 100644
--- a/resources/ui/gtk3/fire.ui
+++ b/resources/ui/gtk3/fire.ui
@@ -14,14 +14,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <property name="page-increment">100</property>
   </object>
 
-  <object class="GtkAdjustment" id="flame-scale">
+  <object class="GtkAdjustment" id="fire-scale">
     <property name="upper">3</property>
     <property name="lower">0.1</property>
     <property name="step-increment">0.01</property>
     <property name="page-increment">0.1</property>
   </object>
 
-  <object class="GtkAdjustment" id="flame-movement-speed">
+  <object class="GtkAdjustment" id="fire-movement-speed">
     <property name="upper">2.0</property>
     <property name="lower">-2.0</property>
     <property name="step-increment">0.01</property>
@@ -140,11 +140,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
                     <property name="digits">2</property>
                     <property name="value-pos">left</property>
                     <property name="width-request">300</property>
-                    <property name="adjustment">flame-scale</property>
+                    <property name="adjustment">fire-scale</property>
                   </object>
                 </child>
                 <child>
-                  <object class="GtkButton" id="reset-flame-scale">
+                  <object class="GtkButton" id="reset-fire-scale">
                     <child>
                       <object class="GtkImage">
                         <property name="icon-name">edit-clear-symbolic</property>
@@ -184,11 +184,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
                     <property name="digits">2</property>
                     <property name="value-pos">left</property>
                     <property name="width-request">300</property>
-                    <property name="adjustment">flame-movement-speed</property>
+                    <property name="adjustment">fire-movement-speed</property>
                   </object>
                 </child>
                 <child>
-                  <object class="GtkButton" id="reset-flame-movement-speed">
+                  <object class="GtkButton" id="reset-fire-movement-speed">
                     <child>
                       <object class="GtkImage">
                         <property name="icon-name">edit-clear-symbolic</property>
@@ -240,14 +240,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
                   </object>
                 </child>
                 <child>
-                  <object class="GtkSwitch" id="flame-3d-noise">
+                  <object class="GtkSwitch" id="fire-3d-noise">
                     <property name="halign">end</property>
                     <property name="valign">center</property>
                     <property name="margin-end">8</property>
                   </object>
                 </child>
                 <child>
-                  <object class="GtkButton" id="reset-flame-3d-noise">
+                  <object class="GtkButton" id="reset-fire-3d-noise">
                     <child>
                       <object class="GtkImage">
                         <property name="icon-name">edit-clear-symbolic</property>
diff --git a/resources/ui/gtk4/fire.ui b/resources/ui/gtk4/fire.ui
index 2f1564c..9b77741 100644
--- a/resources/ui/gtk4/fire.ui
+++ b/resources/ui/gtk4/fire.ui
@@ -105,7 +105,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                     <property name="value-pos">left</property>
                     <property name="width-request">300</property>
                     <property name="adjustment">
-                      <object class="GtkAdjustment" id="flame-scale">
+                      <object class="GtkAdjustment" id="fire-scale">
                         <property name="upper">3</property>
                         <property name="lower">0.1</property>
                         <property name="step-increment">0.01</property>
@@ -115,7 +115,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                   </object>
                 </child>
                 <child>
-                  <object class="GtkButton" id="reset-flame-scale">
+                  <object class="GtkButton" id="reset-fire-scale">
                     <property name="icon-name">edit-clear-symbolic</property>
                     <property name="tooltip-text" translatable="yes">Reset to Default Value</property>
                     <style>
@@ -151,7 +151,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                     <property name="value-pos">left</property>
                     <property name="width-request">300</property>
                     <property name="adjustment">
-                      <object class="GtkAdjustment" id="flame-movement-speed">
+                      <object class="GtkAdjustment" id="fire-movement-speed">
                         <property name="upper">2.0</property>
                         <property name="lower">-2.0</property>
                         <property name="step-increment">0.01</property>
@@ -161,7 +161,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                   </object>
                 </child>
                 <child>
-                  <object class="GtkButton" id="reset-flame-movement-speed">
+                  <object class="GtkButton" id="reset-fire-movement-speed">
                     <property name="icon-name">edit-clear-symbolic</property>
                     <property name="tooltip-text" translatable="yes">Reset to Default Value</property>
                     <style>
@@ -208,7 +208,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                   </object>
                 </child>
                 <child>
-                  <object class="GtkSwitch" id="flame-3d-noise">
+                  <object class="GtkSwitch" id="fire-3d-noise">
                     <property name="halign">end</property>
                     <property name="valign">center</property>
                     <property name="margin-start">8</property>
@@ -216,7 +216,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                   </object>
                 </child>
                 <child>
-                  <object class="GtkButton" id="reset-flame-3d-noise">
+                  <object class="GtkButton" id="reset-fire-3d-noise">
                     <property name="icon-name">edit-clear-symbolic</property>
                     <property name="tooltip-text" translatable="yes">Reset to Default Value</property>
                     <style>
diff --git a/schemas/org.gnome.shell.extensions.burn-my-windows-profile.gschema.xml b/schemas/org.gnome.shell.extensions.burn-my-windows-profile.gschema.xml
index 639191d..3494de2 100644
--- a/schemas/org.gnome.shell.extensions.burn-my-windows-profile.gschema.xml
+++ b/schemas/org.gnome.shell.extensions.burn-my-windows-profile.gschema.xml
@@ -230,19 +230,19 @@ SPDX-License-Identifier: CC0-1.0
       <description>The time the fire effect takes.</description>
     </key>
 
-    <key name="flame-movement-speed" type="d">
+    <key name="fire-movement-speed" type="d">
       <default>0.5</default>
       <summary>Fire Movement Speed</summary>
       <description>The speed at which the fire moves.</description>
     </key>
 
-    <key name="flame-scale" type="d">
+    <key name="fire-scale" type="d">
       <default>1.0</default>
       <summary>Fire Scale</summary>
       <description>The size of the fire.</description>
     </key>
 
-    <key name="flame-3d-noise" type="b">
+    <key name="fire-3d-noise" type="b">
       <default>false</default>
       <summary>Fire 3D Noise</summary>
       <description>Use a 3D noise for the fire.</description>
diff --git a/src/effects/Fire.js b/src/effects/Fire.js
index 151fc36..168ab24 100644
--- a/src/effects/Fire.js
+++ b/src/effects/Fire.js
@@ -71,9 +71,9 @@ var Fire = class {
         }
 
         // clang-format off
-        shader.set_uniform_float(shader._u3DNoise,       1, [settings.get_boolean('flame-3d-noise')]);
-        shader.set_uniform_float(shader._uScale,         1, [settings.get_double('flame-scale')]);
-        shader.set_uniform_float(shader._uMovementSpeed, 1, [settings.get_double('flame-movement-speed')]);
+        shader.set_uniform_float(shader._u3DNoise,       1, [settings.get_boolean('fire-3d-noise')]);
+        shader.set_uniform_float(shader._uScale,         1, [settings.get_double('fire-scale')]);
+        shader.set_uniform_float(shader._uMovementSpeed, 1, [settings.get_double('fire-movement-speed')]);
         // clang-format on
       });
     });
@@ -108,9 +108,9 @@ var Fire = class {
 
     // Bind all properties.
     dialog.bindAdjustment('fire-animation-time');
-    dialog.bindAdjustment('flame-movement-speed');
-    dialog.bindAdjustment('flame-scale');
-    dialog.bindSwitch('flame-3d-noise');
+    dialog.bindAdjustment('fire-movement-speed');
+    dialog.bindAdjustment('fire-scale');
+    dialog.bindSwitch('fire-3d-noise');
     dialog.bindColorButton('fire-color-1');
     dialog.bindColorButton('fire-color-2');
     dialog.bindColorButton('fire-color-3');
@@ -214,8 +214,8 @@ var Fire = class {
 
         // Load the preset on activation.
         action.connect('activate', () => {
-          dialog.getProfileSettings().set_double('flame-movement-speed', preset.speed);
-          dialog.getProfileSettings().set_double('flame-scale', preset.scale);
+          dialog.getProfileSettings().set_double('fire-movement-speed', preset.speed);
+          dialog.getProfileSettings().set_double('fire-scale', preset.scale);
           dialog.getProfileSettings().set_string('fire-color-1', preset.color1);
           dialog.getProfileSettings().set_string('fire-color-2', preset.color2);
           dialog.getProfileSettings().set_string('fire-color-3', preset.color3);