diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/DxeRegisterCpuFeaturesLib.inf b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/DxeRegisterCpuFeaturesLib.inf
index 62ac8a9635..f0f317c945 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/DxeRegisterCpuFeaturesLib.inf
+++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/DxeRegisterCpuFeaturesLib.inf
@@ -15,7 +15,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = DxeRegisterCpuFeaturesLib
-  MODULE_UNI_FILE                = DxeRegisterCpuFeaturesLib.uni
+  MODULE_UNI_FILE                = RegisterCpuFeaturesLib.uni
   FILE_GUID                      = ADE8F745-AA2E-49f6-8ED4-746B34867E52
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.inf b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.inf
index 5e9ab2c304..fdfef98293 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.inf
+++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.inf
@@ -15,7 +15,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = PeiRegisterCpuFeaturesLib
-  MODULE_UNI_FILE                = PeiRegisterCpuFeaturesLib.uni
+  MODULE_UNI_FILE                = RegisterCpuFeaturesLib.uni
   FILE_GUID                      = D8855DB3-8348-41B5-BDA4-385351767D41
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesDxe.uni b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.uni
similarity index 55%
rename from UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesDxe.uni
rename to UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.uni
index d928952551..09368cc9a2 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesDxe.uni
+++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.uni
@@ -1,9 +1,9 @@
 // /** @file
-// CPU Register Table Library instance.
+// Register CPU Features Library instance.
 //
-// CPU Register Table Library instance.
+// Register CPU Features Library instance.
 //
-// Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 //
 // This program and the accompanying materials
 // are licensed and made available under the terms and conditions of the BSD License
@@ -16,7 +16,7 @@
 // **/
 
 
-#string STR_MODULE_ABSTRACT             #language en-US "CPU Register Table Library instance"
+#string STR_MODULE_ABSTRACT             #language en-US "Register CPU Features Library instance"
 
-#string STR_MODULE_DESCRIPTION          #language en-US "CPU Register Table Library instance."
+#string STR_MODULE_DESCRIPTION          #language en-US "Register CPU Features Library instance."