InOsEmuPkg: Rename package to EmulatorPkg & Sec to Host

* Rename InOsEmuPkg to EmulatorPkg
* Rename Unix/Sec to Unix/Host

Signed-off-by: jljusten
Reviewed-by: andrewfish
Reviewed-by: geekboy15a

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11918 6f19259b-4bc3-4df7-8a09-765794883524

EmulatorPkg/AutoScanPei/AutoScanPei.inf

@@ -36,7 +36,7 @@
 [Packages]
   MdePkg/MdePkg.dec
 #  MdeModulePkg/MdeModulePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
 
 [LibraryClasses]
   PeiServicesTablePointerLib

EmulatorPkg/BootModePei/BootModePei.inf

@@ -36,7 +36,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
 
 
 [LibraryClasses]
@@ -52,7 +52,7 @@
   gEfiPeiBootInRecoveryModePpiGuid              # PPI SOMETIMES_PRODUCED
 
 [FixedPcd]
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuBootMode
+  gEmulatorPkgTokenSpaceGuid.PcdEmuBootMode
 
 [Depex]
   TRUE

EmulatorPkg/CpuRuntimeDxe/Cpu.inf

@@ -42,7 +42,7 @@
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
 
 
 [LibraryClasses]
@@ -70,7 +70,7 @@
   gIdleLoopEventGuid                            ## CONSUMES ## GUID
 
 [Pcd]
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuMpServicesPollingInterval
+  gEmulatorPkgTokenSpaceGuid.PcdEmuMpServicesPollingInterval
 
 [Depex]
   gEfiSmbiosProtocolGuid

EmulatorPkg/EmuBlockIoDxe/EmuBlockIoDxe.inf

@@ -45,7 +45,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
 
 [LibraryClasses]
   UefiBootServicesTableLib

EmulatorPkg/EmuBusDriverDxe/EmuBusDriverDxe.c

@@ -191,14 +191,14 @@ EmuBusDriverBindingStart (
       "eng",
       gEmuBusDriverComponentName.SupportedLanguages,
       &EmuBusDevice->ControllerNameTable,
-      L"InOsEmu Bus Controller",
+      L"Emulator Bus Controller",
       TRUE
       );
     AddUnicodeString2 (
       "en",
       gEmuBusDriverComponentName2.SupportedLanguages,
       &EmuBusDevice->ControllerNameTable,
-      L"InOsEmu Bus Controller",
+      L"Emulator Bus Controller",
       FALSE
       );
 

EmulatorPkg/EmuBusDriverDxe/EmuBusDriverDxe.inf

@@ -39,7 +39,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
 
 
 [LibraryClasses]

EmulatorPkg/EmuGopDxe/ComponentName.c

@@ -61,7 +61,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gEmuGopComponentName2
 
 
 EFI_UNICODE_STRING_TABLE mEmuGopDriverNameTable[] = {
-  { "eng", L"InOsEmu GOP Driver" },
+  { "eng", L"Emulator GOP Driver" },
   { NULL , NULL }
 };
 

EmulatorPkg/EmuGopDxe/EmuGopDxe.inf

@@ -42,7 +42,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
 
 
 [LibraryClasses]

EmulatorPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystemDxe.inf

@@ -30,7 +30,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
 
 
 [LibraryClasses]

EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf

@@ -37,7 +37,7 @@
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
 
 [LibraryClasses]
   DevicePathLib

EmulatorPkg/EmuThunkDxe/EmuThunk.inf

@@ -35,7 +35,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
 
 
 [LibraryClasses]

EmulatorPkg/EmulatorPkg.dec

@@ -15,7 +15,7 @@
 
 [Defines]
   DEC_VERSION                    = 0x00010005
-  PACKAGE_NAME                   = InOsEmuPkg
+  PACKAGE_NAME                   = EmulatorPkg
   PACKAGE_GUID                   = 36E48BD7-7D92-5A47-A2CD-513F072E3300
   PACKAGE_VERSION                = 0.1
 
@@ -43,39 +43,39 @@
   gEmuThunkPpiGuid               = { 0xE113F896, 0x75CF, 0xF640, { 0x81, 0x7F, 0xC8, 0x5A, 0x79, 0xE8, 0xAE, 0x67 } }
 
 [Guids]
