diff --git a/configs/orangepi-5.conf b/configs/orangepi-5.conf
index d33b89bc6..d9ec90db3 100644
--- a/configs/orangepi-5.conf
+++ b/configs/orangepi-5.conf
@@ -1,3 +1,3 @@
-DSC_FILE=edk2-rockchip/Platform/OrangePi/OrangePi5/OrangePi5.dsc
+DSC_FILE=edk2-rockchip/Platform/Xunlong/OrangePi5/OrangePi5.dsc
 PLATFORM_NAME=OrangePi5
 SOC=RK3588
diff --git a/configs/orangepi-5plus.conf b/configs/orangepi-5plus.conf
index 10eaf0aba..dc80e7238 100644
--- a/configs/orangepi-5plus.conf
+++ b/configs/orangepi-5plus.conf
@@ -1,3 +1,3 @@
-DSC_FILE=edk2-rockchip/Platform/OrangePi/OrangePi5Plus/OrangePi5Plus.dsc
+DSC_FILE=edk2-rockchip/Platform/Xunlong/OrangePi5Plus/OrangePi5Plus.dsc
 PLATFORM_NAME=OrangePi5Plus
 SOC=RK3588
diff --git a/edk2-rockchip/Platform/OrangePi/Drivers/LogoDxe/Logo.bmp b/edk2-rockchip/Platform/Xunlong/Drivers/LogoDxe/Logo.bmp
similarity index 100%
rename from edk2-rockchip/Platform/OrangePi/Drivers/LogoDxe/Logo.bmp
rename to edk2-rockchip/Platform/Xunlong/Drivers/LogoDxe/Logo.bmp
diff --git a/edk2-rockchip/Platform/OrangePi/Drivers/LogoDxe/Logo.c b/edk2-rockchip/Platform/Xunlong/Drivers/LogoDxe/Logo.c
similarity index 100%
rename from edk2-rockchip/Platform/OrangePi/Drivers/LogoDxe/Logo.c
rename to edk2-rockchip/Platform/Xunlong/Drivers/LogoDxe/Logo.c
diff --git a/edk2-rockchip/Platform/OrangePi/Drivers/LogoDxe/Logo.idf b/edk2-rockchip/Platform/Xunlong/Drivers/LogoDxe/Logo.idf
similarity index 100%
rename from edk2-rockchip/Platform/OrangePi/Drivers/LogoDxe/Logo.idf
rename to edk2-rockchip/Platform/Xunlong/Drivers/LogoDxe/Logo.idf
diff --git a/edk2-rockchip/Platform/OrangePi/Drivers/LogoDxe/LogoDxe.inf b/edk2-rockchip/Platform/Xunlong/Drivers/LogoDxe/LogoDxe.inf
similarity index 100%
rename from edk2-rockchip/Platform/OrangePi/Drivers/LogoDxe/LogoDxe.inf
rename to edk2-rockchip/Platform/Xunlong/Drivers/LogoDxe/LogoDxe.inf
diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Xunlong/OrangePi5/AcpiTables/AcpiTables.inf
similarity index 100%
rename from edk2-rockchip/Platform/OrangePi/OrangePi5/AcpiTables/AcpiTables.inf
rename to edk2-rockchip/Platform/Xunlong/OrangePi5/AcpiTables/AcpiTables.inf
diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Xunlong/OrangePi5/AcpiTables/Dsdt.asl
similarity index 100%
rename from edk2-rockchip/Platform/OrangePi/OrangePi5/AcpiTables/Dsdt.asl
rename to edk2-rockchip/Platform/Xunlong/OrangePi5/AcpiTables/Dsdt.asl
diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5/Library/RockchipPlatformLib/RockchipPlatformLib.c b/edk2-rockchip/Platform/Xunlong/OrangePi5/Library/RockchipPlatformLib/RockchipPlatformLib.c
similarity index 100%
rename from edk2-rockchip/Platform/OrangePi/OrangePi5/Library/RockchipPlatformLib/RockchipPlatformLib.c
rename to edk2-rockchip/Platform/Xunlong/OrangePi5/Library/RockchipPlatformLib/RockchipPlatformLib.c
diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5/Library/RockchipPlatformLib/RockchipPlatformLib.inf b/edk2-rockchip/Platform/Xunlong/OrangePi5/Library/RockchipPlatformLib/RockchipPlatformLib.inf
similarity index 100%
rename from edk2-rockchip/Platform/OrangePi/OrangePi5/Library/RockchipPlatformLib/RockchipPlatformLib.inf
rename to edk2-rockchip/Platform/Xunlong/OrangePi5/Library/RockchipPlatformLib/RockchipPlatformLib.inf
diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5/OrangePi5.Modules.fdf.inc b/edk2-rockchip/Platform/Xunlong/OrangePi5/OrangePi5.Modules.fdf.inc
similarity index 100%
rename from edk2-rockchip/Platform/OrangePi/OrangePi5/OrangePi5.Modules.fdf.inc
rename to edk2-rockchip/Platform/Xunlong/OrangePi5/OrangePi5.Modules.fdf.inc
diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5/OrangePi5.dsc b/edk2-rockchip/Platform/Xunlong/OrangePi5/OrangePi5.dsc
similarity index 95%
rename from edk2-rockchip/Platform/OrangePi/OrangePi5/OrangePi5.dsc
rename to edk2-rockchip/Platform/Xunlong/OrangePi5/OrangePi5.dsc
index b481ad973..7713d44c5 100644
--- a/edk2-rockchip/Platform/OrangePi/OrangePi5/OrangePi5.dsc
+++ b/edk2-rockchip/Platform/Xunlong/OrangePi5/OrangePi5.dsc
@@ -15,7 +15,7 @@
 ################################################################################
 [Defines]
   PLATFORM_NAME                  = OrangePi5
