diff --git a/Pixel3XL/Library/InMemorySerialPortLib/BaseSerialPortLibNull.c b/Pixel3XL/Library/InMemorySerialPortLib/InMemorySerialPortLib.c
similarity index 100%
rename from Pixel3XL/Library/InMemorySerialPortLib/BaseSerialPortLibNull.c
rename to Pixel3XL/Library/InMemorySerialPortLib/InMemorySerialPortLib.c
diff --git a/Pixel3XL/Library/InMemorySerialPortLib/BaseSerialPortLibNull.inf b/Pixel3XL/Library/InMemorySerialPortLib/InMemorySerialPortLib.inf
similarity index 77%
rename from Pixel3XL/Library/InMemorySerialPortLib/BaseSerialPortLibNull.inf
rename to Pixel3XL/Library/InMemorySerialPortLib/InMemorySerialPortLib.inf
index 1d56051..b693be2 100644
--- a/Pixel3XL/Library/InMemorySerialPortLib/BaseSerialPortLibNull.inf
+++ b/Pixel3XL/Library/InMemorySerialPortLib/InMemorySerialPortLib.inf
@@ -15,9 +15,9 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = BaseSerialPortLibNull
-  MODULE_UNI_FILE                = BaseSerialPortLibNull.uni
-  FILE_GUID                      = E4541241-8897-411a-91F8-7D7E45837146
+  BASE_NAME                      = InMemorySerialPortLib
+  MODULE_UNI_FILE                = InMemorySerialPortLib.uni
+  FILE_GUID                      = 762fbf9a-984a-4960-9c7c-e0a076860304
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = SerialPortLib
@@ -28,7 +28,7 @@
 #
 
 [Sources]
-  BaseSerialPortLibNull.c
+  InMemorySerialPortLib.c
 
 
 [Packages]
diff --git a/Pixel3XL/Library/InMemorySerialPortLib/BaseSerialPortLibNull.uni b/Pixel3XL/Library/InMemorySerialPortLib/InMemorySerialPortLib.uni
similarity index 70%
rename from Pixel3XL/Library/InMemorySerialPortLib/BaseSerialPortLibNull.uni
rename to Pixel3XL/Library/InMemorySerialPortLib/InMemorySerialPortLib.uni
index 8c61c5a..8bd0468 100644
--- a/Pixel3XL/Library/InMemorySerialPortLib/BaseSerialPortLibNull.uni
+++ b/Pixel3XL/Library/InMemorySerialPortLib/InMemorySerialPortLib.uni
@@ -15,7 +15,7 @@
 // **/
 
 
-#string STR_MODULE_ABSTRACT             #language en-US "Null instance of Serial Port Library with empty functions"
+#string STR_MODULE_ABSTRACT             #language en-US "Serial Port Library that dumps everything written to in memory buffer"
 
-#string STR_MODULE_DESCRIPTION          #language en-US "Null instance of Serial Port Library with empty functions."
+#string STR_MODULE_DESCRIPTION          #language en-US "Serial Port Library that dumps everything written to in memory buffer"