-  gInOsEmuPkgTokenSpaceGuid  = { 0x4F792E68, 0xE8C8, 0x794E, { 0xB1, 0xD8, 0x37, 0x03, 0xF3, 0xF2, 0xD5, 0xA5 } }
+  gEmulatorPkgTokenSpaceGuid  = { 0x4F792E68, 0xE8C8, 0x794E, { 0xB1, 0xD8, 0x37, 0x03, 0xF3, 0xF2, 0xD5, 0xA5 } }
   gEmuSystemConfigGuid       = { 0xF8626165, 0x6CEB, 0x924A, { 0xBA, 0xFC, 0xF1, 0x3A, 0xB9, 0xD6, 0x57, 0x28 } }
   gEmuVirtualDisksGuid       = { 0xf2ba331a, 0x8985, 0x11db, { 0xa4, 0x06, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } }
   gEmuPhysicalDisksGuid      = { 0xf2bdcc96, 0x8985, 0x11db, { 0x87, 0x19, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } }
 
 [PcdsFixedAtBuild]
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageVariableBase|0x0|UINT64|0x00001014
+  gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageVariableBase|0x0|UINT64|0x00001014
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwSpareBase|0x0|UINT64|0x00001015
+  gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwSpareBase|0x0|UINT64|0x00001015
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwWorkingBase|0x0|UINT64|0x00001016
+  gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwWorkingBase|0x0|UINT64|0x00001016
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuFdBaseAddress|0x0|UINT64|0x00001017
+  gEmulatorPkgTokenSpaceGuid.PcdEmuFdBaseAddress|0x0|UINT64|0x00001017
 
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogBase|0x0|UINT64|0x0000100e
+  gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogBase|0x0|UINT64|0x0000100e
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogSize|0x0|UINT32|0x0000100f
+  gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogSize|0x0|UINT32|0x0000100f
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashFvRecoveryBase|0x0|UINT64|0x00001010
+  gEmulatorPkgTokenSpaceGuid.PcdEmuFlashFvRecoveryBase|0x0|UINT64|0x00001010
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashFvRecoverySize|0x0|UINT32|0x00001011
+  gEmulatorPkgTokenSpaceGuid.PcdEmuFlashFvRecoverySize|0x0|UINT32|0x00001011
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuFirmwareFdSize|0x0|UINT32|0x00001012
+  gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareFdSize|0x0|UINT32|0x00001012
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuFirmwareBlockSize|0|UINT32|0x00001013
+  gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareBlockSize|0|UINT32|0x00001013
  
   ## Number of Application Processors (APs) in the system 0 means Uniprocessor mode
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuApCount|L"0"|VOID*|0x00001019
+  gEmulatorPkgTokenSpaceGuid.PcdEmuApCount|L"0"|VOID*|0x00001019
 
   ## Magic page to implement PEI Services Table Pointer Lib
-  gInOsEmuPkgTokenSpaceGuid.PcdPeiServicesTablePage|0x1003000000|UINT64|0x0000101b
+  gEmulatorPkgTokenSpaceGuid.PcdPeiServicesTablePage|0x1003000000|UINT64|0x0000101b
 
   ## Size of the packet filter
-  gInOsEmuPkgTokenSpaceGuid.PcdNetworkPacketFilterSize|524288|UINT32|0x0000101c
+  gEmulatorPkgTokenSpaceGuid.PcdNetworkPacketFilterSize|524288|UINT32|0x0000101c
 
   
 
 [PcdsFixedAtBuild, PcdsPatchableInModule] 
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuBootMode|1|UINT32|0x00001006
+  gEmulatorPkgTokenSpaceGuid.PcdEmuBootMode|1|UINT32|0x00001006
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuFirmwareVolume|L"..\\Fv\\Fv_Recovery.fd"|VOID*|0x00001009
+  gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareVolume|L"..\\Fv\\Fv_Recovery.fd"|VOID*|0x00001009
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuMemorySize|L"64!64"|VOID*|0x0000100c
+  gEmulatorPkgTokenSpaceGuid.PcdEmuMemorySize|L"64!64"|VOID*|0x0000100c
   
   #
   # filename[:[R|F][O|W]][:BlockSize]
