diff --git a/AppPkg/Applications/OrderedCollectionTest/OrderedCollectionTest.inf b/AppPkg/Applications/OrderedCollectionTest/OrderedCollectionTest.inf
index 5eb71fe49a..cfa835b761 100644
--- a/AppPkg/Applications/OrderedCollectionTest/OrderedCollectionTest.inf
+++ b/AppPkg/Applications/OrderedCollectionTest/OrderedCollectionTest.inf
@@ -38,5 +38,5 @@
 [LibraryClasses]
   LibC
   LibStdio
-  DevShell
+  DevMedia
   OrderedCollectionLib
diff --git a/AppPkg/Applications/Python/PythonCore.inf b/AppPkg/Applications/Python/PythonCore.inf
index 91c3afa22b..ece84378fe 100644
--- a/AppPkg/Applications/Python/PythonCore.inf
+++ b/AppPkg/Applications/Python/PythonCore.inf
@@ -41,7 +41,7 @@
   LibWchar
   LibGen
   LibNetUtil
-  DevShell
+  DevMedia
   #
   # Comment out the following two library classes if socket support is
   # NOT being built in to Python.
diff --git a/AppPkg/Applications/Sockets/GetAddrInfo/GetAddrInfo.inf b/AppPkg/Applications/Sockets/GetAddrInfo/GetAddrInfo.inf
index 34267a860b..bcfb985432 100644
--- a/AppPkg/Applications/Sockets/GetAddrInfo/GetAddrInfo.inf
+++ b/AppPkg/Applications/Sockets/GetAddrInfo/GetAddrInfo.inf
@@ -40,7 +40,7 @@
 [LibraryClasses]
   BaseMemoryLib
   BsdSocketLib
-  DevShell
+  DevMedia
   EfiSocketLib
   LibC
   LibMath
diff --git a/AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.inf b/AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.inf
index 9ed1d37ad5..d164510db1 100644
--- a/AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.inf
+++ b/AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.inf
@@ -41,7 +41,7 @@
   BaseMemoryLib
   BsdSocketLib
   DebugLib
-  DevShell
+  DevMedia
   EfiSocketLib
   LibC
   LibMath
diff --git a/AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.inf b/AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.inf
index 44d6fda757..9856578306 100644
--- a/AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.inf
+++ b/AppPkg/Applications/Sockets/GetHostByDns/GetHostByDns.inf
@@ -41,7 +41,7 @@
   BaseMemoryLib
   BsdSocketLib
   DebugLib
-  DevShell
+  DevMedia
   EfiSocketLib
   LibC
   LibMath
diff --git a/AppPkg/Applications/Sockets/GetHostByName/GetHostByName.inf b/AppPkg/Applications/Sockets/GetHostByName/GetHostByName.inf
index f6d0aea466..a6f001a76a 100644
--- a/AppPkg/Applications/Sockets/GetHostByName/GetHostByName.inf
+++ b/AppPkg/Applications/Sockets/GetHostByName/GetHostByName.inf
@@ -41,7 +41,7 @@
   BaseMemoryLib
   BsdSocketLib
   DebugLib
-  DevShell
+  DevMedia
   EfiSocketLib
   LibC
   LibMath
diff --git a/AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.inf b/AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.inf
index 0aa35a5b66..87f8910f8b 100644
--- a/AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.inf
+++ b/AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.inf
@@ -40,7 +40,7 @@
 [LibraryClasses]
   BaseMemoryLib
   BsdSocketLib
-  DevShell
+  DevMedia
   EfiSocketLib
   LibC
   LibMath
diff --git a/AppPkg/Applications/Sockets/GetNetByAddr/GetNetByAddr.inf b/AppPkg/Applications/Sockets/GetNetByAddr/GetNetByAddr.inf
index 003b89fd93..f1b3954bc5 100644
--- a/AppPkg/Applications/Sockets/GetNetByAddr/GetNetByAddr.inf
+++ b/AppPkg/Applications/Sockets/GetNetByAddr/GetNetByAddr.inf
@@ -41,7 +41,7 @@
   BaseMemoryLib
   BsdSocketLib
   DebugLib
-  DevShell
+  DevMedia
   EfiSocketLib
   LibC
   LibMath
diff --git a/AppPkg/Applications/Sockets/GetNetByName/GetNetByName.inf b/AppPkg/Applications/Sockets/GetNetByName/GetNetByName.inf
index e5e7416488..bfb1cd61b1 100644
--- a/AppPkg/Applications/Sockets/GetNetByName/GetNetByName.inf
+++ b/AppPkg/Applications/Sockets/GetNetByName/GetNetByName.inf
@@ -41,7 +41,7 @@
   BaseMemoryLib
   BsdSocketLib
   DebugLib
-  DevShell
+  DevMedia
   EfiSocketLib
   LibC
   LibMath
diff --git a/AppPkg/Applications/Sockets/GetServByName/GetServByName.inf b/AppPkg/Applications/Sockets/GetServByName/GetServByName.inf
index 5c10b90146..1b66e50a35 100644
--- a/AppPkg/Applications/Sockets/GetServByName/GetServByName.inf
+++ b/AppPkg/Applications/Sockets/GetServByName/GetServByName.inf
@@ -41,7 +41,7 @@
   BaseMemoryLib
   BsdSocketLib
   DebugLib
