diff --git a/pkgs/tools/networking/connman/connman.nix b/pkgs/tools/networking/connman/connman/default.nix
similarity index 100%
rename from pkgs/tools/networking/connman/connman.nix
rename to pkgs/tools/networking/connman/connman/default.nix
diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index ccceaa30b043..12646617b58a 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -2,9 +2,9 @@
 
 {
   # All the defaults
-  connman = callPackage ./connman.nix { };
+  connman = callPackage ./connman { };
 
-  connmanFull = callPackage ./connman.nix {
+  connmanFull = connman.override {
     # TODO: Why is this in `connmanFull` and not the default build? See TODO in
     # nixos/modules/services/networking/connman.nix (near the assertions)
     enableNetworkManager = true;
@@ -14,7 +14,7 @@
     enableTist = true;
   };
 
-  connmanMinimal = callPackage ./connman.nix {
+  connmanMinimal = connman.override {
     enableOpenconnect = false;
     enableOpenvpn = false;
     enableVpnc = false;