diff --git a/pkgs/enigma.nix b/pkgs/enigma.nix
index 4a2ab95..37b0caa 100644
--- a/pkgs/enigma.nix
+++ b/pkgs/enigma.nix
@@ -7,7 +7,7 @@
   copyDesktopItems,
 }:
 stdenv.mkDerivation (finalAttrs: {
-  pname = "enigma";
+  name = "enigma";
   version = "2.5.2";
 
   src = fetchurl {
@@ -22,11 +22,11 @@ stdenv.mkDerivation (finalAttrs: {
     copyDesktopItems
   ];
 
-  installPhase = ''
+  installPhase = with finalAttrs; ''
     runHook preInstall
 
-    install -Dm644 $src $out/share/enigma.jar
-    makeWrapper ${jdk}/bin/java $out/bin/enigma --add-flags "-jar $out/share/enigma.jar"
+    install -Dm644 $src $out/share/${name}/${name}.jar
+    makeWrapper ${jdk}/bin/java $out/bin/${name} --add-flags "-jar $out/share/${name}/${name}.jar"
 
     runHook postInstall
   '';
diff --git a/pkgs/vineflower.nix b/pkgs/vineflower.nix
index 58704d8..ea6fe75 100644
--- a/pkgs/vineflower.nix
+++ b/pkgs/vineflower.nix
@@ -5,11 +5,13 @@
   jre_headless,
 }:
 stdenv.mkDerivation (finalAttrs: {
-  pname = "vineflower";
+  name = "vineflower";
   version = "1.10.1";
 
   src = fetchurl {
-    url = "https://github.com/Vineflower/vineflower/releases/download/${finalAttrs.version}/vineflower-${finalAttrs.version}.jar";
+    url =
+      with finalAttrs;
+      "https://github.com/Vineflower/vineflower/releases/download/${version}/vineflower-${version}.jar";
     hash = "sha256-ubII5QeTtkZXprYpIGdSZhP1Sd50BfkkNiSwL0J25Ak=";
   };
 
@@ -17,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontUnpack = true;
 
-  installPhase = ''
+  installPhase = with finalAttrs; ''
     runHook preInstall
 
-    install -Dm644 $src $out/share/vineflower.jar
-    makeWrapper ${jre_headless}/bin/java $out/bin/vineflower --add-flags "-jar $out/share/vineflower.jar"
+    install -Dm644 $src $out/share/${name}.jar
+    makeWrapper ${jre_headless}/bin/java $out/bin/${name} --add-flags "-jar $out/share/${name}/${name}.jar"
 
     runHook postInstall
   '';