diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs
index a717b30456692..3e7c049fa1289 100644
--- a/src/librustdoc/html/layout.rs
+++ b/src/librustdoc/html/layout.rs
@@ -58,7 +58,7 @@ crate fn render<T: Print, S: Print>(
     {style_files}\
     <script id=\"default-settings\"{default_settings}></script>\
     <script src=\"{static_root_path}storage{suffix}.js\"></script>\
-    <script src=\"{root_path}crates{suffix}.js\"></script>\
+    <script src=\"{root_path}crates.js\"></script>\
     <noscript><link rel=\"stylesheet\" href=\"{static_root_path}noscript{suffix}.css\"></noscript>\
     {css_extension}\
     {favicon}\
@@ -114,7 +114,7 @@ crate fn render<T: Print, S: Print>(
     <section class=\"footer\"></section>\
     {after_content}\
     <div id=\"rustdoc-vars\" data-root-path=\"{root_path}\" data-current-crate=\"{krate}\" \
-       data-search-js=\"{root_path}search-index{suffix}.js\"></div>
+       data-search-js=\"{root_path}search-index.js\"></div>
     <script src=\"{static_root_path}main{suffix}.js\"></script>\
     {extra_scripts}\
 </body>\
diff --git a/src/librustdoc/html/render/write_shared.rs b/src/librustdoc/html/render/write_shared.rs
index 02ad01aa29a02..a73134a30a79e 100644
--- a/src/librustdoc/html/render/write_shared.rs
+++ b/src/librustdoc/html/render/write_shared.rs
@@ -361,7 +361,7 @@ themePicker.onblur = handleThemeButtonsBlur;
             }
         }
 
-        let dst = cx.dst.join(&format!("source-files{}.js", cx.shared.resource_suffix));
+        let dst = cx.dst.join("source-files.js");
         let (mut all_sources, _krates) =
             try_err!(collect(&dst, &krate.name.as_str(), "sourcesIndex"), &dst);
         all_sources.push(format!(
@@ -378,7 +378,7 @@ themePicker.onblur = handleThemeButtonsBlur;
     }
 
     // Update the search index and crate list.
-    let dst = cx.dst.join(&format!("search-index{}.js", cx.shared.resource_suffix));
+    let dst = cx.dst.join("search-index.js");
     let (mut all_indexes, mut krates) = try_err!(collect_json(&dst, &krate.name.as_str()), &dst);
     all_indexes.push(search_index);
     krates.push(krate.name.to_string());
@@ -394,7 +394,7 @@ themePicker.onblur = handleThemeButtonsBlur;
         cx.shared.fs.write(&dst, &v)?;
     }
 
-    let crate_list_dst = cx.dst.join(&format!("crates{}.js", cx.shared.resource_suffix));
+    let crate_list_dst = cx.dst.join("crates.js");
     let crate_list =
         format!("window.ALL_CRATES = [{}];", krates.iter().map(|k| format!("\"{}\"", k)).join(","));
     cx.shared.fs.write(&crate_list_dst, &crate_list)?;
diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js
index f1ecaaa619c65..d9865be3f412f 100644
--- a/src/librustdoc/html/static/main.js
+++ b/src/librustdoc/html/static/main.js
@@ -2970,7 +2970,7 @@ function defocusSearchBar() {
             }
         }
 
-        // `crates{version}.js` should always be loaded before this script, so we can use it safely.
+        // `crates.js` should always be loaded before this script, so we can use it safely.
         addSearchOptions(window.ALL_CRATES);
         addSidebarCrates(window.ALL_CRATES);