diff --git a/_outputs.nix b/_outputs.nix
index 92e981c8..17953176 100644
--- a/_outputs.nix
+++ b/_outputs.nix
@@ -125,7 +125,7 @@
     # For nix-fast-build. I use a custom output to alleviate eval time of this flake. ie. when doing nix flake show
     nixFastChecks = import ./nixFastChecks {inherit perSystem self;};
 
-    homeManagerModules = import ./homeManagerModules self;
+    homeManagerModules = import ./homeManagerModules {inherit self;};
 
     nixosModules = import ./modules {inherit self;};
 
diff --git a/apps/default.nix b/apps/default.nix
index 0306c3b9..d7ba62c8 100644
--- a/apps/default.nix
+++ b/apps/default.nix
@@ -3,15 +3,11 @@
   self,
   ...
 }: let
-  inherit (pkgs.lib) getExe mapAttrs' nameValuePair removePrefix;
+  inherit (pkgs.lib) getExe mapAttrs;
 
   mkApp = pkg: {
     program = getExe pkg;
     type = "app";
   };
 in
-  mapAttrs' (
-    n: v:
-      nameValuePair (removePrefix "app-" n) (mkApp v)
-  )
-  self.appsPackages.${pkgs.system}
+  mapAttrs (n: v: mkApp v) self.appsPackages.${pkgs.system}
diff --git a/apps/gen-docs/script.sh b/apps/gen-docs/script.sh
index 3ae5510f..22f2c229 100755
--- a/apps/gen-docs/script.sh
+++ b/apps/gen-docs/script.sh
@@ -20,7 +20,7 @@ substituteModule() {
     ) -t markdown --template "$FLAKE/apps/gen-docs/templates/$1.md" -o "$FLAKE/$1/README.md"
 }
 
-# TODO: add lib, nixFastChecks, overlays, scopedPackages
+# TODO: add overlays, scopedPackages
 substitute "appsPackages" "apps" "getPackageMeta"
 substitute "nixosConfigurations" "configurations" "getConfigMeta"
 substitute "devShells" "devShells" "getPackageMeta"
diff --git a/apps/packages.nix b/apps/packages.nix
index fd3ecf61..1b29e0e5 100644
--- a/apps/packages.nix
+++ b/apps/packages.nix
@@ -8,7 +8,7 @@
   buildApp = attrs: (pkgs.callPackage ./buildApp.nix ({} // inputs // attrs));
   callPackage = file: pkgs.callPackage file ({inherit buildApp;} // inputs);
 in
-  listToAttrs (map (x: nameValuePair "app-${x}" (callPackage ./${x})) [
+  listToAttrs (map (x: nameValuePair x (callPackage ./${x})) [
     "extract-subs"
     "gen-docs"
     "update-sources"
diff --git a/lib/default.nix b/lib/default.nix
index 6e459e00..3c0bd0b2 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,3 +1,4 @@
+# TODO: add README and document lib
 {
   perSystem,
   inputs,