diff --git a/data/io.elementary.code.desktop.in.in b/data/io.elementary.code.desktop.in.in
index c4b51bf5b..b0bf43b37 100644
--- a/data/io.elementary.code.desktop.in.in
+++ b/data/io.elementary.code.desktop.in.in
@@ -4,7 +4,6 @@ Name=@NAME@
 Comment=Edit code files
 GenericName=Code Editor
 Exec=@EXEC_NAME@ %U
-Icon=io.elementary.code
 Terminal=false
 Categories=Development;GTK;IDE;WebDevelopment;
 Keywords=text;IDE;scratch;code;
diff --git a/data/io.elementary.code.gschema.xml b/data/io.elementary.code.gschema.xml
index 397b293ed..54a7f6056 100644
--- a/data/io.elementary.code.gschema.xml
+++ b/data/io.elementary.code.gschema.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
-  <enum id="io.elementary.code.window-states">
+  <enum id="com.github.jeremypw.code-testing.window-states">
     <value nick="Normal" value="0" />
     <value nick="Maximized" value="1" />
     <value nick="Fullscreen" value="2" />
   </enum>
-  <enum id="io.elementary.code.draw-spaces-states">
+  <enum id="com.github.jeremypw.code-testing.draw-spaces-states">
     <value nick="Never" value="0" />
     <value nick="For Selection" value="1" />
     <value nick="Always" value="2" />
     <value nick="Current" value="4" />
   </enum>
-  <enum id="io.elementary.code.case-sensitive-mode">
+  <enum id="com.github.jeremypw.code-testing.case-sensitive-mode">
     <value nick="never" value="0" />
     <value nick="mixed" value="1" />
     <value nick="always" value="2" />
   </enum>
 
-  <schema path="/io/elementary/code/saved-state/" id="io.elementary.code.saved-state" gettext-domain="io.elementary.code">
-    <key name="window-state" enum="io.elementary.code.window-states">
+  <schema path="/com/github/jeremypw/code-testing/saved-state/" id="com.github.jeremypw.code-testing.saved-state" gettext-domain="com.github.jeremypw.code-testing">
+    <key name="window-state" enum="com.github.jeremypw.code-testing.window-states">
       <default>"Normal"</default>
       <summary>The saved state of the window.</summary>
       <description>The saved state of the window.</description>
@@ -65,7 +65,7 @@
     </key>
   </schema>
 
-  <schema path="/io/elementary/code/settings/" id="io.elementary.code.settings" gettext-domain="io.elementary.code">
+  <schema path="/com/github/jeremypw/code-testing/settings/" id="com.github.jeremypw.code-testing.settings" gettext-domain="com.github.jeremypw.code-testing">
     <key type="as" name="plugins-enabled">
       <default>['brackets-completion', 'detect-indent', 'editorconfig']</default>
       <summary>Enabled Plugins</summary>
@@ -106,7 +106,7 @@
       <summary>Highlight Matching Brackets</summary>
       <description>Whether Code should highlight matching brackets.</description>
     </key>
-    <key name="draw-spaces" enum="io.elementary.code.draw-spaces-states">
+    <key name="draw-spaces" enum="com.github.jeremypw.code-testing.draw-spaces-states">
       <default>"For Selection"</default>
       <summary>Draw spaces and tabs with symbols</summary>
       <description>Draw spaces and tabs with symbols. "Never" is deprecated and not exposed in the UI.</description>
@@ -187,7 +187,7 @@
       <summary>Whether search term is a regex expression</summary>
       <description>Whether the search should use the search term as a regex expression for matching.</description>
     </key>
-    <key name="case-sensitive-search" enum="io.elementary.code.case-sensitive-mode">
+    <key name="case-sensitive-search" enum="com.github.jeremypw.code-testing.case-sensitive-mode">
       <default>'mixed'</default>
       <summary>When text search is case sensitive</summary>
       <description>Whether the text search is case sensitive never, always or only when search term is mixed case</description>
@@ -199,7 +199,7 @@
     </key>
   </schema>
 
-  <schema path="/io/elementary/code/services/" id="io.elementary.code.services" gettext-domain="io.elementary.code">
+  <schema path="/com/github/jeremypw/code-testing/services/" id="com.github.jeremypw.code-testing.services" gettext-domain="com.github.jeremypw.code-testing">
     <key name="paste-format-code" type="s">
       <default>'None'</default>
       <summary>Default PasteBin text highlight</summary>
@@ -217,7 +217,7 @@
     </key>
   </schema>
 
-  <schema path="/io/elementary/code/folder-manager/" id="io.elementary.code.folder-manager">
+  <schema path="/com/github/jeremypw/code-testing/folder-manager/" id="com.github.jeremypw.code-testing.folder-manager">
     <key name="opened-folders" type="as">
       <default>[]</default>
       <summary>Opened folders.</summary>
