diff --git a/4chan_x.user.js b/4chan_x.user.js
index c257af51a..acfd8985e 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -3767,7 +3767,7 @@
         if (file.isSpoiler) {
           fileSize = "Spoiler Image, " + fileSize;
           if (!isArchived) {
-            fileThumb = '//thumbs.4chan.org/image/spoiler';
+            fileThumb = '//static.4chan.org/image/spoiler';
             fileThumb += (function() {
               switch (board) {
                 case 'a':
@@ -3804,7 +3804,7 @@
           innerHTML: file.name
         });
         filename = a.textContent.replace(/%22/g, '"');
-        a.textContent = Build.shortname(filename);
+        a.textContent = Build.shortFilename(filename);
         shortFilename = a.innerHTML;
         a.textContent = filename;
         filename = a.innerHTML;
diff --git a/script.coffee b/script.coffee
index 8f022a1dc..78c896990 100644
--- a/script.coffee
+++ b/script.coffee
@@ -3018,7 +3018,7 @@ Build =
       if file.isSpoiler
         fileSize = "Spoiler Image, #{fileSize}"
         unless isArchived
-          fileThumb = '//thumbs.4chan.org/image/spoiler'
+          fileThumb = '//static.4chan.org/image/spoiler'
           fileThumb += switch board
             # UGGH, I can't wait to maintain this crap.
             # Sup desuwa?
@@ -3045,7 +3045,7 @@ Build =
       filename = a.textContent.replace /%22/g, '"'
 
       # shorten filename, get html
-      a.textContent = Build.shortname filename
+      a.textContent = Build.shortFilename filename
       shortFilename = a.innerHTML
 
       # get html