diff --git a/satellites/extrafiles/i3lock/i3lock-2.9.1-no-pam.patch b/satellites/extrafiles/i3lock/i3lock-2.9.1-no-pam.patch
index 6e43f55..fc35627 100644
--- a/satellites/extrafiles/i3lock/i3lock-2.9.1-no-pam.patch
+++ b/satellites/extrafiles/i3lock/i3lock-2.9.1-no-pam.patch
@@ -132,15 +132,15 @@
 +	if (!(f = fopen(oomfile, "w"))) {
 +		if (errno == ENOENT)
 +			return;
-+		errx(EXIT_FAILURE, "i3lock: fopen %s: %s", oomfile, strerror(errno));
++		errx(EXIT_FAILURE, "fopen %s: %s", oomfile, strerror(errno));
 +	}
 +	fprintf(f, "%d", OOM_SCORE_ADJ_MIN);
 +	if (fclose(f)) {
 +		if (errno == EACCES)
-+			errx(EXIT_FAILURE, "i3lock: unable to disable OOM killer. "
++			errx(EXIT_FAILURE, "unable to disable OOM killer. "
 +			                   "Make sure to suid or sgid i3lock.");
 +		else
-+			errx(EXIT_FAILURE, "i3lock: fclose %s: %s", oomfile, strerror(errno));
++			errx(EXIT_FAILURE, "fclose %s: %s", oomfile, strerror(errno));
 +	}
 +}
 +#endif
@@ -167,7 +167,7 @@
 -        pam_setcred(pam_handle, PAM_REFRESH_CRED);
 -        pam_end(pam_handle, PAM_SUCCESS);
 +    if (!(inputhash = crypt(password, hash)))
