diff --git a/core/flake.nix b/core/flake.nix
index 7109923..4bc536f 100644
--- a/core/flake.nix
+++ b/core/flake.nix
@@ -3,6 +3,6 @@
 
   outputs = _: rec {
     nixosModules.core = import ./default.nix;
-    nixosModule = nixosModules.core;
+    nixosModules.default = nixosModules.core;
   };
 }
diff --git a/declarative/flake.nix b/declarative/flake.nix
index 9960b25..4cce8e5 100644
--- a/declarative/flake.nix
+++ b/declarative/flake.nix
@@ -3,6 +3,6 @@
 
   outputs = inputs@{ self, nixpkgs }: rec {
     nixosModules.declarative = import ./default.nix inputs;
-    nixosModule = nixosModules.declarative;
+    nixosModules.default = nixosModules.declarative;
   };
 }
diff --git a/flake.nix b/flake.nix
index cd480f4..c1327c6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,15 +29,15 @@
 
     sharedOverlays = [
       devshell.overlay
-      self.overlay
+      self.overlays.default
     ];
 
-    overlay = import tool/overlay.nix;
+    overlays.default = import tool/overlay.nix;
 
     nixosModules.core = import ./core;
     nixosModules.declarative = import ./declarative inputs;
 
-    defaultTemplate = {
+    templates.default = {
       description = "Example guest configurations";
       path = ./template;
     };
@@ -47,9 +47,8 @@
         inherit (channels.nixpkgs) miniguest;
         default = miniguest;
       };
-      defaultPackage = packages.default;
-      defaultApp = fup.lib.mkApp { drv = packages.default; };
-      devShell = channels.nixpkgs.callPackage nix/devshell.nix { };
+      apps.default = fup.lib.mkApp { drv = packages.default; };
+      devShells.default = channels.nixpkgs.callPackage nix/devshell.nix { };
       checks = import ./checks inputs channels.nixpkgs.system;
     };
   };
diff --git a/tool/flake.nix b/tool/flake.nix
index 3afb032..3cffd21 100644
--- a/tool/flake.nix
+++ b/tool/flake.nix
@@ -2,6 +2,6 @@
   description = "Companion tool for Miniguest";
 
   outputs = _: {
-    overlay = import ./overlay.nix;
+    overlays.default = import ./overlay.nix;
   };
 }