diff --git a/data/meson.build b/data/meson.build
index b28891a23..8d79f5177 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -25,6 +25,7 @@ install_data([
 install_data(
     'io.elementary.code.gschema.xml',
     'io.elementary.code.plugins.spell.gschema.xml',
+    rename: ['com.github.jeremypw.code-testing.gschema.xml', 'com.github.jeremypw.code-testing.plugins.spell.gschema.xml'],
     install_dir: get_option('prefix') / get_option('datadir') / 'glib-2.0' / 'schemas'
 )
 
@@ -46,7 +47,7 @@ desktop_in_file = configure_file(
 
 desktop_file = i18n.merge_file(
     input: desktop_in_file,
-    output: 'io.elementary.code.desktop',
+    output: meson.project_name() + '.desktop',
     po_dir: meson.project_source_root () / 'po' / 'extra',
     type: 'desktop',
     install_dir: get_option('datadir') / 'applications',
diff --git a/meson.build b/meson.build
index 70b437522..3b4a978f5 100644
--- a/meson.build
+++ b/meson.build
@@ -1,10 +1,12 @@
 project(
-    'io.elementary.code',
+    'com.github.jeremypw.code-testing',
     'vala', 'c',
     meson_version: '>= 0.58.0',
     version: '7.4.0'
 )
 
+original_project_name = 'io.elementary.code'
+
 add_project_arguments([
         '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name())
     ],
@@ -41,7 +43,7 @@ posix_dep = meson.get_compiler('vala').find_library('posix')
 vte_dep = dependency('vte-2.91')
 
 code_resources = gnome.compile_resources(
-    'code-resources', 'data/' + meson.project_name() + '.gresource.xml',
+    'code-resources', 'data/' + original_project_name + '.gresource.xml',
     source_dir: 'data'
 )
 
diff --git a/plugins/fuzzy-search/fuzzy-search-indexer.vala b/plugins/fuzzy-search/fuzzy-search-indexer.vala
index 4c02bd344..f1a8df81e 100644
--- a/plugins/fuzzy-search/fuzzy-search-indexer.vala
+++ b/plugins/fuzzy-search/fuzzy-search-indexer.vala
@@ -75,7 +75,7 @@ public class Scratch.Services.FuzzySearchIndexer : GLib.Object {
         processing_queue = new Gee.ConcurrentList<IndexerMessage> ();
         project_paths = new Gee.HashMap<string, Services.SearchProject> ();
 
-        folder_settings = new GLib.Settings ("io.elementary.code.folder-manager");
+        folder_settings = new GLib.Settings (Constants.PROJECT_NAME + ".folder-manager");
         folder_settings.changed["opened-folders"].connect (handle_opened_projects_change);
     }
 
diff --git a/plugins/fuzzy-search/fuzzy-search.vala b/plugins/fuzzy-search/fuzzy-search.vala
index c28a54450..89199f4c3 100644
--- a/plugins/fuzzy-search/fuzzy-search.vala
+++ b/plugins/fuzzy-search/fuzzy-search.vala
@@ -54,7 +54,7 @@ public class Scratch.Plugins.FuzzySearch: Peas.ExtensionBase, Scratch.Services.A
 
             window = w;
 
-            folder_settings = new GLib.Settings ("io.elementary.code.folder-manager");
+            folder_settings = new GLib.Settings (Constants.PROJECT_NAME + ".folder-manager");
             add_actions ();
             folder_settings.changed["opened-folders"].connect (handle_opened_projects_change);
         });
@@ -118,9 +118,7 @@ public class Scratch.Plugins.FuzzySearch: Peas.ExtensionBase, Scratch.Services.A
     }
 
     private void fuzzy_find () {
-        var settings = new GLib.Settings ("io.elementary.code.folder-manager");
-
-        string[] opened_folders = settings.get_strv ("opened-folders");
+        string[] opened_folders = folder_settings.get_strv ("opened-folders");
         if (opened_folders == null || opened_folders.length < 1) {
             return;
         }
diff --git a/src/FolderManager/FileView.vala b/src/FolderManager/FileView.vala
index 61ea03789..3083122af 100644
--- a/src/FolderManager/FileView.vala
+++ b/src/FolderManager/FileView.vala
@@ -73,7 +73,7 @@ public class Scratch.FolderManager.FileView : Code.Widgets.SourceList, Code.Pane
         icon_name = "folder-symbolic";
         title = _("Folders");
 
-        settings = new GLib.Settings ("io.elementary.code.folder-manager");
+        settings = new GLib.Settings (Constants.PROJECT_NAME + ".folder-manager");
 
         git_manager = Scratch.Services.GitManager.get_instance ();