diff --git a/.gitignore b/.gitignore
index f45fa52..d4c3214 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
 *.make
 Makefile
 /BUILD/
+/UNUSED/
 
 # Prerequisites
 *.d
diff --git a/BOOT/ENVIRON/APP/BOOTMGR/EFI/efientry.c b/BOOT/ENVIRON/APP/BOOTMGR/EFI/efientry.c
index a4fe761..d2ec0e2 100644
--- a/BOOT/ENVIRON/APP/BOOTMGR/EFI/efientry.c
+++ b/BOOT/ENVIRON/APP/BOOTMGR/EFI/efientry.c
@@ -44,7 +44,7 @@ Return Value:
 --*/
 
 {
-    PBOOT_APPLICATION_PARAMETERS InputParameters;
+    PBOOT_INPUT_PARAMETERS InputParameters;
 
     //
     // Create firmware-independent input structure from EFI parameters.
diff --git a/BOOT/ENVIRON/APP/BOOTMGR/bootmgr.c b/BOOT/ENVIRON/APP/BOOTMGR/bootmgr.c
index d08f144..0575fed 100644
--- a/BOOT/ENVIRON/APP/BOOTMGR/bootmgr.c
+++ b/BOOT/ENVIRON/APP/BOOTMGR/bootmgr.c
@@ -17,7 +17,7 @@ Abstract:
 
 NTSTATUS
 BmMain (
-    IN PBOOT_APPLICATION_PARAMETERS Parameters
+    IN PBOOT_INPUT_PARAMETERS InputParameters
     )
 
 /*++
@@ -28,7 +28,7 @@ Routine Description:
 
 Arguments:
 
-    Parameters - Input parameters for the boot manager.
+    InputParameters - Input parameters for the boot manager.
 
 Return Value:
 
@@ -38,9 +38,9 @@ Return Value:
 --*/
 
 {
-    (VOID)Parameters;
+    (VOID)InputParameters;
 
-    /* Not implemented */
+    /* TODO: Implement this */
 
     return STATUS_SUCCESS;
 }
diff --git a/BOOT/ENVIRON/INC/bootmgr.h b/BOOT/ENVIRON/INC/bootmgr.h
index d940869..6905ed5 100644
--- a/BOOT/ENVIRON/INC/bootmgr.h
+++ b/BOOT/ENVIRON/INC/bootmgr.h
@@ -18,17 +18,17 @@ Abstract:
 
 #include <nt.h>
 
-#define BOOT_APPLICATION_PARAMETERS_SIGNATURE 0x50504120544f4f42 /* "BOOT APP" */
-#define BOOT_APPLICATION_PARAMETERS_VERSION   2
+#define BOOT_INPUT_PARAMETERS_SIGNATURE 0x50504120544f4f42 /* "BOOT APP" */
+#define BOOT_INPUT_PARAMETERS_VERSION   2
 
 typedef struct {
     ULONGLONG Signature;
     ULONG Version;
-} BOOT_APPLICATION_PARAMETERS, *PBOOT_APPLICATION_PARAMETERS;
+} BOOT_INPUT_PARAMETERS, *PBOOT_INPUT_PARAMETERS;
 
 NTSTATUS
 BmMain (
-    IN PBOOT_APPLICATION_PARAMETERS Parameters
+    IN PBOOT_INPUT_PARAMETERS InputParameters
     );
 
 #endif
diff --git a/BOOT/ENVIRON/INC/efilib.h b/BOOT/ENVIRON/INC/efilib.h
index e648d14..ebdebc2 100644
--- a/BOOT/ENVIRON/INC/efilib.h
+++ b/BOOT/ENVIRON/INC/efilib.h
@@ -20,7 +20,7 @@ Abstract:
 #include "bootmgr.h"
 #include "efi.h"
 
-PBOOT_APPLICATION_PARAMETERS
+PBOOT_INPUT_PARAMETERS
 EfiInitCreateInputParameters (
     IN EFI_HANDLE ImageHandle,
     IN EFI_SYSTEM_TABLE *SystemTable
diff --git a/BOOT/ENVIRON/LIB/EFI/efiinit.c b/BOOT/ENVIRON/LIB/EFI/efiinit.c
index e399fdd..44d5358 100644
--- a/BOOT/ENVIRON/LIB/EFI/efiinit.c
+++ b/BOOT/ENVIRON/LIB/EFI/efiinit.c
@@ -18,7 +18,7 @@ Abstract:
 
 UCHAR EfiInitScratch[2048];
 
-PBOOT_APPLICATION_PARAMETERS
+PBOOT_INPUT_PARAMETERS
 EfiInitCreateInputParameters (
     IN EFI_HANDLE ImageHandle,
     IN EFI_SYSTEM_TABLE *SystemTable
@@ -44,15 +44,17 @@ Return Value:
 
 {
     ULONG ScratchUsed = 0;
-    PBOOT_APPLICATION_PARAMETERS InputParameters;
+    PBOOT_INPUT_PARAMETERS InputParameters;
 
     (VOID)ImageHandle;
     (VOID)SystemTable;
 
-    InputParameters = (PBOOT_APPLICATION_PARAMETERS)(&EfiInitScratch[ScratchUsed]);
-    InputParameters->Signature = BOOT_APPLICATION_PARAMETERS_SIGNATURE;
-    InputParameters->Version = BOOT_APPLICATION_PARAMETERS_VERSION;
-    ScratchUsed += sizeof(BOOT_APPLICATION_PARAMETERS);
+    InputParameters = (PBOOT_INPUT_PARAMETERS)(&EfiInitScratch[ScratchUsed]);
+    InputParameters->Signature = BOOT_INPUT_PARAMETERS_SIGNATURE;
+    InputParameters->Version = BOOT_INPUT_PARAMETERS_VERSION;
+    ScratchUsed += sizeof(BOOT_INPUT_PARAMETERS);
+
+    /* TODO: Create additional parameter structures */
 
     return InputParameters;
 }
diff --git a/BOOT/ENVIRON/LIB/EFI/efistatus.c b/BOOT/ENVIRON/LIB/EFI/efilib.c
similarity index 97%
rename from BOOT/ENVIRON/LIB/EFI/efistatus.c
rename to BOOT/ENVIRON/LIB/EFI/efilib.c
index fe878d7..756b403 100644
--- a/BOOT/ENVIRON/LIB/EFI/efistatus.c
+++ b/BOOT/ENVIRON/LIB/EFI/efilib.c
@@ -5,11 +5,11 @@ Provided under the BSD 3-Clause license.
 
 Module Name:
 
-   efistatus.c
+   efilib.c
 
 Abstract:
 
-   Provides EFI status code utilities.
+   Provides EFI utilities.
 
 --*/