diff --git a/Include/Library/OcDevicePathLib.h b/Include/Library/OcDevicePathLib.h
index 3e771be5..8fcb626d 100755
--- a/Include/Library/OcDevicePathLib.h
+++ b/Include/Library/OcDevicePathLib.h
@@ -173,9 +173,9 @@ OcFileDevicePathFullNameSize (
 **/
 VOID
 OcFileDevicePathFullName (
-  OUT CHAR16                          *PathName,
-  IN  CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath,
-  IN  UINTN                           PathNameSize
+  OUT CHAR16                      *PathName,
+  IN  CONST FILEPATH_DEVICE_PATH  *FilePath,
+  IN  UINTN                       PathNameSize
   );
 
 /**
diff --git a/Library/OcDevicePathLib/OcDevicePathLib.c b/Library/OcDevicePathLib/OcDevicePathLib.c
index dd351cfb..e5d4fcd5 100755
--- a/Library/OcDevicePathLib/OcDevicePathLib.c
+++ b/Library/OcDevicePathLib/OcDevicePathLib.c
@@ -736,7 +736,7 @@ OcFileDevicePathFullName (
 
   ASSERT (PathName != NULL);
   ASSERT (FilePath != NULL);
-  ASSERT (IsDevicePathValid (FilePath, 0));
+  ASSERT (IsDevicePathValid (&FilePath->Header, 0));
   ASSERT (PathNameSize == OcFileDevicePathFullNameSize (&FilePath->Header));
 
   do {
@@ -748,7 +748,7 @@ OcFileDevicePathFullName (
       );
     PathName += PathLen;
 
-    FilePath = NextDevicePathNode (FilePath);
+    FilePath = (CONST FILEPATH_DEVICE_PATH *)NextDevicePathNode (FilePath);
   } while (!IsDevicePathEnd (FilePath));
   *PathName = CHAR_NULL;
 }