diff --git a/EdkUnixPkg/EdkUnixPkg.spd b/EdkUnixPkg/EdkUnixPkg.spd
index 982bb07f15..084d266c8f 100644
--- a/EdkUnixPkg/EdkUnixPkg.spd
+++ b/EdkUnixPkg/EdkUnixPkg.spd
@@ -45,27 +45,27 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <HelpText/>
     </IndustryStdHeader>
     <IndustryStdHeader Name="EdkGenericBdsLib">
-      <IncludeHeader>Include/library/EdkGenericBdsLib.h</IncludeHeader>
+      <IncludeHeader>Include/Library/EdkGenericBdsLib.h</IncludeHeader>
       <HelpText/>
     </IndustryStdHeader>
     <IndustryStdHeader Name="UnixLib">
-      <IncludeHeader>Include/library/UnixLib.h</IncludeHeader>
+      <IncludeHeader>Include/Library/UnixLib.h</IncludeHeader>
       <HelpText/>
     </IndustryStdHeader>
-    <IndustryStdHeader Name="NtAutoscan">
-      <IncludeHeader>Include/Ppi/NtAutoscan.h</IncludeHeader>
+    <IndustryStdHeader Name="UnixAutoScan">
+      <IncludeHeader>Include/Ppi/UnixAutoScan.h</IncludeHeader>
       <HelpText/>
     </IndustryStdHeader>
-    <IndustryStdHeader Name="NtFwh">
-      <IncludeHeader>Include/Ppi/NtFwh.h</IncludeHeader>
+    <IndustryStdHeader Name="UnixFwh">
+      <IncludeHeader>Include/Ppi/UnixFwh.h</IncludeHeader>
       <HelpText/>
     </IndustryStdHeader>
-    <IndustryStdHeader Name="NtPeiLoadFile">
-      <IncludeHeader>Include/Ppi/NtPeiLoadFile.h</IncludeHeader>
+    <IndustryStdHeader Name="UnixPeiLoadFile">
+      <IncludeHeader>Include/Ppi/UnixPeiLoadFile.h</IncludeHeader>
       <HelpText/>
     </IndustryStdHeader>
-    <IndustryStdHeader Name="NtThunk">
-      <IncludeHeader>Include/Ppi/NtThunk.h</IncludeHeader>
+    <IndustryStdHeader Name="UnixThunk">
+      <IncludeHeader>Include/Ppi/UnixThunk.h</IncludeHeader>
       <HelpText/>
     </IndustryStdHeader>
     <IndustryStdHeader Name="UnixIo">