diff --git a/pack.d/64Gram.sh b/pack.d/64Gram.sh
index 5efe75f86fba3678ab10bf26d9330ccc9b75faac..280b6fdd0e8104d8b6a749d36db69df67c348c38 100755
--- a/pack.d/64Gram.sh
+++ b/pack.d/64Gram.sh
@@ -2,7 +2,6 @@
 
 TAR="$1"
 RETURNTARNAME="$2"
-PRODUCT="$(basename $0 .sh)"
 FPRODUCT="Telegram"
 
 . $(dirname $0)/common.sh
diff --git a/pack.d/Telegram.sh b/pack.d/Telegram.sh
index dae2cfd4c0fd509f1c03551458a62f69a8a55812..8d31134829b78cfbb1402af4fb0faa2ca85ffc9d 100755
--- a/pack.d/Telegram.sh
+++ b/pack.d/Telegram.sh
@@ -2,7 +2,6 @@
 
 TAR="$1"
 RETURNTARNAME="$2"
-PRODUCT="$(basename $0 .sh)"
 FPRODUCT="Telegram"
 TPRODUCT="Telegram"
 
diff --git a/pack.d/cuda-z.sh b/pack.d/cuda-z.sh
index 7aaf843de298a70654943721d9cfe45a06d98693..f360af5f3d2b22766fa0aaa2d837c3f4350cbd8d 100755
--- a/pack.d/cuda-z.sh
+++ b/pack.d/cuda-z.sh
@@ -2,7 +2,6 @@
 
 TAR="$1"
 RETURNTARNAME="$2"
-PRODUCT="cuda-z"
 
 . $(dirname $0)/common.sh
 
diff --git a/pack.d/far2l-portable.sh b/pack.d/far2l-portable.sh
index f647889aaf8c6f505a8a633c1845841ca03e01cd..6323fa783c3c66515f15a799d922e3fb6ae257a6 100755
--- a/pack.d/far2l-portable.sh
+++ b/pack.d/far2l-portable.sh
@@ -4,6 +4,8 @@ TAR="$1"
 RETURNTARNAME="$2"
 VERSION="$3"
 
+PRODUCTCUR=far2l
+
 . $(dirname $0)/common.sh
 
 
@@ -11,9 +13,7 @@ VERSION="$3"
 
 CURDIR=$(pwd)
 
-PRODUCTNAME=far2l-portable
-PRODUCTCUR=far2l
-PKGNAME=$CURDIR/$PRODUCTNAME-$VERSION.tar
+PKGNAME=$CURDIR/$PRODUCT-$VERSION.tar
 
 tdir=$(mktemp -d)
 trap "rm -fr $tdir" EXIT
@@ -28,14 +28,14 @@ fi
 
 [ -s "$RUNFILE" ] || fatal "Missed $RUNFILE"
 
-mkdir -p $tdir/opt/$PRODUCTNAME/
+mkdir -p $tdir/opt/$PRODUCT/
 
-sh $RUNFILE --noexec --target $tdir/opt/$PRODUCTNAME || fatal
+sh $RUNFILE --noexec --target $tdir/opt/$PRODUCT || fatal
 
 #mkdir -p $tdir/usr/bin/
-#ln -s /opt/$PRODUCTNAME/$PRODUCTCUR $tdir/usr/bin/$PRODUCTCUR
+#ln -s /opt/$PRODUCT/$PRODUCTCUR $tdir/usr/bin/$PRODUCTCUR
 
-#erc pack $PKGNAME opt/$PRODUCTNAME usr/bin/ || fatal
-erc pack $PKGNAME opt/$PRODUCTNAME || fatal
+#erc pack $PKGNAME opt/$PRODUCT usr/bin/ || fatal
+erc pack $PKGNAME opt/$PRODUCT || fatal
 
 return_tar "$PKGNAME"
diff --git a/pack.d/jetbrains-toolbox.sh b/pack.d/jetbrains-toolbox.sh
index 8cfe0b386f4c0257758019e548bd25f6f78a7239..a1278a2a20fd258350a1df48cf50de0d934fb022 100755
--- a/pack.d/jetbrains-toolbox.sh
+++ b/pack.d/jetbrains-toolbox.sh
@@ -2,7 +2,6 @@
 
 TAR="$1"
 RETURNTARNAME="$2"
-PRODUCT=jetbrains-toolbox
 
 . $(dirname $0)/common.sh
 
diff --git a/pack.d/portproton.sh b/pack.d/portproton.sh
index e4920607d153bf9b8416d1da0fa46866f15dab77..ea81ec293b6ffc26599ebfdda06fc299cba63ebd 100755
--- a/pack.d/portproton.sh
+++ b/pack.d/portproton.sh
@@ -8,7 +8,7 @@ VERSION="$3"
 
 [ -n "$VERSION" ] || fatal "Missed archive version"
 
-PKGNAME=portproton-$VERSION.tar
+PKGNAME=$PRODUCT-$VERSION.tar
 
 erc repack "$TAR" "$PKGNAME" || fatal
 
diff --git a/pack.d/vivaldi-stable-codecs-ffmpeg-extra.sh b/pack.d/vivaldi-stable-codecs-ffmpeg-extra.sh
index 267b418aa8768ffc6764aacfa99f6aa9a2476b5d..dfcf8f06c38178086638bdea4a07dd6da9dd47d0 100755
--- a/pack.d/vivaldi-stable-codecs-ffmpeg-extra.sh
+++ b/pack.d/vivaldi-stable-codecs-ffmpeg-extra.sh
@@ -11,8 +11,7 @@ CURDIR=$(pwd)
 PRODUCTDIR="$(dirname $UPDATEFFMPEG)"
 BASEPKGNAME=vivaldi-stable
 
-PKGNAME=$(basename $0 .sh)
-if echo "$PKGNAME" | grep -q "vivaldi-snapshot" ; then
+if echo "$PRODUCT" | grep -q "vivaldi-snapshot" ; then
     BASEPKGNAME=vivaldi-snapshot
 fi
 
diff --git a/pack.d/yandex-browser-stable-codecs-ffmpeg-extra.sh b/pack.d/yandex-browser-stable-codecs-ffmpeg-extra.sh
index b8400b239383c9957da2f9d4d30ad6882707b18e..91de48f1fb20c8d57f6c14380dd072bcb7d383ac 100755
--- a/pack.d/yandex-browser-stable-codecs-ffmpeg-extra.sh
+++ b/pack.d/yandex-browser-stable-codecs-ffmpeg-extra.sh
@@ -11,8 +11,7 @@ CURDIR="$(pwd)"
 PRODUCTDIR="$(dirname "$UPDATEFFMPEG")"
 BASEPKGNAME=yandex-browser-stable
 
-PKGNAME=$(basename $0 .sh)
-if echo "$PKGNAME" | grep -q "yandex-browser-beta" ; then
+if echo "$PRODUCT" | grep -q "yandex-browser-beta" ; then
     BASEPKGNAME=yandex-browser-beta
 fi