diff --git a/SparkleShare/Linux/Controller.cs b/SparkleShare/Linux/Controller.cs
index aa9447b7..51bb14fb 100644
--- a/SparkleShare/Linux/Controller.cs
+++ b/SparkleShare/Linux/Controller.cs
@@ -47,13 +47,13 @@ namespace SparkleShare {
 
         public override void SetFolderIcon ()
         {
-            var gvfs_set_attribute = new Command ("gvfs-set-attribute", "\"" + Configuration.DefaultConfiguration.FoldersPath + "\" " +
+            var gio_set = new Command ("gio", "set \"" + Configuration.DefaultConfiguration.FoldersPath + "\" " +
                 "metadata::custom-icon-name org.sparkleshare.SparkleShare");
 
             string XDG_DATA_HOME = Path.Combine (Config.HomePath, ".local", "share");
-            gvfs_set_attribute.StartInfo.EnvironmentVariables ["XDG_DATA_HOME"] = XDG_DATA_HOME;
+            gio_set.StartInfo.EnvironmentVariables ["XDG_DATA_HOME"] = XDG_DATA_HOME;
 
-            gvfs_set_attribute.StartAndWaitForExit ();
+            gio_set.StartAndWaitForExit ();
         }
 
 
diff --git a/Sparkles/Git/GitCommand.cs b/Sparkles/Git/Git.Command.cs
similarity index 100%
rename from Sparkles/Git/GitCommand.cs
rename to Sparkles/Git/Git.Command.cs
diff --git a/Sparkles/Git/GitFetcher.cs b/Sparkles/Git/Git.Fetcher.cs
similarity index 100%
rename from Sparkles/Git/GitFetcher.cs
rename to Sparkles/Git/Git.Fetcher.cs
diff --git a/Sparkles/Git/GitRepository.cs b/Sparkles/Git/Git.Repository.cs
similarity index 100%
rename from Sparkles/Git/GitRepository.cs
rename to Sparkles/Git/Git.Repository.cs
diff --git a/Sparkles/Git/meson.build b/Sparkles/Git/meson.build
index 5022a4a4..b9d55079 100644
--- a/Sparkles/Git/meson.build
+++ b/Sparkles/Git/meson.build
@@ -1,6 +1,6 @@
-sparkles_git_src = ['GitCommand.cs',
-    'GitFetcher.cs',
-    'GitRepository.cs']
+sparkles_git_src = ['Git.Command.cs',
+    'Git.Fetcher.cs',
+    'Git.Repository.cs']
 
 sparkles_git = library('Sparkles.Git',
     link_with: sparkles,