-  PLATFORM_VENDOR                = OrangePi
+  PLATFORM_VENDOR                = Xunlong
   PLATFORM_GUID                  = e6443926-7196-4fc4-9554-91fc1fb34256
   PLATFORM_VERSION               = 0.2
   DSC_SPECIFICATION              = 0x00010019
@@ -57,7 +57,7 @@
 [PcdsFixedAtBuild.common]
   # SMBIOS platform config
   gRockchipTokenSpaceGuid.PcdPlatformName|"Orange Pi 5"
-  gRockchipTokenSpaceGuid.PcdPlatformVendorName|"Orange Pi"
+  gRockchipTokenSpaceGuid.PcdPlatformVendorName|"Xunlong"
   gRockchipTokenSpaceGuid.PcdFamilyName|"Orange Pi 5"
   gRockchipTokenSpaceGuid.PcdProductUrl|"http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-5.html"
   gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588s-orangepi-5"
diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Xunlong/OrangePi5Plus/AcpiTables/AcpiTables.inf
similarity index 100%
rename from edk2-rockchip/Platform/OrangePi/OrangePi5Plus/AcpiTables/AcpiTables.inf
rename to edk2-rockchip/Platform/Xunlong/OrangePi5Plus/AcpiTables/AcpiTables.inf
diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Xunlong/OrangePi5Plus/AcpiTables/Dsdt.asl
similarity index 100%
rename from edk2-rockchip/Platform/OrangePi/OrangePi5Plus/AcpiTables/Dsdt.asl
rename to edk2-rockchip/Platform/Xunlong/OrangePi5Plus/AcpiTables/Dsdt.asl
diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/Library/RockchipPlatformLib/RockchipPlatformLib.c b/edk2-rockchip/Platform/Xunlong/OrangePi5Plus/Library/RockchipPlatformLib/RockchipPlatformLib.c
similarity index 100%
rename from edk2-rockchip/Platform/OrangePi/OrangePi5Plus/Library/RockchipPlatformLib/RockchipPlatformLib.c
rename to edk2-rockchip/Platform/Xunlong/OrangePi5Plus/Library/RockchipPlatformLib/RockchipPlatformLib.c
diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/Library/RockchipPlatformLib/RockchipPlatformLib.inf b/edk2-rockchip/Platform/Xunlong/OrangePi5Plus/Library/RockchipPlatformLib/RockchipPlatformLib.inf
similarity index 100%
rename from edk2-rockchip/Platform/OrangePi/OrangePi5Plus/Library/RockchipPlatformLib/RockchipPlatformLib.inf
rename to edk2-rockchip/Platform/Xunlong/OrangePi5Plus/Library/RockchipPlatformLib/RockchipPlatformLib.inf
diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/OrangePi5Plus.Modules.fdf.inc b/edk2-rockchip/Platform/Xunlong/OrangePi5Plus/OrangePi5Plus.Modules.fdf.inc
similarity index 100%
rename from edk2-rockchip/Platform/OrangePi/OrangePi5Plus/OrangePi5Plus.Modules.fdf.inc
rename to edk2-rockchip/Platform/Xunlong/OrangePi5Plus/OrangePi5Plus.Modules.fdf.inc
diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/OrangePi5Plus.dsc b/edk2-rockchip/Platform/Xunlong/OrangePi5Plus/OrangePi5Plus.dsc
similarity index 95%
rename from edk2-rockchip/Platform/OrangePi/OrangePi5Plus/OrangePi5Plus.dsc
rename to edk2-rockchip/Platform/Xunlong/OrangePi5Plus/OrangePi5Plus.dsc
index 99b4b3fc2..5f0e9d6b3 100644
--- a/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/OrangePi5Plus.dsc
+++ b/edk2-rockchip/Platform/Xunlong/OrangePi5Plus/OrangePi5Plus.dsc
@@ -14,7 +14,7 @@
 ################################################################################
 [Defines]
   PLATFORM_NAME                  = OrangePi5Plus
-  PLATFORM_VENDOR                = OrangePi
+  PLATFORM_VENDOR                = Xunlong
   PLATFORM_GUID                  = 6bb03dd4-c246-474a-851c-70ea24a89e43
   PLATFORM_VERSION               = 0.2
   DSC_SPECIFICATION              = 0x00010019
@@ -56,7 +56,7 @@
 [PcdsFixedAtBuild.common]
   # SMBIOS platform config
   gRockchipTokenSpaceGuid.PcdPlatformName|"Orange Pi 5 Plus"
-  gRockchipTokenSpaceGuid.PcdPlatformVendorName|"Orange Pi"
+  gRockchipTokenSpaceGuid.PcdPlatformVendorName|"Xunlong"
   gRockchipTokenSpaceGuid.PcdFamilyName|"Orange Pi 5"
   gRockchipTokenSpaceGuid.PcdProductUrl|"http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-5-plus.html"
   gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588-orangepi-5-plus"