-  DevShell
+  DevMedia
   EfiSocketLib
   LibC
   LibMath
diff --git a/AppPkg/Applications/Sockets/GetServByPort/GetServByPort.inf b/AppPkg/Applications/Sockets/GetServByPort/GetServByPort.inf
index a6b5b61ab7..d2a387f36f 100644
--- a/AppPkg/Applications/Sockets/GetServByPort/GetServByPort.inf
+++ b/AppPkg/Applications/Sockets/GetServByPort/GetServByPort.inf
@@ -41,7 +41,7 @@
   BaseMemoryLib
   BsdSocketLib
   DebugLib
-  DevShell
+  DevMedia
   EfiSocketLib
   LibC
   LibMath
diff --git a/AppPkg/Applications/Sockets/RecvDgram/RecvDgram.inf b/AppPkg/Applications/Sockets/RecvDgram/RecvDgram.inf
index 89e907c140..9a9ca711c6 100644
--- a/AppPkg/Applications/Sockets/RecvDgram/RecvDgram.inf
+++ b/AppPkg/Applications/Sockets/RecvDgram/RecvDgram.inf
@@ -41,7 +41,7 @@
   BaseMemoryLib
   BsdSocketLib
   DebugLib
-  DevShell
+  DevMedia
   EfiSocketLib
   LibC
   LibMath
diff --git a/AppPkg/Applications/Sockets/SetHostName/SetHostName.inf b/AppPkg/Applications/Sockets/SetHostName/SetHostName.inf
index 97b63822b6..ed1b4951e4 100644
--- a/AppPkg/Applications/Sockets/SetHostName/SetHostName.inf
+++ b/AppPkg/Applications/Sockets/SetHostName/SetHostName.inf
@@ -41,7 +41,7 @@
   BaseMemoryLib
   BsdSocketLib
   DebugLib
-  DevShell
+  DevMedia
   EfiSocketLib
   LibC
   LibMath
diff --git a/AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.inf b/AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.inf
index 8f6ab004eb..e088be7cc4 100644
--- a/AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.inf
+++ b/AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.inf
@@ -41,7 +41,7 @@
   BaseMemoryLib
   BsdSocketLib
   DebugLib
-  DevShell
+  DevMedia
   EfiSocketLib
   LibC
   LibMath
diff --git a/AppPkg/Applications/Sockets/TftpServer/TftpServer.inf b/AppPkg/Applications/Sockets/TftpServer/TftpServer.inf
index f069494b30..79513c2215 100644
--- a/AppPkg/Applications/Sockets/TftpServer/TftpServer.inf
+++ b/AppPkg/Applications/Sockets/TftpServer/TftpServer.inf
@@ -52,7 +52,7 @@
   BaseMemoryLib
   BsdSocketLib
   DebugLib
-  DevShell
+  DevMedia
   EfiSocketLib
   LibC
   ShellLib
diff --git a/AppPkg/Applications/Sockets/WebServer/WebServer.inf b/AppPkg/Applications/Sockets/WebServer/WebServer.inf
index 3650aef96e..27faefba2c 100644
--- a/AppPkg/Applications/Sockets/WebServer/WebServer.inf
+++ b/AppPkg/Applications/Sockets/WebServer/WebServer.inf
@@ -75,7 +75,7 @@
   BaseMemoryLib
   BsdSocketLib
   DebugLib
-  DevShell
+  DevMedia
   DxeServicesTableLib
   EfiSocketLib
   LibC
diff --git a/StdLib/LibC/Uefi/Devices/daShell.inf b/StdLib/LibC/Uefi/Devices/daShell.inf
index 56710259b6..7c456cb652 100644
--- a/StdLib/LibC/Uefi/Devices/daShell.inf
+++ b/StdLib/LibC/Uefi/Devices/daShell.inf
@@ -23,6 +23,7 @@
   MODULE_TYPE                   = UEFI_APPLICATION
   VERSION_STRING                = 1.0
   LIBRARY_CLASS                 = DevShell
+  LIBRARY_CLASS                 = DevMedia
   CONSTRUCTOR                   = __ctor_DevShell
   DESTRUCTOR                    = __dtor_DevShell
 
diff --git a/StdLib/StdLib.inc b/StdLib/StdLib.inc
index 60f4cc4d1c..cb54be1548 100644
--- a/StdLib/StdLib.inc
+++ b/StdLib/StdLib.inc
@@ -65,7 +65,8 @@
 # Applications should not directly access any functions defined in these libraries.
   LibGdtoa|StdLib/LibC/gdtoa/gdtoa.inf
   DevConsole|StdLib/LibC/Uefi/Devices/daConsole.inf
-  DevShell|StdLib/LibC/Uefi/Devices/daShell.inf
+  DevShell|StdLib/LibC/Uefi/Devices/daShell.inf       # DEPRECATED!  Please use DevMedia for new code.
+  DevMedia|StdLib/LibC/Uefi/Devices/daShell.inf
   DevUtility|StdLib/LibC/Uefi/Devices/daUtility.inf
 
 [LibraryClasses.ARM]