-+        fprintf(stderr, "i3lock: crypt: %s", strerror(errno));
++        fprintf(stderr, "crypt: %s", strerror(errno));
 +    else if (!strcmp(inputhash, hash)) {
 +        DEBUG("successfully authenticated");
 +        clear_password_memory();
@@ -253,22 +253,22 @@
 +    if (!strcmp(hash, "x")) {
 +        struct spwd *sp;
 +        if (!(sp = getspnam(pw->pw_name)))
-+            errx(EXIT_FAILURE, "i3lock: getspnam: cannot retrieve shadow entry. "
++            errx(EXIT_FAILURE, "getspnam: cannot retrieve shadow entry. "
 +                               "Make sure to suid or sgid i3lock.");
 +        hash = sp->sp_pwdp;
 +    }
 +
 +    errno = 0;
 +    if (!crypt("", hash))
-+        errx(EXIT_FAILURE, "i3lock: crypt: %s", strerror(errno));
++        errx(EXIT_FAILURE, "crypt: %s", strerror(errno));
 +
 +    /* drop privileges */
 +    if (setgroups(0, NULL) < 0)
-+        errx(EXIT_FAILURE, "i3lock: setgroups: %s", strerror(errno));
++        errx(EXIT_FAILURE, "setgroups: %s", strerror(errno));
 +    if (setgid(pw->pw_gid) < 0)
-+        errx(EXIT_FAILURE, "i3lock: setgid: %s", strerror(errno));
++        errx(EXIT_FAILURE, "setgid: %s", strerror(errno));
 +    if (setuid(pw->pw_uid) < 0)
-+        errx(EXIT_FAILURE, "i3lock: setuid: %s", strerror(errno));
++        errx(EXIT_FAILURE, "setuid: %s", strerror(errno));
 +#endif
 +
      char *optstring = "hvnbdc:p:ui:teI:f";
diff --git a/satellites/icedtea.sat b/satellites/icedtea.sat
index 151e20c..397e1dd 100644
--- a/satellites/icedtea.sat
+++ b/satellites/icedtea.sat
@@ -1,7 +1,7 @@
 import 'compile/configure'
 
 name=icedtea
-version=3.5.0
+version=3.5.1
 version_bootstrap=2.6.10
 version_gcc=6.3.0
 version_ecj=4.9
@@ -12,23 +12,23 @@ update_names="<a href=\"$name-$version.tar.gz\">$name-"
 define_option '!bootstrap: Bootstrap this program'
 
 dlextract "http://icedtea.wildebeest.org/download/source/$name-$version.tar.xz" \
-          'be9a5d29e5d7314d347aef549679acf2'
+          '7bc206735f6e6fda34b269930ee3138f'
 modules="
-    corba-70224f73a132b14927484cb0249d00f5
-    hotspot-68de1a2ccbad5b32b262b8f791749688
-    jaxp-05c0a6d4b04043cb4b4005fa5374a9f9
-    jaxws-f1ee8e13e71582b1f42f58fda4774d18
-    jdk-3baf1a696c1a99fa80365c4b9a5389e1
-    langtools-04e42e7e40a9f1cba3a2353410085d91
-    nashorn-a7d351e13515a36794d73d6f7af48447
-    openjdk-19a8fe6ea2bd753ecd085ebddd185dab
+    c57826f1cc09e093d0be4fd0dfb82df3-corba.tar.xz
+    004b2ec681cbef34dea91ca82fe82acd-hotspot.tar.xz
+    9d905e1dfbf3e237701278409018ab8e-jaxp.tar.xz
+    abed18435f40b6d9d83497e751b3837e-jaxws.tar.xz
+    b1ab8588c2e832075feda3f935382146-jdk.tar.xz
+    226fdadf19095d3f6048610e6b82ad78-langtools.tar.xz
+    2d058d76099b6659e9146e137af449f8-nashorn.tar.xz
+    e133701bdef10fc58baa7dd588e3daf9-openjdk.tar.xz
 "
 for module in $modules; do
-    modname="$(echo "$module" | cut -d- -f1)"
-    checksum="$(echo "$module" | cut -d- -f2)"
-    download "http://icedtea.wildebeest.org/download/drops/${name}8/$version/$modname.tar.xz" \
+    package="$(echo "$module" | cut -d- -f2)"
+    checksum="$(echo "$module" | cut -d- -f1)"
+    download "http://icedtea.wildebeest.org/download/drops/${name}8/$version/$package" \
              "$checksum" \
-             "icedtea-$version-$modname.tar.xz"
+             "$name-$version-$package"
 done
 
 if option bootstrap; then
@@ -49,20 +49,20 @@ if option bootstrap; then
     dlextract "http://icedtea.wildebeest.org/download/source/$name-$version_bootstrap.tar.xz" \
               '25307cb762455eace830e399c918b11f'
     bootstrap_modules="
-        corba-8f410876861cb5f00795f16eaead0810
-        hotspot-638ba47781e357ad6f9583045e45dc20
-        jaxp-62a4db1e84cdc7a322ec1442a42234ca
-        jaxws-93abafb7ba0c6281c8a8fcaedd573f3d
-        jdk-fab5c059798ae43b2b636c8ddfb0da7a
-        langtools-2867a657ebb2185ca5954c4cf2742328
-        openjdk-4c6bc2dff0da17def41732cd8e68bb21
+        8f410876861cb5f00795f16eaead0810-corba.tar.bz2
+        638ba47781e357ad6f9583045e45dc20-hotspot.tar.bz2
+        62a4db1e84cdc7a322ec1442a42234ca-jaxp.tar.bz2
+        93abafb7ba0c6281c8a8fcaedd573f3d-jaxws.tar.bz2
+        fab5c059798ae43b2b636c8ddfb0da7a-jdk.tar.bz2
+        2867a657ebb2185ca5954c4cf2742328-langtools.tar.bz2
+        4c6bc2dff0da17def41732cd8e68bb21-openjdk.tar.bz2
     "
     for module in $bootstrap_modules; do
-        modname="$(echo "$module" | cut -d- -f1)"
-        checksum="$(echo "$module" | cut -d- -f2)"
-        download "http://icedtea.wildebeest.org/download/drops/${name}7/$version_bootstrap/$modname.tar.bz2" \
+        package="$(echo "$module" | cut -d- -f2)"
+        checksum="$(echo "$module" | cut -d- -f1)"
+        download "http://icedtea.wildebeest.org/download/drops/${name}7/$version_bootstrap/$package" \
                  "$checksum" \
-                 "icedtea-$version_bootstrap-$modname.tar.bz2"
+                 "$name-$version_bootstrap-$package"
     done
 fi
 header_end
@@ -114,9 +114,9 @@ if option bootstrap; then
     # Bootstrap Icedtea7
     ( cd "$name-$version_bootstrap"
         for module in $bootstrap_modules; do
-            modname="$(echo "$module" | cut -d- -f1)"
-            getfile "icedtea-$version_bootstrap-$modname.tar.bz2"
-            mv "icedtea-$version_bootstrap-$modname.tar.bz2" "$modname.tar.bz2"
+            package="$(echo "$module" | cut -d- -f2)"
+            getfile "$name-$version_bootstrap-$package"
+            mv "$name-$version_bootstrap-$package" "$package"
         done
 
         # Use the gcc with java support we just built to be able to properly compile java C modules. Add java tools and ant to $PATH as well.
@@ -140,9 +140,9 @@ fi
 cd "$name-$version"
 
 for module in $modules; do
-    modname="$(echo "$module" | cut -d- -f1)"
-    getfile "icedtea-$version-$modname.tar.xz"
-    mv "icedtea-$version-$modname.tar.xz" "$modname.tar.xz"
+    package="$(echo "$module" | cut -d- -f2)"
+    getfile "$name-$version-$package"
+    mv "$name-$version-$package" "$package"
 done
 
 # Build
diff --git a/satellites/ttf-ms-corefonts.sat b/satellites/ttf-ms-corefonts.sat
index 0a37084..fa9c5bf 100644
--- a/satellites/ttf-ms-corefonts.sat
+++ b/satellites/ttf-ms-corefonts.sat
@@ -2,23 +2,23 @@ name=corefonts
 version=final
 
 fonts="
-    wd97vwr-efa72d3ed0120a07326ce02f051e9b42
-    webdin-230a1d13a365b22815f502eb24d9149b
-    verdan-12d2a75f8156e10607be1eaa8e8ef120
-    trebuc-0d7ea16cac6261f8513a061fbfcdb2b5
-    times-ed39c8ef91b9fb80f76f702568291bd5
-    impact-7907c7dd6684e9bade91cff82683d9d7
-    georgi-4d90016026e2da447593b41a8d8fa8bd
-    courie-4e412c772294403ab62fb2d247d85c60
-    comic-2b30de40bb5e803a0452c7715fc835d1
-    arialb-c9089ae0c3b3d0d8c4b0a95979bb9ff0
-    arial-9637df0e91703179f0723ec095a36cb5
-    andale-cbdc2fdd7d2ed0832795e86a8b9ee19a
+    efa72d3ed0120a07326ce02f051e9b42-wd97vwr32.exe
+    230a1d13a365b22815f502eb24d9149b-webdin32.exe
+    12d2a75f8156e10607be1eaa8e8ef120-verdan32.exe
+    0d7ea16cac6261f8513a061fbfcdb2b5-trebuc32.exe
+    ed39c8ef91b9fb80f76f702568291bd5-times32.exe
+    7907c7dd6684e9bade91cff82683d9d7-impact32.exe
+    4d90016026e2da447593b41a8d8fa8bd-georgi32.exe
+    4e412c772294403ab62fb2d247d85c60-courie32.exe
+    2b30de40bb5e803a0452c7715fc835d1-comic32.exe
+    c9089ae0c3b3d0d8c4b0a95979bb9ff0-arialb32.exe
+    9637df0e91703179f0723ec095a36cb5-arial32.exe
+    cbdc2fdd7d2ed0832795e86a8b9ee19a-andale32.exe
 "
 for font in $fonts; do
-    fontname="$(echo "$font" | cut -d- -f1)"
-    checksum="$(echo "$font" | cut -d- -f2)"
-    download "https://sourceforge.net/projects/$name/files/the%20fonts/$version/${fontname}32.exe" \
+    file="$(echo "$font" | cut -d- -f2)"
+    checksum="$(echo "$font" | cut -d- -f1)"
+    download "https://sourceforge.net/projects/$name/files/the%20fonts/$version/$file" \
              "$checksum"
 done
 header_end
@@ -26,8 +26,8 @@ header_end
 mkdir -p "$dir_install/$dir_prefix/$dir_datadir/fonts/TTF"
 
 for font in $fonts; do
-    fontname="$(echo "$font" | cut -d- -f1)"
-    extract "${fontname}32.exe" \
+    file="$(echo "$font" | cut -d- -f2)"
+    extract "$file" \
             "$dir_install/$dir_prefix/$dir_datadir/fonts/TTF" \
             'cabextract -q -F *.ttf -d {dst} {src}'
 done