@@ -88,14 +88,14 @@
   #  the device and is not configurable. 
   # Device Size comes from file or device. 
   # On Mac OS X you can use Disk Utility to create .dmg files and mount them like disks
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuVirtualDisk|L"disk.dmg:FW"|VOID*|0x00001001
+  gEmulatorPkgTokenSpaceGuid.PcdEmuVirtualDisk|L"disk.dmg:FW"|VOID*|0x00001001
   
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuGop|L"GOP Window"|VOID*|0x00001018
+  gEmulatorPkgTokenSpaceGuid.PcdEmuGop|L"GOP Window"|VOID*|0x00001018
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuFileSystem|L".!../../../../../EdkShellBinPkg/bin/ia32/Apps"|VOID*|0x00001004
+  gEmulatorPkgTokenSpaceGuid.PcdEmuFileSystem|L".!../../../../../EdkShellBinPkg/bin/ia32/Apps"|VOID*|0x00001004
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuSerialPort|L"/dev/ttyS0"|VOID*|0x00001002
+  gEmulatorPkgTokenSpaceGuid.PcdEmuSerialPort|L"/dev/ttyS0"|VOID*|0x00001002
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuNetworkInterface|L"en0"|VOID*|0x0000100d
+  gEmulatorPkgTokenSpaceGuid.PcdEmuNetworkInterface|L"en0"|VOID*|0x0000100d
 
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuCpuModel|L"Intel(R) Processor Model"|VOID*|0x00001007
+  gEmulatorPkgTokenSpaceGuid.PcdEmuCpuModel|L"Intel(R) Processor Model"|VOID*|0x00001007
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuCpuSpeed|L"3000"|VOID*|0x00001008
+  gEmulatorPkgTokenSpaceGuid.PcdEmuCpuSpeed|L"3000"|VOID*|0x00001008
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuMpServicesPollingInterval|0x100|UINT64|0x0000101a
+  gEmulatorPkgTokenSpaceGuid.PcdEmuMpServicesPollingInterval|0x100|UINT64|0x0000101a
 

EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.inf

@@ -36,7 +36,7 @@
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
 
 [LibraryClasses]
   PeiServicesTablePointerLib
@@ -46,8 +46,8 @@
   DebugLib
 
 [Pcd]
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogSize
+  gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogSize
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageVariableBase
+  gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageVariableBase
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize

EmulatorPkg/FlashMapPei/FlashMapPei.c

@@ -54,7 +54,7 @@ Returns:
   EFI_PHYSICAL_ADDRESS    FdFixUp;
   UINT64                  FdSize;
 
-  DEBUG ((EFI_D_ERROR, "InOsEmuPkg Flash Map PEIM Loaded\n"));
+  DEBUG ((EFI_D_ERROR, "EmulatorPkg Flash Map PEIM Loaded\n"));
 
   //
   // Get the Fwh Information PPI

EmulatorPkg/FlashMapPei/FlashMapPei.inf

@@ -36,7 +36,7 @@
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
 
 [LibraryClasses]
   PcdLib
@@ -59,9 +59,9 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64
 
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwWorkingBase
+  gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwWorkingBase
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwSpareBase
+  gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwSpareBase
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageVariableBase
+  gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageVariableBase
 
 [Depex]
   gEmuThunkPpiGuid

EmulatorPkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf

@@ -37,7 +37,7 @@
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
 
 [LibraryClasses]
   UefiBootServicesTableLib
