diff --git a/src/librustc_target/spec/avr_unknown_unknown.rs b/src/librustc_target/spec/avr_unknown_unknown.rs
index c951c980e2a..f90a8def0aa 100644
--- a/src/librustc_target/spec/avr_unknown_unknown.rs
+++ b/src/librustc_target/spec/avr_unknown_unknown.rs
@@ -12,6 +12,6 @@ pub fn target() -> TargetResult {
         target_env: "".to_string(),
         target_vendor: "unknown".to_string(),
         target_c_int_width: 16.to_string(),
-        options: super::none_base::opts(),
+        options: super::freestanding_base::opts(),
     })
 }
diff --git a/src/librustc_target/spec/none_base.rs b/src/librustc_target/spec/freestanding_base.rs
similarity index 100%
rename from src/librustc_target/spec/none_base.rs
rename to src/librustc_target/spec/freestanding_base.rs
diff --git a/src/librustc_target/spec/mod.rs b/src/librustc_target/spec/mod.rs
index 833beee3bd4..29250f21383 100644
--- a/src/librustc_target/spec/mod.rs
+++ b/src/librustc_target/spec/mod.rs
@@ -54,6 +54,7 @@ mod arm_base;
 mod cloudabi_base;
 mod dragonfly_base;
 mod freebsd_base;
+mod freestanding_base;
 mod fuchsia_base;
 mod haiku_base;
 mod hermit_base;
@@ -65,7 +66,6 @@ mod linux_kernel_base;
 mod linux_musl_base;
 mod msvc_base;
 mod netbsd_base;
-mod none_base;
 mod openbsd_base;
 mod redox_base;
 mod riscv_base;