diff --git a/device/pci_device.c b/device/pci_device.c
index fd08b7dc40..1b4fae6058 100644
--- a/device/pci_device.c
+++ b/device/pci_device.c
@@ -32,7 +32,7 @@
 #include <device/pci_ids.h>
 #define CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT 0
 #define CONFIG_PCIX_PLUGIN_SUPPORT 0
-#define CONFIG_PCIEXP_PLUGIN_SUPPORT 0
+#define CONFIG_PCIE_PLUGIN_SUPPORT 0
 #define CONFIG_CARDBUS_PLUGIN_SUPPORT 0
 #define CONFIG_AGP_PLUGIN_SUPPORT 0
 #if CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT == 1
@@ -41,8 +41,8 @@
 #if CONFIG_PCIX_PLUGIN_SUPPORT == 1
 #include <device/pcix.h>
 #endif
-#if CONFIG_PCIEXP_PLUGIN_SUPPORT == 1
-#include <device/pciexp.h>
+#if CONFIG_PCIE_PLUGIN_SUPPORT == 1
+#include <device/pcie.h>
 #endif
 #if CONFIG_AGP_PLUGIN_SUPPORT == 1
 #include <device/agp.h>
@@ -747,7 +747,7 @@ static struct device_operations *get_pci_bridge_ops(struct device *dev)
 		}
 	}
 #endif
-#if CONFIG_PCIEXP_PLUGIN_SUPPORT == 1
+#if CONFIG_PCIE_PLUGIN_SUPPORT == 1
 	pos = pci_find_capability(dev, PCI_CAP_ID_PCIE);
 	if (pos) {
 		unsigned int flags;
@@ -758,7 +758,7 @@ static struct device_operations *get_pci_bridge_ops(struct device *dev)
 		case PCI_EXP_TYPE_DOWNSTREAM:
 			printk(BIOS_DEBUG, "%s subordinate bus PCI Express\n",
 			       dev_path(dev));
-			return &default_pciexp_ops_bus;
+			return &default_pcie_ops_bus;
 		case PCI_EXP_TYPE_PCI_BRIDGE:
 			printk(BIOS_DEBUG, "%s subordinate PCI\n",
 			       dev_path(dev));
diff --git a/device/pcie_device.c b/device/pcie_device.c
index df24861bd5..5caf05d0c5 100644
--- a/device/pcie_device.c
+++ b/device/pcie_device.c
@@ -22,9 +22,9 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <device/pciexp.h>
+#include <device/pcie.h>
 
-static void pciexp_tune_dev(struct device *dev)
+static void pcie_tune_dev(struct device *dev)
 {
 	unsigned int cap;
 	cap = pci_find_capability(dev, PCI_CAP_ID_PCIE);
@@ -36,8 +36,8 @@ static void pciexp_tune_dev(struct device *dev)
 #warning "IMPLEMENT PCI EXPRESS TUNING"
 }
 
-unsigned int pciexp_scan_bus(struct bus *bus, unsigned int min_devfn,
-			     unsigned int max_devfn, unsigned int max)
+unsigned int pcie_scan_bus(struct bus *bus, unsigned int min_devfn,
+			   unsigned int max_devfn, unsigned int max)
 {
 	struct device *child;
 	max = pci_scan_bus(bus, min_devfn, max_devfn, max);
@@ -46,28 +46,28 @@ unsigned int pciexp_scan_bus(struct bus *bus, unsigned int min_devfn,
 		    (child->path.u.pci.devfn > max_devfn)) {
 			continue;
 		}
-		pciexp_tune_dev(child);
+		pcie_tune_dev(child);
 	}
 	return max;
 }
 
-unsigned int pciexp_scan_bridge(struct device *dev, unsigned int max)
+unsigned int pcie_scan_bridge(struct device *dev, unsigned int max)
 {
-	return do_pci_scan_bridge(dev, max, pciexp_scan_bus);
+	return do_pci_scan_bridge(dev, max, pcie_scan_bus);
 }
 
 /** Default device operations for PCI Express bridges. */
-static struct pci_operations pciexp_bus_ops_pci = {
+static struct pci_operations pcie_bus_ops_pci = {
 	.set_subsystem = 0,
 };
 
-struct device_operations default_pciexp_ops_bus = {
+struct device_operations default_pcie_ops_bus = {
 	.read_resources   = pci_bus_read_resources,
 	.set_resources    = pci_dev_set_resources,
 	.enable_resources = pci_bus_enable_resources,
 	.init             = 0,
-	.scan_bus         = pciexp_scan_bridge,
+	.scan_bus         = pcie_scan_bridge,
 	.enable           = 0,
 	.reset_bus        = pci_bus_reset,
-	.ops_pci          = &pciexp_bus_ops_pci,
+	.ops_pci          = &pcie_bus_ops_pci,
 };
diff --git a/include/device/pciexp.h b/include/device/pcie.h
similarity index 76%
rename from include/device/pciexp.h
rename to include/device/pcie.h
index db05cf2c44..657c509204 100644
--- a/include/device/pciexp.h
+++ b/include/device/pcie.h
@@ -14,14 +14,14 @@
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 */
-#ifndef DEVICE_PCIEXP_H
-#define DEVICE_PCIEXP_H
+#ifndef DEVICE_PCIE_H
+#define DEVICE_PCIE_H
 /* (c) 2005 Linux Networx GPL see COPYING for details */
 
-unsigned int pciexp_scan_bus(struct bus *bus, 
+unsigned int pcie_scan_bus(struct bus *bus, 
 	unsigned min_devfn, unsigned max_devfn, unsigned int max);
-unsigned int pciexp_scan_bridge(struct device *dev, unsigned int max);
+unsigned int pcie_scan_bridge(struct device *dev, unsigned int max);
 
-extern struct device_operations default_pciexp_ops_bus;
+extern struct device_operations default_pcie_ops_bus;
 
-#endif /* DEVICE_PCIEXP_H */
+#endif /* DEVICE_PCIE_H */