@@ -60,12 +60,12 @@
   gEfiDevicePathProtocolGuid                    # PROTOCOL SOMETIMES_PRODUCED
 
 [FixedPcd]
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuFirmwareFdSize
+  gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareFdSize
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuFirmwareBlockSize
+  gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareBlockSize
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashFvRecoveryBase
+  gEmulatorPkgTokenSpaceGuid.PcdEmuFlashFvRecoveryBase
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashFvRecoverySize
+  gEmulatorPkgTokenSpaceGuid.PcdEmuFlashFvRecoverySize
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogBase
+  gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogBase
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogSize
+  gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogSize
 
 [Pcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize

EmulatorPkg/Include/Library/EmuMagicPageLib.h

@@ -1,5 +1,5 @@
 /*++ @file
-The PCD, gInOsEmuPkgTokenSpaceGuid.PcdPeiServicesTablePage, points to a magic page
+The PCD, gEmulatorPkgTokenSpaceGuid.PcdPeiServicesTablePage, points to a magic page
 of memory that is like SRAM on an embedded system. This file defines what goes 
 where in the magic page.
 

EmulatorPkg/Library/DevicePathTextLib/DevicePathTextLib.inf

@@ -33,7 +33,7 @@
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
 
 [LibraryClasses]
   BaseLib

EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.inf

@@ -36,7 +36,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
 
 [LibraryClasses]
   DebugLib

EmulatorPkg/Library/DxeEmuLib/DxeEmuLib.inf

@@ -33,7 +33,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
 
 [LibraryClasses]
   HobLib

EmulatorPkg/Library/DxeEmuPeCoffExtraActionLib/DxeEmuPeCoffExtraActionLib.inf

@@ -36,7 +36,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
 
 [LibraryClasses]
   DebugLib

EmulatorPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.inf

@@ -29,7 +29,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
   
 [LibraryClasses]
   EmuThunkLib

EmulatorPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPortLib.inf

@@ -29,7 +29,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
   
 [LibraryClasses]
   EmuThunkLib

EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.inf

@@ -38,7 +38,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
 
 [LibraryClasses]
   BaseLib

EmulatorPkg/Library/EmuBdsLib/EmuBdsLib.inf

@@ -38,7 +38,7 @@
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
 
 [LibraryClasses]

EmulatorPkg/Library/GuardUefiMemoryAllocationLib/GuardUefiMemoryAllocationLib.inf

@@ -33,7 +33,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
 
 [LibraryClasses]
   DebugLib

EmulatorPkg/Library/KeyMapLibNull/KeyMapLibNull.inf

@@ -30,7 +30,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
 
 [LibraryClasses]
   HobLib

EmulatorPkg/Library/PeiCoreServicesTablePointerLib/PeiCoreServicesTablePointerLib.inf

@@ -20,7 +20,7 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = InOsEmuPkgPeiCoreServicesTablePointerLib
+  BASE_NAME                      = EmulatorPkgPeiCoreServicesTablePointerLib
   FILE_GUID                      = E9A22529-44FA-3E4A-A66B-1E918E7AB26A
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0

EmulatorPkg/Library/PeiEmuPeCoffExtraActionLib/PeiEmuPeCoffExtraActionLib.inf

@@ -35,7 +35,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
 
 [LibraryClasses]
   BaseLib
@@ -46,4 +46,4 @@
   gEmuThunkPpiGuid                          # PPI ALWAYS_CONSUMED
 
 [Pcd]
-  gInOsEmuPkgTokenSpaceGuid.PcdPeiServicesTablePage
+  gEmulatorPkgTokenSpaceGuid.PcdPeiServicesTablePage

EmulatorPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.inf

@@ -36,7 +36,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
 
 
 [LibraryClasses]

EmulatorPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.inf

@@ -32,7 +32,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
   
 [LibraryClasses]
   PeiServicesLib

EmulatorPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf

@@ -20,7 +20,7 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = InOsEmuPkgPeiServicesTablePointerLib
+  BASE_NAME                      = EmulatorPkgPeiServicesTablePointerLib
   FILE_GUID                      =  5FD8B4ED-D66F-C144-9953-AC557C649925
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0

EmulatorPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointer.c

@@ -1,7 +1,7 @@
 /** @file
   PEI Services Table Pointer Library.
   
-  Store PEI Services Table pointer via gInOsEmuPkgTokenSpaceGuid.PcdPeiServicesTablePage.
+  Store PEI Services Table pointer via gEmulatorPkgTokenSpaceGuid.PcdPeiServicesTablePage.
   This emulates a platform SRAM. The PI mechaism does not work in the emulator due to
   lack of privledge.
 

EmulatorPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointerLibMagicPage.inf

@@ -1,7 +1,7 @@
 ## @file
 #  PEI Services Table Pointer Library.
 #  
-#  Store PEI Services Table pointer via gInOsEmuPkgTokenSpaceGuid.PcdPeiServicesTablePage.
+#  Store PEI Services Table pointer via gEmulatorPkgTokenSpaceGuid.PcdPeiServicesTablePage.
 #  This emulates a platform SRAM. The PI mechaism does not work in the emulator due to
 #  lack of privledge.
 #
@@ -20,7 +20,7 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = InOsEmuPkgPeiServicesTablePointerLib
+  BASE_NAME                      = EmulatorPkgPeiServicesTablePointerLib
   FILE_GUID                      = 7488FC06-370A-1C41-B05C-7395559A535A
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
@@ -35,10 +35,10 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
 
 [LibraryClasses]
   DebugLib
 
 [Pcd]
-  gInOsEmuPkgTokenSpaceGuid.PcdPeiServicesTablePage
+  gEmulatorPkgTokenSpaceGuid.PcdPeiServicesTablePage

EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.inf

@@ -37,7 +37,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  InOsEmuPkg/InOsEmuPkg.dec
+  EmulatorPkg/EmulatorPkg.dec
 
 [LibraryClasses]
   DebugLib