diff --git a/SBo/games/scribble/SlackBuild b/SBo/games/scribble/SlackBuild
index 260b8e9b..029ec6a0 100755
--- a/SBo/games/scribble/SlackBuild
+++ b/SBo/games/scribble/SlackBuild
@@ -14,7 +14,7 @@ OUTPUT=${OUTPUT:-/tmp}
 
 set -e # Exit on most errors
 
-rm -fr $TMP/$PRGNAM-$VERSION $PKG
+rm -fr $TMP/$PRGNAM $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 
@@ -28,12 +28,11 @@ make prefix=$PKG/usr mandir=$PKG/usr/man
 
 # Racket also has a 'scribble' binary in /usr/bin
 # Scribble's scribble is in /usr/games but Racket's steal its place in $PATH
-( cd $PKG/usr/games/
-    ln -s scribble scribble-scrabble
-)
-( cd $PKG/usr/man/man6/
-    ln -s scribble.6.gz scribble-scrabble.6.gz
-)
+cd $PKG/usr/games/
+ln -s scribble scribble-scrabble
+
+cd $PKG/usr/man/man6/
+ln -s scribble.6.gz scribble-scrabble.6.gz
 
 chmod -R o-w $PKG
 chown -R root:root $PKG/*
diff --git a/ap/amdgpud/SlackBuild b/ap/amdgpud/SlackBuild
index 89299ff2..33a2c689 100755
--- a/ap/amdgpud/SlackBuild
+++ b/ap/amdgpud/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/ap/bandwhich/SlackBuild b/ap/bandwhich/SlackBuild
index e8410668..81a9566d 100755
--- a/ap/bandwhich/SlackBuild
+++ b/ap/bandwhich/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/ap/bat/SlackBuild b/ap/bat/SlackBuild
index 34412fd3..dfb7c0f4 100755
--- a/ap/bat/SlackBuild
+++ b/ap/bat/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/ap/btm/SlackBuild b/ap/btm/SlackBuild
index 31d28e01..7370b73e 100755
--- a/ap/btm/SlackBuild
+++ b/ap/btm/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/ap/delta/SlackBuild b/ap/delta/SlackBuild
index 60ea2cbf..1fdd1104 100755
--- a/ap/delta/SlackBuild
+++ b/ap/delta/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/ap/diskus/SlackBuild b/ap/diskus/SlackBuild
index 8e44c794..44c15600 100755
--- a/ap/diskus/SlackBuild
+++ b/ap/diskus/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/ap/dust/SlackBuild b/ap/dust/SlackBuild
index feda5b97..23806e73 100755
--- a/ap/dust/SlackBuild
+++ b/ap/dust/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/ap/exa/SlackBuild b/ap/exa/SlackBuild
index f76a927b..e989a18e 100755
--- a/ap/exa/SlackBuild
+++ b/ap/exa/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/ap/f3/SlackBuild b/ap/f3/SlackBuild
index 9dacbdcd..7dad2b86 100755
--- a/ap/f3/SlackBuild
+++ b/ap/f3/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/ap/fd/SlackBuild b/ap/fd/SlackBuild
index 0b008da8..c77337d0 100755
--- a/ap/fd/SlackBuild
+++ b/ap/fd/SlackBuild
@@ -20,7 +20,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/ap/fish/SlackBuild b/ap/fish/SlackBuild
index 38ff544b..f33a5c0f 100755
--- a/ap/fish/SlackBuild
+++ b/ap/fish/SlackBuild
@@ -21,7 +21,7 @@ PREFIX=/usr
 SLCKFLAGS=" -O "
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-*
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
@@ -29,8 +29,8 @@ mkdir -p $PKG
 cd $TMP
 [ ! -e $REPOSITORY ] && git clone https://github.com/${GITHUB_REPO}.git $REPOSITORY
 
-cp -R $REPOSITORY $TMP/$PRGNAM-$VERSION
-cd $TMP/$PRGNAM-$VERSION
+cp -R $REPOSITORY $TMP/$PRGNAM
+cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git for-each-ref --sort=taggerdate --format '%(tag)' | tail -n1)
 [ "x$VERSION" == "x" ] && VERSION=trunk
 [ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION
diff --git a/ap/grex/SlackBuild b/ap/grex/SlackBuild
index 4e503465..1b20ab7f 100755
--- a/ap/grex/SlackBuild
+++ b/ap/grex/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/ap/himalaya/SlackBuild b/ap/himalaya/SlackBuild
index b0c7d016..a19469e4 100755
--- a/ap/himalaya/SlackBuild
+++ b/ap/himalaya/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/ap/ht/SlackBuild b/ap/ht/SlackBuild
index 0a3d39a9..a4dc49e3 100755
--- a/ap/ht/SlackBuild
+++ b/ap/ht/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/ap/hyperfine/SlackBuild b/ap/hyperfine/SlackBuild
index 773fd8bd..f3ccbca9 100755
--- a/ap/hyperfine/SlackBuild
+++ b/ap/hyperfine/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/ap/ion/SlackBuild b/ap/ion/SlackBuild
index 675deb98..65c5949a 100755
--- a/ap/ion/SlackBuild
+++ b/ap/ion/SlackBuild
@@ -18,7 +18,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/ap/lsd/SlackBuild b/ap/lsd/SlackBuild
index f6048fa7..09c8cad0 100755
--- a/ap/lsd/SlackBuild
+++ b/ap/lsd/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/ap/lsyncd/SlackBuild b/ap/lsyncd/SlackBuild
index 18f9ea9b..2b918427 100755
--- a/ap/lsyncd/SlackBuild
+++ b/ap/lsyncd/SlackBuild
@@ -21,7 +21,7 @@ PREFIX=/usr
 SLCKFLAGS=" -O "
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-*
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
@@ -29,8 +29,8 @@ mkdir -p $PKG
 cd $TMP
 [ ! -e $REPOSITORY ] && git clone https://github.com/${GITHUB_REPO}.git $REPOSITORY
 
-cp -R $REPOSITORY $TMP/$PRGNAM-$VERSION
-cd $TMP/$PRGNAM-$VERSION
+cp -R $REPOSITORY $TMP/$PRGNAM
+cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git for-each-ref --sort=taggerdate --format '%(tag)' | tail -n1)
 [ "x$VERSION" == "x" ] && VERSION=trunk
 [ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION
diff --git a/ap/mdcat/SlackBuild b/ap/mdcat/SlackBuild
index 9b5eb80c..84ce3840 100755
--- a/ap/mdcat/SlackBuild
+++ b/ap/mdcat/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/ap/nu/SlackBuild b/ap/nu/SlackBuild
index 9b04ad4f..5395a2d5 100755
--- a/ap/nu/SlackBuild
+++ b/ap/nu/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/ap/procs/SlackBuild b/ap/procs/SlackBuild
index 471217ed..930e95cb 100755
--- a/ap/procs/SlackBuild
+++ b/ap/procs/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/ap/sd/SlackBuild b/ap/sd/SlackBuild
index 67486b83..03d9b047 100755
--- a/ap/sd/SlackBuild
+++ b/ap/sd/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/ap/starship/SlackBuild b/ap/starship/SlackBuild
index 3c406c8b..b4c76f08 100755
--- a/ap/starship/SlackBuild
+++ b/ap/starship/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/ap/tldr/SlackBuild b/ap/tldr/SlackBuild
index f2f1a197..1c9eeb80 100755
--- a/ap/tldr/SlackBuild
+++ b/ap/tldr/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/ap/tv/SlackBuild b/ap/tv/SlackBuild
index b20fccee..e7a63c63 100755
--- a/ap/tv/SlackBuild
+++ b/ap/tv/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/ap/viu/SlackBuild b/ap/viu/SlackBuild
index 935e0123..102adc8a 100755
--- a/ap/viu/SlackBuild
+++ b/ap/viu/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/ap/ycmd/SlackBuild b/ap/ycmd/SlackBuild
index 5d1183b5..0e359f11 100755
--- a/ap/ycmd/SlackBuild
+++ b/ap/ycmd/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/ap/ytop/SlackBuild b/ap/ytop/SlackBuild
index 6400d668..c4defd40 100755
--- a/ap/ytop/SlackBuild
+++ b/ap/ytop/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/d/dtc/SlackBuild b/d/dtc/SlackBuild
index f398d9f1..5b15720a 100755
--- a/d/dtc/SlackBuild
+++ b/d/dtc/SlackBuild
@@ -18,7 +18,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/d/factor/SlackBuild b/d/factor/SlackBuild
index 51ad99b4..168a65aa 100755
--- a/d/factor/SlackBuild
+++ b/d/factor/SlackBuild
@@ -20,7 +20,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 mkdir -p $TMP
 
 # cleaning
-rm -fr $PKG
+rm -fr $PKG $TMP/$PRGNAM
 
 # mise en place
 cd $TMP
@@ -39,14 +39,14 @@ cd $TMP/$PRGNAM
 mkdir -p $PKG$PREFIX/libexec/$PRGNAM
 cp -a * $PKG$PREFIX/libexec/$PRGNAM
 
-mkdir -p $PKG$PREFIX/{bin,doc/$PRGNAM-$VERSION}
+mkdir -p $PKG$PREFIX/{bin,doc/$PRGNAM}
 cat <<EOF > $PKG$PREFIX/bin/$PRGNAM
 #!/bin/bash
 cd $PREFIX/libexec/$PRGNAM
 ./$PRGNAM \$@
 EOF
 chmod +x $PKG$PREFIX/bin/$PRGNAM
-( cd $PKG$PREFIX/doc/$PRGNAM-$VERSION
+( cd $PKG$PREFIX/doc/$PRGNAM
     ln -s ../libexec/$PRGNAM/readme.html
     ln -s ../libexec/$PRGNAM/license.txt
 )
@@ -62,7 +62,7 @@ $PRGNAM: full-featured library. Factor runs on all common platforms and Factor
 $PRGNAM: applications are portable between them. Factor can deploy stand-alone
 $PRGNAM: applications on all platforms.
 $PRGNAM:
-$PRGNAM: see $PREFIX/doc/$PRGNAM-$VERSION
+$PRGNAM: see $PREFIX/doc/$PRGNAM
 $PRGNAM:
 $PRGNAM: http://factorcode.org/
 $PRGNAM:
diff --git a/d/gforth/SlackBuild b/d/gforth/SlackBuild
index 91ee011c..3df717ae 100755
--- a/d/gforth/SlackBuild
+++ b/d/gforth/SlackBuild
@@ -20,7 +20,7 @@ PREFIX=/usr
 SLCKFLAGS=" -O "
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-*
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
@@ -28,8 +28,8 @@ mkdir -p $PKG
 cd $TMP
 [ ! -e $REPOSITORY ] && git clone https://git.savannah.gnu.org/git/gforth.git $REPOSITORY
 
-cp -R $REPOSITORY $TMP/$PRGNAM-$VERSION
-cd $TMP/$PRGNAM-$VERSION
+cp -R $REPOSITORY $TMP/$PRGNAM
+cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git for-each-ref --sort=taggerdate --format '%(tag)' | tail -n1)
 [ "x$VERSION" == "x" ] && VERSION=trunk
 [ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION
diff --git a/d/rpn/SlackBuild b/d/rpn/SlackBuild
index 4b16bb15..9282184b 100755
--- a/d/rpn/SlackBuild
+++ b/d/rpn/SlackBuild
@@ -21,7 +21,7 @@ PREFIX=/usr
 SLCKFLAGS=" -O "
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-*
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
@@ -31,8 +31,8 @@ cd $TMP
 cd $REPOSITORY
 git pull --all
 
-cp -R $REPOSITORY $TMP/$PRGNAM-$VERSION
-cd $TMP/$PRGNAM-$VERSION
+cp -R $REPOSITORY $TMP/$PRGNAM
+cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git for-each-ref --sort=taggerdate --format '%(tag)' | tail -n1)
 [ "x$VERSION" == "x" ] && VERSION=trunk
 [ "x$VERSION" == "xdevelop" ] && git checkout develop && VERSION=trunk
diff --git a/d/scry/SlackBuild b/d/scry/SlackBuild
index 62ca3e42..07df24f5 100755
--- a/d/scry/SlackBuild
+++ b/d/scry/SlackBuild
@@ -21,7 +21,7 @@ PREFIX=/usr
 SLCKFLAGS=" -O "
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-*
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
@@ -29,8 +29,8 @@ mkdir -p $PKG
 cd $TMP
 [ ! -e $REPOSITORY ] && git clone https://github.com/${GITHUB_REPO}.git $REPOSITORY
 
-cp -R $REPOSITORY $TMP/$PRGNAM-$VERSION
-cd $TMP/$PRGNAM-$VERSION
+cp -R $REPOSITORY $TMP/$PRGNAM
+cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git for-each-ref --sort=taggerdate --format '%(tag)' | tail -n1)
 [ "x$VERSION" == "x" ] && VERSION=trunk
 [ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION
diff --git a/d/scryer-prolog/SlackBuild b/d/scryer-prolog/SlackBuild
index ffe091d0..4126d83f 100755
--- a/d/scryer-prolog/SlackBuild
+++ b/d/scryer-prolog/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/d/wabt/SlackBuild b/d/wabt/SlackBuild
index 57ffd5c6..1654e122 100755
--- a/d/wabt/SlackBuild
+++ b/d/wabt/SlackBuild
@@ -21,7 +21,7 @@ PREFIX=/usr
 SLCKFLAGS=" -O "
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-*
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
@@ -29,8 +29,8 @@ mkdir -p $PKG
 cd $TMP
 [ ! -e $REPOSITORY ] && git clone --recursive https://github.com/${GITHUB_REPO} $REPOSITORY
 
-cp -R $REPOSITORY $TMP/$PRGNAM-$VERSION
-cd $TMP/$PRGNAM-$VERSION
+cp -R $REPOSITORY $TMP/$PRGNAM
+cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git for-each-ref --sort=taggerdate --format '%(tag)' | tail -n1)
 [ "x$VERSION" == "x" ] && VERSION=trunk
 [ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION
diff --git a/l/raylib/SlackBuild b/l/raylib/SlackBuild
index 733d8aba..9028ba1b 100755
--- a/l/raylib/SlackBuild
+++ b/l/raylib/SlackBuild
@@ -22,7 +22,7 @@ EMACS=$(basename $(ls /usr/bin/emacs-2*))
 EMACS_VERSION=$(echo "$EMACS" | grep -o "\-[0-9\.]*\-" | tr -d - | head -n1)
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/lua/awesome/SlackBuild b/lua/awesome/SlackBuild
index ecd70f38..d7cfdfe3 100755
--- a/lua/awesome/SlackBuild
+++ b/lua/awesome/SlackBuild
@@ -21,7 +21,7 @@ SLCKFLAGS=""
 
 REQUIRES="lua luarocks lgi"
 
-# nettoyage préalable
+# nettoyage prealable
 rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
diff --git a/xap/gammastep/SlackBuild b/xap/gammastep/SlackBuild
index 111eaeb4..dbdf7077 100755
--- a/xap/gammastep/SlackBuild
+++ b/xap/gammastep/SlackBuild
@@ -18,7 +18,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/xap/image-roll/SlackBuild b/xap/image-roll/SlackBuild
index 271377f0..b347b07f 100755
--- a/xap/image-roll/SlackBuild
+++ b/xap/image-roll/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/xap/wezterm/SlackBuild b/xap/wezterm/SlackBuild
index f3e36665..204a85a4 100755
--- a/xap/wezterm/SlackBuild
+++ b/xap/wezterm/SlackBuild
@@ -19,7 +19,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/_repositories/$PRGNAM}
 PREFIX=${PREFIX:-/usr}
 
 # nettoyage préalable
-rm -fr $PKG $TMP/$PRGNAM-$VERSION
+rm -fr $PKG $TMP/$PRGNAM
 
 mkdir -p $PKG
 
diff --git a/y/cboard/SlackBuild b/y/cboard/SlackBuild
index 3b77627d..b8de0d70 100755
--- a/y/cboard/SlackBuild
+++ b/y/cboard/SlackBuild
@@ -21,8 +21,7 @@ REPOSITORY=/home/installs/SlackBuilds/_repositories/$PRGNAM
 PREFIX=/usr
 
 # Cleaning
-rm -fr $TMP/$PRGNAM-$VERSION
-rm -fr $PKG
+rm -fr $PKG $TMP/$PRGNAM
 mkdir -p $TMP
 
 [ ! -e $REPOSITORY ] && git clone "http://repo.or.cz/r/cboard.git" $REPOSITORY
@@ -30,8 +29,8 @@ cd $REPOSITORY
 git pull --all
 
 # Preparation
-cp -R $REPOSITORY $TMP/$PRGNAM-$VERSION
-cd $TMP/$PRGNAM-$VERSION
+cp -R $REPOSITORY $TMP/$PRGNAM
+cd $TMP/$PRGNAM
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git for-each-ref --sort=taggerdate --format '%(tag)' | tail -n1)
 [ "x$VERSION" == "x" ] && VERSION=trunk
diff --git a/y/lutris/SlackBuild b/y/lutris/SlackBuild
index 4bb3cfba..b9c2b582 100755
--- a/y/lutris/SlackBuild
+++ b/y/lutris/SlackBuild
@@ -73,8 +73,8 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mv $PKG/usr/share/man $PKG/usr/
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM
+cp -a $DOCS $PKG/usr/doc/$PRGNAM
 
 
 mkdir -p $PKG/install