diff --git a/xap/calibre/SlackBuild b/xap/calibre-bin/SlackBuild
similarity index 86%
rename from xap/calibre/SlackBuild
rename to xap/calibre-bin/SlackBuild
index 917ea2ad..427a48d8 100755
--- a/xap/calibre/SlackBuild
+++ b/xap/calibre-bin/SlackBuild
@@ -15,19 +15,19 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/repositories/$PRGNAM}
 
 mkdir -p $REPOSITORY
 
-[ ! -e $REPOSITORY/${PRGNAM}-${VERSION}-${ARCH}.txz ] && wget -c -O $REPOSITORY/${PRGNAM}-${VERSION}-${ARCH}.txz http://download.calibre-ebook.com/${VERSION}/${PRGNAM}-${VERSION}-${ARCH}.txz
+[ ! -e $REPOSITORY/calibre-${VERSION}-${ARCH}.txz ] && wget -c -O $REPOSITORY/calibre-${VERSION}-${ARCH}.txz http://download.calibre-ebook.com/${VERSION}/calibre-${VERSION}-${ARCH}.txz
 
 rm -fr $PKG
-mkdir -p $PKG/opt/${PRGNAM}
+mkdir -p $PKG/opt/calibre
 
-tar xvf $REPOSITORY/${PRGNAM}-${VERSION}-${ARCH}.txz -C $PKG/opt/${PRGNAM}
+tar xvf $REPOSITORY/calibre-${VERSION}-${ARCH}.txz -C $PKG/opt/calibre
 
 mkdir -p $PKG/usr/bin
 
 $PKG/opt/calibre/calibre_postinstall --root=$PKG/usr
 
 mkdir -p $PKG/etc/rc.d/
-cp $REPOSITORY/rc.calibre-server $PKG/etc/rc.d/rc.calibre-server.new
+cp $CWD/rc.calibre-server $PKG/etc/rc.d/rc.calibre-server.new
 
 cd $PKG/usr/bin
 find . -type l -exec sh -c 'rm "$1"; ln -s ../../opt/calibre/$(basename $1)' _ {} \;
diff --git a/xap/calibre/rc.calibre-server b/xap/calibre-bin/rc.calibre-server
similarity index 100%
rename from xap/calibre/rc.calibre-server
rename to xap/calibre-bin/rc.calibre-server
diff --git a/xap/dbeaver/SlackBuild b/xap/dbeaver-bin/SlackBuild
similarity index 86%
rename from xap/dbeaver/SlackBuild
rename to xap/dbeaver-bin/SlackBuild
index aed4c934..f8fa40c1 100755
--- a/xap/dbeaver/SlackBuild
+++ b/xap/dbeaver-bin/SlackBuild
@@ -30,7 +30,7 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 PRGNAM=$(basename $CWD)
-VERSION=${VERSION:-$(curl -s https://api.github.com/repos/${PRGNAM}/${PRGNAM}/releases/latest | grep tag_name | grep -o "[0-9.]*")}
+VERSION=${VERSION:-$(curl -s https://api.github.com/repos/dbeaver/dbeaver/releases/latest | grep tag_name | grep -o "[0-9.]*")}
 BUILD=${BUILD:-1}
 TAG=${TAG:-gwh}
 
@@ -46,7 +46,7 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 
-SRCNAM=${PRGNAM}-ce
+SRCNAM=dbeaver-ce
 SRCVER=$VERSION-linux.gtk.$SRCARCH
 DESTDIR=$PKG/opt/
 
@@ -55,7 +55,7 @@ REPOSITORY=${REPOSITORY:-/home/installs/SlackBuilds/repositories/$PRGNAM}
 mkdir -p $REPOSITORY
 
 # mise en place
-[ ! -e $REPOSITORY/${SRCNAM}-${VERSION}-linux.gtk.${SRCARCH}.tar.gz ] && wget -c -O $REPOSITORY/${SRCNAM}-${VERSION}-linux.gtk.${SRCARCH}.tar.gz https://github.com/${PRGNAM}/${PRGNAM}/releases/download/${VERSION}/${SRCNAM}-${VERSION}-linux.gtk.${SRCARCH}.tar.gz
+[ ! -e $REPOSITORY/${SRCNAM}-${VERSION}-linux.gtk.${SRCARCH}.tar.gz ] && wget -c -O $REPOSITORY/${SRCNAM}-${VERSION}-linux.gtk.${SRCARCH}.tar.gz https://github.com/dbeaver/dbeaver/releases/download/${VERSION}/${SRCNAM}-${VERSION}-linux.gtk.${SRCARCH}.tar.gz
 
 mkdir -p $DESTDIR
 cd $DESTDIR
@@ -66,23 +66,23 @@ find -L . \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-chmod ga+x $DESTDIR/$PRGNAM/$PRGNAM
+chmod ga+x $DESTDIR/dbeaver/dbeaver
 
 mkdir -p $PKG/usr/bin
-cat << EOF > $PKG/usr/bin/$PRGNAM
+cat << EOF > $PKG/usr/bin/dbeaver
 #!/bin/bash
 cd \$HOME
-/opt/$PRGNAM/$PRGNAM \$@
+/opt/dbeaver/dbeaver \$@
 EOF
-chmod 0755 $PKG/usr/bin/$PRGNAM
+chmod 0755 $PKG/usr/bin/dbeaver
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/dbeaver
 cp -a \
-  $DESTDIR/$PRGNAM/readme.txt $DESTDIR/$PRGNAM/licenses/* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  $DESTDIR/dbeaver/readme.txt $DESTDIR/dbeaver/licenses/* \
+  $PKG/usr/doc/dbeaver
 
 mkdir -p $PKG/install
 cat <<EOF > $PKG/install/slack-desc