diff --git a/service-containers-agnostic/constructors.nix b/service-containers-agnostic/constructors.nix
index 1901ea6..7cf783b 100644
--- a/service-containers-agnostic/constructors.nix
+++ b/service-containers-agnostic/constructors.nix
@@ -81,7 +81,7 @@ in
     });
   };
 
-  extendableSupervisord = import ./supervisord/extendable-supervisord.nix {
+  extendableSupervisord = import ./supervisord/extendable.nix {
     inherit libDir;
     inherit (pkgs) lib;
     supervisordConstructorFun = constructors.extendableSupervisord;
diff --git a/service-containers-agnostic/supervisord/extendable-supervisord.nix b/service-containers-agnostic/supervisord/extendable.nix
similarity index 100%
rename from service-containers-agnostic/supervisord/extendable-supervisord.nix
rename to service-containers-agnostic/supervisord/extendable.nix
diff --git a/services-agnostic/constructors.nix b/services-agnostic/constructors.nix
index 92a268f..ab4291f 100644
--- a/services-agnostic/constructors.nix
+++ b/services-agnostic/constructors.nix
@@ -132,12 +132,12 @@ in
     inherit (pkgs) lib nginx writeTextFile;
   };
 
-  nginxReverseProxyHostBased = import ./nginx/nginx-reverse-proxy-hostbased.nix {
+  nginxReverseProxyHostBased = import ./nginx/reverse-proxy-hostbased.nix {
     inherit createManagedProcess stateDir runtimeDir cacheDir forceDisableUserChange;
     inherit (pkgs) stdenv lib writeTextFile nginx;
   };
 
-  nginxReverseProxyPathBased = import ./nginx/nginx-reverse-proxy-pathbased.nix {
+  nginxReverseProxyPathBased = import ./nginx/reverse-proxy-pathbased.nix {
     inherit createManagedProcess stateDir runtimeDir cacheDir forceDisableUserChange;
     inherit (pkgs) stdenv lib writeTextFile nginx;
   };
@@ -172,7 +172,7 @@ in
     inherit (pkgs.pythonPackages) supervisor;
   };
 
-  extendableSupervisord = import ./supervisord/extendable-supervisord.nix {
+  extendableSupervisord = import ./supervisord/extendable.nix {
     inherit createManagedProcess libDir runtimeDir logDir;
     inherit (pkgs) writeTextFile;
     inherit (pkgs.pythonPackages) supervisor;
diff --git a/services-agnostic/nginx/nginx-reverse-proxy-hostbased.nix b/services-agnostic/nginx/reverse-proxy-hostbased.nix
similarity index 100%
rename from services-agnostic/nginx/nginx-reverse-proxy-hostbased.nix
rename to services-agnostic/nginx/reverse-proxy-hostbased.nix
diff --git a/services-agnostic/nginx/nginx-reverse-proxy-pathbased.nix b/services-agnostic/nginx/reverse-proxy-pathbased.nix
similarity index 100%
rename from services-agnostic/nginx/nginx-reverse-proxy-pathbased.nix
rename to services-agnostic/nginx/reverse-proxy-pathbased.nix
diff --git a/services-agnostic/supervisord/extendable-supervisord.nix b/services-agnostic/supervisord/extendable.nix
similarity index 100%
rename from services-agnostic/supervisord/extendable-supervisord.nix
rename to services-agnostic/supervisord/extendable.nix