diff --git a/MdeModulePkg/Application/UefiSeven/UefiSeven.c b/MdeModulePkg/Application/UefiSeven/UefiSeven.c
index a2e817b34..168671913 100644
--- a/MdeModulePkg/Application/UefiSeven/UefiSeven.c
+++ b/MdeModulePkg/Application/UefiSeven/UefiSeven.c
@@ -218,13 +218,13 @@ UefiMain (
 	// Check if we can chainload the Windows Boot Manager.
 	//
 	EfiFilePath = PathCleanUpDirectories(ConvertDevicePathToText(UefiSevenImageInfo->FilePath, FALSE, FALSE));
-	Status = GetFilenameInSameDirectory(EfiFilePath, L"bootx64_original.efi", (VOID **)&LaunchPath);
+	Status = ChangeExtension(EfiFilePath, L"original.efi", (VOID **)&LaunchPath);
 	FreePool(EfiFilePath);
 	if (!EFI_ERROR(Status) && FileExists(LaunchPath)) {
 		PrintDebug(L"Found Windows Boot Manager at '%s'\n", LaunchPath);
 	} else {
 		PrintError(L"Could not find Windows Boot Manager at '%s'\n", LaunchPath);
-		PrintError(L"Rename the original bootx64.efi from efi\\boot\\ to bootx64_original.efi\n");
+		//PrintError(L"Rename the original bootx64.efi from efi\\boot\\ to bootx64.original.efi\n");
 		PrintError(L"Press Enter to continue.\n");
 		WaitForEnter(FALSE);
 	}
diff --git a/MdeModulePkg/Application/UefiSeven/Version.h b/MdeModulePkg/Application/UefiSeven/Version.h
index 3908dcc99..0e7de5ec9 100644
--- a/MdeModulePkg/Application/UefiSeven/Version.h
+++ b/MdeModulePkg/Application/UefiSeven/Version.h
@@ -16,6 +16,6 @@
 #ifndef __VERSION_H
 #define __VERSION_H
 
-#define	VERSION	L"1.20"
+#define	VERSION	L"1.21"
 
 #endif
diff --git a/README.md b/README.md
index 47194ec70..a277e4e55 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Int10h handler comes with a macro, when enabled before compiling, that will enab
 
 ## Usage instructions
 1. Prepare Windows 7 installation USB Drive
-2. Rename bootx64.efi at (UsbDrive)\EFI\Boot\ to bootx64_original.efi
+2. Rename bootx64.efi at (UsbDrive)\EFI\Boot\ to bootx64.original.efi
 3. Unpack bootx64.efi from UefiSeven archive and copy it to (UsbDrive)\EFI\Boot\
 4. (Optional) Copy UefiSeven.verbose to the same directory to enable verbose mode
 5. After Installation, follow steps 2-4 for the EFI partition of your system drive using an EFI Shell