diff --git a/stdlib/private/CMakeLists.txt b/stdlib/private/CMakeLists.txt
index d98138d88420c..d0138701225da 100644
--- a/stdlib/private/CMakeLists.txt
+++ b/stdlib/private/CMakeLists.txt
@@ -10,7 +10,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     add_subdirectory(StdlibUnittest)
     add_subdirectory(StdlibCollectionUnittest)
     add_subdirectory(StdlibUnittestFoundationExtras)
-    add_subdirectory(SwiftPrivateDarwinExtras)
+    add_subdirectory(SwiftPrivateLibcExtras)
     add_subdirectory(SwiftPrivatePthreadExtras)
   endif()
 endif()
@@ -18,6 +18,6 @@ endif()
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
   add_subdirectory(StdlibUnittest)
   add_subdirectory(StdlibCollectionUnittest)
-  add_subdirectory(SwiftPrivateDarwinExtras)
+  add_subdirectory(SwiftPrivateLibcExtras)
   add_subdirectory(SwiftPrivatePthreadExtras)
 endif()
diff --git a/stdlib/private/StdlibUnittest/CMakeLists.txt b/stdlib/private/StdlibUnittest/CMakeLists.txt
index e662b00cdabc0..412dff300d89c 100644
--- a/stdlib/private/StdlibUnittest/CMakeLists.txt
+++ b/stdlib/private/StdlibUnittest/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(swift_stdlib_unittest_platform_sources)
 set(swift_stdlib_unittest_module_depends
-  SwiftPrivate SwiftPrivatePthreadExtras SwiftPrivateDarwinExtras)
+  SwiftPrivate SwiftPrivatePthreadExtras SwiftPrivateLibcExtras)
 set(swift_stdlib_unittest_framework_depends)
 set(swift_stdlib_unittest_private_link_libraries)
 set(swift_stdlib_unittest_compile_flags)
diff --git a/stdlib/private/StdlibUnittest/StdlibCoreExtras.swift b/stdlib/private/StdlibUnittest/StdlibCoreExtras.swift
index 17a31988801c7..3919ce567deff 100644
--- a/stdlib/private/StdlibUnittest/StdlibCoreExtras.swift
+++ b/stdlib/private/StdlibUnittest/StdlibCoreExtras.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import SwiftPrivate
-import SwiftPrivateDarwinExtras
+import SwiftPrivateLibcExtras
 #if os(OSX) || os(iOS)
 import Darwin
 #elseif os(Linux) || os(FreeBSD)
diff --git a/stdlib/private/StdlibUnittest/StdlibUnittest.swift.gyb b/stdlib/private/StdlibUnittest/StdlibUnittest.swift.gyb
index 5111df9434ad5..293421917a62f 100644
--- a/stdlib/private/StdlibUnittest/StdlibUnittest.swift.gyb
+++ b/stdlib/private/StdlibUnittest/StdlibUnittest.swift.gyb
@@ -12,7 +12,7 @@
 
 import SwiftPrivate
 import SwiftPrivatePthreadExtras
-import SwiftPrivateDarwinExtras
+import SwiftPrivateLibcExtras
 
 #if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
 import Darwin
diff --git a/stdlib/private/SwiftPrivateDarwinExtras/CMakeLists.txt b/stdlib/private/SwiftPrivateLibcExtras/CMakeLists.txt
similarity index 86%
rename from stdlib/private/SwiftPrivateDarwinExtras/CMakeLists.txt
rename to stdlib/private/SwiftPrivateLibcExtras/CMakeLists.txt
index 933acb607b720..ee47dd8ebeed0 100644
--- a/stdlib/private/SwiftPrivateDarwinExtras/CMakeLists.txt
+++ b/stdlib/private/SwiftPrivateLibcExtras/CMakeLists.txt
@@ -9,10 +9,10 @@ elseif(SWIFT_HOST_VARIANT STREQUAL "linux" OR SWIFT_HOST_VARIANT STREQUAL "freeb
     Glibc)
 endif()
 
-add_swift_library(swiftSwiftPrivateDarwinExtras SHARED IS_STDLIB
+add_swift_library(swiftSwiftPrivateLibcExtras SHARED IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
   # filename.
-  SwiftPrivateDarwinExtras.swift
+  SwiftPrivateLibcExtras.swift
   Subprocess.swift
 
   SWIFT_MODULE_DEPENDS ${swift_private_darwin_extras_module_depends}
diff --git a/stdlib/private/SwiftPrivateDarwinExtras/Subprocess.swift b/stdlib/private/SwiftPrivateLibcExtras/Subprocess.swift
similarity index 100%
rename from stdlib/private/SwiftPrivateDarwinExtras/Subprocess.swift
rename to stdlib/private/SwiftPrivateLibcExtras/Subprocess.swift
diff --git a/stdlib/private/SwiftPrivateDarwinExtras/SwiftPrivateDarwinExtras.swift b/stdlib/private/SwiftPrivateLibcExtras/SwiftPrivateLibcExtras.swift
similarity index 97%
rename from stdlib/private/SwiftPrivateDarwinExtras/SwiftPrivateDarwinExtras.swift
rename to stdlib/private/SwiftPrivateLibcExtras/SwiftPrivateLibcExtras.swift
index c8168921e3045..6681440d5300a 100644
--- a/stdlib/private/SwiftPrivateDarwinExtras/SwiftPrivateDarwinExtras.swift
+++ b/stdlib/private/SwiftPrivateLibcExtras/SwiftPrivateLibcExtras.swift
@@ -1,4 +1,4 @@
-//===--- SwiftPrivateDarwinExtras.swift -----------------------------------===//
+//===--- SwiftPrivateLibcExtras.swift -----------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //