Identifier reuse may arise confusion. So should minimize the case of it as much as possible. This patch is try to do this except the PCI related module. Tracked-On: #861 Signed-off-by: Li, Fei1 <fei1.li@intel.com>