diff --git a/flake.lock b/flake.lock
index 4dbdcfe..af52f2f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -32,11 +32,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773596707,
-        "narHash": "sha256-EiAfZo8iTgCgMbJihNnwZGISCVb3Ue/5uU1XtF9CfkA=",
+        "lastModified": 1774458847,
+        "narHash": "sha256-u0Gs2XBFd1tStEfTXqXJ/RpsDWrGUu5NfdWH/z98LUk=",
         "ref": "refs/heads/main",
-        "rev": "ef0da7582c830910620114ce02b4041f32993a53",
-        "revCount": 5,
+        "rev": "7f395bd9b3e6af2de6b17d9383bd621ad3849f1c",
+        "revCount": 6,
         "type": "git",
         "url": "ssh://gitea@git.gardling.com/titaniumtown/arr-init"
       },
diff --git a/services/arr/init.nix b/services/arr/init.nix
index d52a989..f6ff386 100644
--- a/services/arr/init.nix
+++ b/services/arr/init.nix
@@ -60,6 +60,18 @@
       dataDir = service_configs.sonarr.dataDir;
       healthChecks = true;
       rootFolders = [ service_configs.media.tvDir ];
+      naming = {
+        renameEpisodes = true;
+        replaceIllegalCharacters = true;
+        standardEpisodeFormat =
+          "{Series Title} - S{season:00}E{episode:00} - {Episode Title} {Quality Full}";
+        dailyEpisodeFormat =
+          "{Series Title} - {Air-Date} - {Episode Title} {Quality Full}";
+        animeEpisodeFormat =
+          "{Series Title} - S{season:00}E{episode:00} - {Episode Title} {Quality Full}";
+        seasonFolderFormat = "Season {season}";
+        seriesFolderFormat = "{Series Title}";
+      };
       downloadClients = [
         {
           name = "qBittorrent";
@@ -83,6 +95,12 @@
       dataDir = service_configs.radarr.dataDir;
       healthChecks = true;
       rootFolders = [ service_configs.media.moviesDir ];
+      naming = {
+        renameMovies = true;
+        replaceIllegalCharacters = true;
+        standardMovieFormat = "{Movie Title} ({Release Year}) {Quality Full}";
+        movieFolderFormat = "{Movie Title} ({Release Year})";
+      };
       downloadClients = [
         {
           name = "qBittorrent";