diff --git a/src/model/Server.vala b/src/model/Server.vala
index 1e4bceb..cea8366 100644
--- a/src/model/Server.vala
+++ b/src/model/Server.vala
@@ -18,7 +18,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-namespace FooTerm.Model {
+namespace Footerm.Model {
     public class Server {
         public string hostname;
         public ushort port;
diff --git a/src/newpane.ui b/src/newpane.ui
index 219c104..2d1439b 100644
--- a/src/newpane.ui
+++ b/src/newpane.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="Adw" version="1.0"/>
   <requires lib="gtk" version="4.0"/>
-  <template class="FooTermNewPane" parent="GtkBox">
+  <template class="FootermNewPane" parent="GtkBox">
     <child>
       <object class="GtkStack" id="newpane_stack">
         <child>
@@ -35,7 +35,7 @@
         <child>
           <object class="AdwClamp">
             <child>
-              <object class="FooTermNewServer" id="new_server"></object>
+              <object class="FootermNewServer" id="new_server"></object>
             </child>
           </object>
         </child>"
diff --git a/src/newpane.vala b/src/newpane.vala
index c5515d2..d451928 100644
--- a/src/newpane.vala
+++ b/src/newpane.vala
@@ -18,14 +18,14 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-namespace FooTerm {
+namespace Footerm {
     [GtkTemplate (ui = "/fr/oupson/FooTerm/newpane.ui")]
     public class NewPane : Gtk.Box {
         [GtkChild]
         private unowned Adw.PreferencesGroup server_list;
 
         [GtkChild]
-        private unowned FooTerm.NewServer new_server;
+        private unowned Footerm.NewServer new_server;
 
         [GtkChild]
         private unowned Gtk.Stack newpane_stack;
@@ -33,7 +33,7 @@ namespace FooTerm {
         [GtkChild]
         private unowned Gtk.Button newpane_add_button;
 
-        public signal void on_server_selected(FooTerm.Model.Server server);
+        public signal void on_server_selected(Footerm.Model.Server server);
 
         construct {
             this.new_server.on_new_server.connect((s) => {
diff --git a/src/newserver.ui b/src/newserver.ui
index a6d8ed7..0a12c76 100644
--- a/src/newserver.ui
+++ b/src/newserver.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="FooTermNewServer" parent="GtkBox">
+  <template class="FootermNewServer" parent="GtkBox">
     <property name="margin-bottom">32</property>
     <property name="margin-top">32</property>
     <property name="margin-start">32</property>
diff --git a/src/newserver.vala b/src/newserver.vala
index dd193aa..b7c0d40 100644
--- a/src/newserver.vala
+++ b/src/newserver.vala
@@ -18,10 +18,10 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-namespace FooTerm {
+namespace Footerm {
     [GtkTemplate (ui = "/fr/oupson/FooTerm/newserver.ui")]
     public class NewServer : Gtk.Box {
-         public signal void on_new_server(FooTerm.Model.Server server);
+        public signal void on_new_server(Footerm.Model.Server server);
 
         [GtkChild]
         private unowned Adw.EntryRow hostname_entry;
@@ -52,7 +52,7 @@ namespace FooTerm {
                 // Port is invalid
             }
 
-            this.on_new_server(new FooTerm.Model.Server(hostname, (ushort)port, username, password));
+            this.on_new_server(new Footerm.Model.Server(hostname, (ushort)port, username, password));
         }
     }
 }
diff --git a/src/pane.ui b/src/pane.ui
index 090c71a..fdbfafc 100644
--- a/src/pane.ui
+++ b/src/pane.ui
@@ -1,5 +1,5 @@
 <interface>
-  <template class="FooTermPane" parent="GtkBox">
+  <template class="FootermPane" parent="GtkBox">
 
   </template>
 </interface>
diff --git a/src/pane.vala b/src/pane.vala
index 361aa92..58e53b1 100644
--- a/src/pane.vala
+++ b/src/pane.vala
@@ -18,16 +18,16 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-namespace FooTerm {
+namespace Footerm {
     [GtkTemplate (ui = "/fr/oupson/FooTerm/pane.ui")]
     public class Pane : Gtk.Box {
         construct {
-            var new_pane = new FooTerm.NewPane();
+            var new_pane = new Footerm.NewPane();
             ulong handler_id;
             handler_id = new_pane.on_server_selected.connect((s) => {
                 new_pane.disconnect (handler_id);
                 this.remove(new_pane);
-                this.append(new FooTerm.TerminalPane(s));
+                this.append(new Footerm.TerminalPane(s));
             });
             this.append(new_pane);
         }
diff --git a/src/terminalpane.ui b/src/terminalpane.ui
index 008c8cb..6205281 100644
--- a/src/terminalpane.ui
+++ b/src/terminalpane.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="vte-2.91-gtk4" version="0.70.0"/>
-  <template class="FooTermTerminalPane" parent="GtkBox">
+  <template class="FootermTerminalPane" parent="GtkBox">
     <child>
       <object class="VteTerminal" id="terminal">
         <property name="hexpand">true</property>
diff --git a/src/terminalpane.vala b/src/terminalpane.vala
index 26492f1..6281f01 100644
--- a/src/terminalpane.vala
+++ b/src/terminalpane.vala
@@ -18,7 +18,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-namespace FooTerm {
+namespace Footerm {
     [GtkTemplate (ui = "/fr/oupson/FooTerm/terminalpane.ui")]
     public class TerminalPane : Gtk.Box {
         [GtkChild]
@@ -29,9 +29,9 @@ namespace FooTerm {
         private Socket socket;
         private int slave_pty;
 
-        private FooTerm.Model.Server server;
+        private Footerm.Model.Server server;
 
-        public TerminalPane(FooTerm.Model.Server server) {
+        public TerminalPane(Footerm.Model.Server server) {
             this.server = server;
             this.terminal.set_enable_sixel (true);
             this.connect_to_server();
diff --git a/src/window.vala b/src/window.vala
index 19635e4..3d515f7 100644
--- a/src/window.vala
+++ b/src/window.vala
@@ -31,11 +31,11 @@ namespace Footerm {
         construct {
             var action = new SimpleAction("new_tab", null);
             action.activate.connect (() => {
-                var a = view.append (new FooTerm.Pane());
+                var a = view.append (new Footerm.Pane());
                 a.set_title ("New Pane");
             });
             this.add_action (action);
-            var a = view.append (new FooTerm.Pane());
+            var a = view.append (new Footerm.Pane());
             a.set_title ("New Pane");
         }
     }