[build] Rename gPXE to iPXE

Access to the gpxe.org and etherboot.org domains and associated
resources has been revoked by the registrant of the domain.  Work
around this problem by renaming project from gPXE to iPXE, and
updating URLs to match.

Also update README, LOG and COPYRIGHTS to remove obsolete information.

Signed-off-by: Michael Brown <mcb30@ipxe.org>

597 files changed, 2220 insertions, 2288 deletions

diff --git a/COPYRIGHTS b/COPYRIGHTS
index d686b43..342330b 100644
--- a/COPYRIGHTS
+++ b/COPYRIGHTS
@@ -1,26 +1,12 @@
+In general iPXE files are licensed under the GPL.  For historical
+reasons, individual files may contain their own licence declarations.
+Most builds of iPXE do not contain all iPXE code (in particular, most
+builds will include only one driver), and so the overall licence can
+vary depending on what target you are building.
 
-In general gPXE files are licensed under the GPL.  GPLed files are in
-general either from Linux or have been explicitly put under GPL by the
-authors.  The license for a file is usually documented at the top of
-the file.  
+The resultant applicable licence(s) for any particular build can be
+determined by using "make bin/xxxxxxx.yyy.licence"; for example:
 
-A few files are inherited from FreeBSD netboot and therefore can be
-used under BSD or GPL.  Documented in this file are some of the
-non-GPL'ed files.  If the internal documentation for a file disagrees
-with what is documented in this file, the internal documentation for
-the file shall be override this file.
-
-File					Copyright status
-
-src/core/misc.c				BSD
-src/drivers/net/3c509.c			BSD
-src/drivers/net/3c509.h			BSD
-src/drivers/net/3c595.c			BSD
-src/drivers/net/3c595.h			BSD
-src/drivers/net/3c90x.c			Open Source
-src/drivers/net/epic100.c		None
-src/drivers/net/epic100.h		None
-src/drivers/net/ns8390.c		BSD
-src/drivers/net/ns8390.h		BSD
-src/arch/i386/include/bits/string.h	None
+  make bin/rtl8139.rom.licence
 
+to determine the resultant licence(s) for the build bin/rtl8139.rom
diff --git a/LOG b/LOG
deleted file mode 100644
index d29c8eb..0000000
--- a/LOG
+++ /dev/null
@@ -1,12 +0,0 @@
-gPXE LOG file
-
-+ Development for gPXE was moved from SourceForge CVS to a git
-  repository on git.etherboot.org in the first half of the year 2007.
-
-+ The gitweb interface for gPXE is available at:
-
-    http://git.etherboot.org/?p=gpxe.git
-
-+ The gitweb interface largely obsoletes the LOG file that used to be
-  distributed with Etherboot.
-
diff --git a/README b/README
index b3ae215..011aa21 100644
--- a/README
+++ b/README
@@ -1,53 +1,8 @@
-gPXE README File
+iPXE README File
 
-gPXE is an implementation of the PXE specification for network
-booting, with extensions to allow additional features such as booting
-via HTTP, iSCSI, and AoE.  
-
-In generally, gPXE is compatible with the industry-standard PXE
-specification, and also supports Etherboot .nbi file loading and some
-additional protocols and features.
-
-For more detailed information about gPXE, please visit our project
-website at: http://etherboot.org/
-
-BUILDING gPXE IMAGE FROM SOURCE
-
-If you don't want to install development tools, and have access to the
-Web, you can get gPXE and Etherboot ROM images made on demand from
-http://rom-o-matic.net/
-
-If you would like to compile gPXE images from source, here are some tips.
-
-We normally compile gPXE images on x86, 32-bit Linux machines. It is
-possible to also use x86-64 machines. We use gcc compiler options to
-create 32-bit output.
-
-It is important to have the necessary software  packages installed.  A gcc-based
-toolchain is required.
-
-The following packages (at least) are required:
-
-  - a gcc tool chain (gcc 3.x or gcc 4.x)
-  - binutils
-  - perl
-  - syslinux
-  - mtools
-  
-To test your environment, cd to the "src" directory and type:
+Quick start guide:
 
+   cd src
    make
 
-You should see a lot of output, and when it stops, the "bin" directory
-should be populated with gPXE images and object files.
-
-To learn more about what to build and how to use gPXE, please visit our
-project website at http://etherboot.org/ , particularly the "howto" section.
-
-CONTACTING US
-
-Pointers to our project mailing lists are on http://etherboot.org/
-
-Real-time help is often available on IRC on the #etherboot channel of
-irc.freenode.net.
-
+For any more detailed instructions, see http://ipxe.org
diff --git a/contrib/errcode/README b/contrib/errcode/README
index b2963c0..eb66d06 100644
--- a/contrib/errcode/README
+++ b/contrib/errcode/README
@@ -1,6 +1,6 @@
-Error Code Lookup for gPXE
+Error Code Lookup for iPXE
 ==========================
-This program looks up gPXE error codes so you can locate the line of source
+This program looks up iPXE error codes so you can locate the line of source
 code which produced the error.
 
 Setup
@@ -8,11 +8,11 @@ Setup
 You must run:
 ./build_errcodedb.py >errcodedb.py
 
-This extracts error code definitions from the gPXE source code and produces a
+This extracts error code definitions from the iPXE source code and produces a
 "database" which is used by the main program.
 
 Once you have done this errcode.py and errcodedb.py are the only files you
-need.  They are now independent of the gPXE source code and can be moved
+need.  They are now independent of the iPXE source code and can be moved
 anywhere.
 
 [OPTIONAL]
@@ -21,7 +21,7 @@ $ERRCODE_PATH to the errcode.py script.  Then move errcode.php to a location
 visible from your web server.
 
 [OPTIONAL]
-A simple IRC bot is provided.  Edit gpxebot.py to fill in the IRC details.
+A simple IRC bot is provided.  Edit ipxebot.py to fill in the IRC details.
 
 Usage
 -----
diff --git a/contrib/errcode/build_errcodedb.py b/contrib/errcode/build_errcodedb.py
index 1be9d85..9907292 100755
--- a/contrib/errcode/build_errcodedb.py
+++ b/contrib/errcode/build_errcodedb.py
@@ -18,7 +18,7 @@ import sys
 import re
 
 pxenv_status_files = ('../../src/include/errno.h', )
-errfile_files = ('../../src/include/gpxe/errfile.h',
+errfile_files = ('../../src/include/ipxe/errfile.h',
             '../../src/arch/i386/include/bits/errfile.h')
 posix_errno_files = ('../../src/include/errno.h', )
 
diff --git a/contrib/errcode/errcode.php b/contrib/errcode/errcode.php
index 8711449..f4774f0 100644
--- a/contrib/errcode/errcode.php
+++ b/contrib/errcode/errcode.php
@@ -23,7 +23,7 @@ $ERRCODE_PATH = './errcode.py';
 
 <html>
     <head>
-        <title>gPXE Error Code Lookup</title>
+        <title>iPXE Error Code Lookup</title>
         <style>
             body, pre, div, form, p, h2, b, tt {
                 padding: 0;
@@ -73,10 +73,10 @@ if (!empty($_REQUEST['e']) && preg_match('/^(0x)?[0-9a-f]{8}$/', $_REQUEST['e'])
             <p>
             Firefox users can right-click on the <b>Error code</b>
             text box and select <b>Add a Keyword for this Search...</b>.
-            Set <b>name</b> to <tt>gPXE Error Code Lookup</tt> and
+            Set <b>name</b> to <tt>iPXE Error Code Lookup</tt> and
             <b>keyword</b> to <tt>gxpe</tt>  Then you can look up error
             codes by typing something like the following in your address
-            bar: <tt>gpxe 0x3c018003</tt>
+            bar: <tt>ipxe 0x3c018003</tt>
             <p>
         </div>
     </body>
diff --git a/contrib/errcode/errcodedb.py b/contrib/errcode/errcodedb.py
new file mode 100644
index 0000000..357a8e2
--- /dev/null
+++ b/contrib/errcode/errcodedb.py
@@ -0,0 +1,3 @@
+pxenv_status = {0: 'PXENV_STATUS_SUCCESS', 1: 'PXENV_STATUS_FAILURE', 2: 'PXENV_STATUS_BAD_FUNC', 3: 'PXENV_STATUS_UNSUPPORTED', 4: 'PXENV_STATUS_KEEP_UNDI', 5: 'PXENV_STATUS_KEEP_ALL', 6: 'PXENV_STATUS_OUT_OF_RESOURCES', 17: 'PXENV_STATUS_ARP_TIMEOUT', 107: 'PXENV_STATUS_UNDI_TRANSMIT_ERROR', 24: 'PXENV_STATUS_UDP_CLOSED', 25: 'PXENV_STATUS_UDP_OPEN', 26: 'PXENV_STATUS_TFTP_CLOSED', 27: 'PXENV_STATUS_TFTP_OPEN', 160: 'PXENV_STATUS_BINL_CANCELED_BY_KEYSTROKE', 161: 'PXENV_STATUS_BINL_NO_PXE_SERVER', 162: 'PXENV_STATUS_NOT_AVAILABLE_IN_PMODE', 163: 'PXENV_STATUS_NOT_AVAILABLE_IN_RMODE', 36: 'PXENV_STATUS_BIS_SHUTDOWN_FAILURE', 37: 'PXENV_STATUS_BIS_GBOA_FAILURE', 38: 'PXENV_STATUS_BIS_FREE_FAILURE', 48: 'PXENV_STATUS_TFTP_CANNOT_ARP_ADDRESS', 40: 'PXENV_STATUS_BIS_BAD_CKSUM', 176: 'PXENV_STATUS_BUSD_DEVICE_NOT_SUPPORTED', 50: 'PXENV_STATUS_TFTP_OPEN_TIMEOUT', 51: 'PXENV_STATUS_TFTP_UNKNOWN_OPCODE', 53: 'PXENV_STATUS_TFTP_READ_TIMEOUT', 54: 'PXENV_STATUS_TFTP_ERROR_OPCODE', 56: 'PXENV_STATUS_TFTP_CANNOT_OPEN_CONNECTION', 57: 'PXENV_STATUS_TFTP_CANNOT_READ_FROM_CONNECTION', 58: 'PXENV_STATUS_TFTP_TOO_MANY_PACKAGES', 59: 'PXENV_STATUS_TFTP_FILE_NOT_FOUND', 35: 'PXENV_STATUS_BIS_INIT_FAILURE', 61: 'PXENV_STATUS_TFTP_NO_MCAST_ADDRESS', 62: 'PXENV_STATUS_TFTP_NO_FILESIZE', 63: 'PXENV_STATUS_TFTP_INVALID_PACKET_SIZE', 192: 'PXENV_STATUS_LOADER_NO_FREE_BASE_MEMORY', 193: 'PXENV_STATUS_LOADER_NO_BC_ROMID', 194: 'PXENV_STATUS_LOADER_BAD_BC_ROMID', 195: 'PXENV_STATUS_LOADER_BAD_BC_RUNTIME_IMAGE', 196: 'PXENV_STATUS_LOADER_NO_UNDI_ROMID', 197: 'PXENV_STATUS_LOADER_BAD_UNDI_ROMID', 198: 'PXENV_STATUS_LOADER_BAD_UNDI_DRIVER_IMAGE', 32: 'PXENV_STATUS_MCOPY_PROBLEM', 200: 'PXENV_STATUS_LOADER_NO_PXE_STRUCT', 201: 'PXENV_STATUS_LOADER_NO_PXENV_STRUCT', 202: 'PXENV_STATUS_LOADER_UNDI_START', 203: 'PXENV_STATUS_LOADER_BC_START', 34: 'PXENV_STATUS_BIS_VALIDATE_FAILURE', 81: 'PXENV_STATUS_DHCP_TIMEOUT', 82: 'PXENV_STATUS_DHCP_NO_IP_ADDRESS', 83: 'PXENV_STATUS_DHCP_NO_BOOTFILE_NAME', 84: 'PXENV_STATUS_DHCP_BAD_IP_ADDRESS', 105: 'PXENV_STATUS_UNDI_ERROR_SETTING_ISR', 96: 'PXENV_STATUS_UNDI_INVALID_FUNCTION', 97: 'PXENV_STATUS_UNDI_MEDIATEST_FAILED', 98: 'PXENV_STATUS_UNDI_CANNOT_INIT_NIC_FOR_MCAST', 99: 'PXENV_STATUS_UNDI_CANNOT_INITIALIZE_NIC', 100: 'PXENV_STATUS_UNDI_CANNOT_INITIALIZE_PHY', 101: 'PXENV_STATUS_UNDI_CANNOT_READ_CONFIG_DATA', 102: 'PXENV_STATUS_UNDI_CANNOT_READ_INIT_DATA', 103: 'PXENV_STATUS_UNDI_BAD_MAC_ADDRESS', 104: 'PXENV_STATUS_UNDI_BAD_EEPROM_CHECKSUM', 60: 'PXENV_STATUS_TFTP_ACCESS_VIOLATION', 106: 'PXENV_STATUS_UNDI_INVALID_STATE', 39: 'PXENV_STATUS_BIS_GSI_FAILURE', 108: 'PXENV_STATUS_UNDI_INVALID_PARAMETER', 116: 'PXENV_STATUS_BSTRAP_PROMPT_MENU', 118: 'PXENV_STATUS_BSTRAP_MCAST_ADDR', 119: 'PXENV_STATUS_BSTRAP_MISSING_LIST', 120: 'PXENV_STATUS_BSTRAP_NO_RESPONSE', 121: 'PXENV_STATUS_BSTRAP_FILE_TOO_BIG', 33: 'PXENV_STATUS_BIS_INTEGRITY_FAILURE'}
+errfile = {1024: 'ERRFILE_ARCH', 1: 'ERRFILE_CORE', 1026: 'ERRFILE_timer_rdtsc', 3: 'ERRFILE_NET', 4: 'ERRFILE_IMAGE', 1025: 'ERRFILE_memtop_umalloc', 9: 'ERRFILE_downloader', 1034: 'ERRFILE_timer_bios', 11: 'ERRFILE_arp', 12: 'ERRFILE_elf', 2: 'ERRFILE_eisa', 15: 'ERRFILE_chap', 1041: 'ERRFILE_pnpbios', 18: 'ERRFILE_isapnp', 1043: 'ERRFILE_undinet', 20: 'ERRFILE_script', 17: 'ERRFILE_exec', 23: 'ERRFILE_aoeboot', 1049: 'ERRFILE_bios_smbios', 538: 'ERRFILE_tulip', 27: 'ERRFILE_ethernet', 28: 'ERRFILE_segment', 410: 'ERRFILE_amd8111e', 31: 'ERRFILE_autoboot', 33: 'ERRFILE_iobuf', 546: 'ERRFILE_via_rhine', 1059: 'ERRFILE_undirom', 36: 'ERRFILE_efi_image', 39: 'ERRFILE_dhcpmgmt', 1065: 'ERRFILE_int13', 554: 'ERRFILE_via_velocity', 43: 'ERRFILE_ipv4', 44: 'ERRFILE_embedded', 47: 'ERRFILE_imgmgmt', 49: 'ERRFILE_linebuf', 562: 'ERRFILE_w89c840', 51: 'ERRFILE_ipv6', 1076: 'ERRFILE_elfboot', 55: 'ERRFILE_pxe_tftp', 57: 'ERRFILE_monojob', 570: 'ERRFILE_ipoib', 59: 'ERRFILE_ndp', 1084: 'ERRFILE_comboot', 522: 'ERRFILE_sundance', 63: 'ERRFILE_pxe_udp', 19: 'ERRFILE_dhcpopts', 65: 'ERRFILE_nvo', 578: 'ERRFILE_e1000', 67: 'ERRFILE_netdevice', 1092: 'ERRFILE_com32', 71: 'ERRFILE_axtls_aes', 1036: 'ERRFILE_bzimage', 586: 'ERRFILE_e1000_hw', 75: 'ERRFILE_nullnet', 1100: 'ERRFILE_comboot_resolv', 906: 'ERRFILE_arbel', 79: 'ERRFILE_cipher', 81: 'ERRFILE_posix_io', 594: 'ERRFILE_mtnic', 83: 'ERRFILE_tcp', 1108: 'ERRFILE_comboot_call', 87: 'ERRFILE_image_cmd', 89: 'ERRFILE_resolv', 602: 'ERRFILE_phantom', 91: 'ERRFILE_ftp', 95: 'ERRFILE_uri_test', 97: 'ERRFILE_settings', 610: 'ERRFILE_ne2k_isa', 99: 'ERRFILE_http', 103: 'ERRFILE_ibft', 105: 'ERRFILE_vsprintf', 618: 'ERRFILE_b44', 107: 'ERRFILE_iscsi', 530: 'ERRFILE_tlan', 111: 'ERRFILE_tls', 113: 'ERRFILE_xfer', 626: 'ERRFILE_rtl818x', 115: 'ERRFILE_tcpip', 119: 'ERRFILE_ifmgmt', 121: 'ERRFILE_bitmap', 634: 'ERRFILE_sky2', 123: 'ERRFILE_udp', 1044: 'ERRFILE_eltorito', 127: 'ERRFILE_iscsiboot', 1027: 'ERRFILE_undi', 642: 'ERRFILE_ath5k', 131: 'ERRFILE_dhcp', 135: 'ERRFILE_efi_pci', 650: 'ERRFILE_atl1e', 139: 'ERRFILE_dns', 143: 'ERRFILE_efi_snp', 146: 'ERRFILE_i2c_bit', 147: 'ERRFILE_tftp', 151: 'ERRFILE_smbios', 154: 'ERRFILE_spi_bit', 155: 'ERRFILE_infiniband', 26: 'ERRFILE_mca', 1028: 'ERRFILE_bootsector', 159: 'ERRFILE_smbios_settings', 674: 'ERRFILE_skge', 1051: 'ERRFILE_undionly', 167: 'ERRFILE_efi_smbios', 1052: 'ERRFILE_multiboot', 171: 'ERRFILE_dhcppkt', 175: 'ERRFILE_pxemenu', 179: 'ERRFILE_slam', 183: 'ERRFILE_x509', 187: 'ERRFILE_ib_sma', 191: 'ERRFILE_login_ui', 195: 'ERRFILE_ib_packet', 211: 'ERRFILE_ib_qset', 1057: 'ERRFILE_biosint', 203: 'ERRFILE_icmp', 34: 'ERRFILE_pci', 207: 'ERRFILE_iwmgmt', 35: 'ERRFILE_icmpv6', 898: 'ERRFILE_scsi', 7: 'ERRFILE_OTHER', 1060: 'ERRFILE_nbi', 219: 'ERRFILE_ib_gma', 227: 'ERRFILE_ib_pathrec', 235: 'ERRFILE_ib_mcast', 243: 'ERRFILE_ib_cm', 25: 'ERRFILE_hw', 41: 'ERRFILE_job', 251: 'ERRFILE_net80211', 258: 'ERRFILE_3c509', 259: 'ERRFILE_ib_mi', 1068: 'ERRFILE_pxe_image', 266: 'ERRFILE_bnx2', 267: 'ERRFILE_ib_cmrc', 130: 'ERRFILE_nvs', 274: 'ERRFILE_cs89x0', 275: 'ERRFILE_ib_srp', 282: 'ERRFILE_eepro', 283: 'ERRFILE_sec80211', 290: 'ERRFILE_etherfabric', 291: 'ERRFILE_wep', 1073: 'ERRFILE_pxeparent', 298: 'ERRFILE_legacy', 299: 'ERRFILE_eapol', 306: 'ERRFILE_natsemi', 10: 'ERRFILE_isa', 307: 'ERRFILE_wpa', 1033: 'ERRFILE_memmap', 658: 'ERRFILE_sis190', 314: 'ERRFILE_pnic', 315: 'ERRFILE_wpa_psk', 138: 'ERRFILE_spi', 322: 'ERRFILE_prism2_pci', 323: 'ERRFILE_wpa_tkip', 330: 'ERRFILE_prism2_plx', 331: 'ERRFILE_wpa_ccmp', 338: 'ERRFILE_rtl8139', 346: 'ERRFILE_smc9000', 199: 'ERRFILE_ib_srpboot', 354: 'ERRFILE_tg3', 362: 'ERRFILE_3c509_eisa', 402: 'ERRFILE_3c90x', 1035: 'ERRFILE_undiload', 370: 'ERRFILE_3c515', 378: 'ERRFILE_3c529', 386: 'ERRFILE_3c595', 394: 'ERRFILE_3c5x9', 914: 'ERRFILE_hermon', 922: 'ERRFILE_linda', 514: 'ERRFILE_sis900', 666: 'ERRFILE_myri10ge', 930: 'ERRFILE_ata', 938: 'ERRFILE_srp', 434: 'ERRFILE_dmfe', 73: 'ERRFILE_open', 450: 'ERRFILE_eepro100', 458: 'ERRFILE_epic100', 418: 'ERRFILE_davicom', 466: 'ERRFILE_forcedeth', 163: 'ERRFILE_netdev_settings', 474: 'ERRFILE_mtd80x', 482: 'ERRFILE_ns83820', 490: 'ERRFILE_ns8390', 498: 'ERRFILE_pcnet32', 506: 'ERRFILE_r8169', 426: 'ERRFILE_depca'}
+posix_errno = {0: 'ENOERR', 1: 'E2BIG', 2: 'EACCES', 3: 'EADDRINUSE', 4: 'EADDRNOTAVAIL', 5: 'EAFNOSUPPORT', 6: 'EAGAIN', 7: 'EALREADY', 8: 'EBADF', 9: 'EBADMSG', 10: 'EBUSY', 11: 'ECANCELED', 12: 'ECHILD', 13: 'ECONNABORTED', 14: 'ECONNREFUSED', 15: 'ECONNRESET', 16: 'EDEADLK', 17: 'EDESTADDRREQ', 18: 'EDOM', 19: 'EDQUOT', 20: 'EEXIST', 21: 'EFAULT', 22: 'EFBIG', 23: 'EHOSTUNREACH', 24: 'EIDRM', 25: 'EILSEQ', 26: 'EINPROGRESS', 27: 'EINTR', 28: 'EINVAL', 29: 'EIO', 30: 'EISCONN', 31: 'EISDIR', 32: 'ELOOP', 33: 'EMFILE', 34: 'EMLINK', 35: 'EMSGSIZE', 36: 'EMULTIHOP', 37: 'ENAMETOOLONG', 38: 'ENETDOWN', 39: 'ENETRESET', 40: 'ENETUNREACH', 41: 'ENFILE', 42: 'ENOBUFS', 43: 'ENODATA', 44: 'ENODEV', 45: 'ENOENT', 46: 'ENOEXEC', 47: 'ENOLCK', 48: 'ENOLINK', 49: 'ENOMEM', 50: 'ENOMSG', 51: 'ENOPROTOOPT', 52: 'ENOSPC', 53: 'ENOSR', 54: 'ENOSTR', 55: 'ENOSYS', 56: 'ENOTCONN', 57: 'ENOTDIR', 58: 'ENOTEMPTY', 59: 'ENOTSOCK', 60: 'ENOTSUP', 61: 'ENOTTY', 62: 'ENXIO', 63: 'EOPNOTSUPP', 64: 'EOVERFLOW', 65: 'EPERM', 66: 'EPIPE', 67: 'EPROTO', 68: 'EPROTONOSUPPORT', 69: 'EPROTOTYPE', 70: 'ERANGE', 71: 'EROFS', 72: 'ESPIPE', 73: 'ESRCH', 74: 'ESTALE', 75: 'ETIME', 76: 'ETIMEDOUT', 77: 'ETXTBSY', 78: 'EWOULDBLOCK', 79: 'EXDEV'}
diff --git a/contrib/errcode/errcodedb.pyc b/contrib/errcode/errcodedb.pyc
new file mode 100644
index 0000000..e59c459
--- /dev/null
+++ b/contrib/errcode/errcodedb.pyc
diff --git a/contrib/errcode/gpxebot.py b/contrib/errcode/gpxebot.py
index f975942..4db4033 100755
--- a/contrib/errcode/gpxebot.py
+++ b/contrib/errcode/gpxebot.py
@@ -20,11 +20,11 @@ import errcode
 
 HOST = 'irc.freenode.net'
 PORT = 6667
-NICK = 'gpxebot'
+NICK = 'ipxebot'
 CHAN = '#etherboot'
 NICKSERV_PASSWORD = None
-IDENT = 'gpxebot'
-REALNAME = 'gPXE bot'
+IDENT = 'ipxebot'
+REALNAME = 'iPXE bot'
 
 ERRCODE_RE = re.compile(r'(errcode|Error)\s+((0x)?[0-9a-fA-F]{8})')
 
@@ -59,7 +59,7 @@ def privmsg(_, target, msg):
         except ValueError:
             pass
     if msg.find('help') > -1:
-        pmsg(replyto, 'I look up gPXE error codes.  Message me like this:')
+        pmsg(replyto, 'I look up iPXE error codes.  Message me like this:')
         pmsg(replyto, 'errcode 0x12345678  OR  Error 0x12345678')
 
 def add_handler(command, handler, nargs):
diff --git a/contrib/rom-o-matic/README b/contrib/rom-o-matic/README
index 1e9abbc..b68cf77 100644
--- a/contrib/rom-o-matic/README
+++ b/contrib/rom-o-matic/README
@@ -1,30 +1,30 @@
-ROM-o-matic web interface for building gPXE ROMs
+ROM-o-matic web interface for building iPXE ROMs
 ------------------------------------------------
 
-This web application generates gPXE images and sends them to a web
+This web application generates iPXE images and sends them to a web
 browser.
 
-Available as part of the gPXE source code distribution, which can be
+Available as part of the iPXE source code distribution, which can be
 downlaoded from http://etherboot.org/
 
 Author:  Marty Connor <mdc@etherboot.org>
 License: GPLv2
-Support: http://etherboot.org/mailman/listinfo/gpxe
-         Please send support questions to the gPXE mailing list
+Support: http://etherboot.org/mailman/listinfo/ipxe
+         Please send support questions to the iPXE mailing list
 
 System Requirements
 -------------------
 - Apache web server
 - PHP 4+
-- Tools required to build gPXE installed on the server
+- Tools required to build iPXE installed on the server
   - gcc, mtools, syslinux, perl, etc.
 
 Setup
 -----
 As distributed, it is expected that the rom-o-matic source code
-directory is in the contrib directory of a gPXE source distribution.
+directory is in the contrib directory of a iPXE source distribution.
 
-The easiest way to do this is to simply put a gPXE source distribution
+The easiest way to do this is to simply put a iPXE source distribution
 in a web server accessible directory.
 
 If this is not the case, you will need to either edit the file
@@ -41,11 +41,11 @@ containing the following lines:
 $src_dir = "../../src";
 ?>
 
-Then change the line beginning "$src_dir = " to the path of your gPXE
+Then change the line beginning "$src_dir = " to the path of your iPXE
 source code tree.
 
 To make build times shorter, before you run rom-o-matic for the first time
-you should cd to the gpxe "src" directory and enter the following
+you should cd to the ipxe "src" directory and enter the following
 commands:
 
   $ make
@@ -58,5 +58,5 @@ Running rom-o-matic from a web browser
 --------------------------------------
 Enter a URL like:
 
-   http://example.com/gpxe-1.x.x/contrib/rom-o-matic
+   http://example.com/ipxe-1.x.x/contrib/rom-o-matic
 
diff --git a/contrib/rom-o-matic/bottom.php b/contrib/rom-o-matic/bottom.php
index bd64d84..ff094fd 100644
--- a/contrib/rom-o-matic/bottom.php
+++ b/contrib/rom-o-matic/bottom.php
@@ -26,25 +26,25 @@ Resources:
 </h4>
 <ul>
   <li>
-    Source code for gPXE images is available at
+    Source code for iPXE images is available at
     <a href="http://etherboot.org/wiki/download" target="_blank">
     http://etherboot.org/wiki/download</a>
     <br><br>
   </li>
   <li>
-    For general information about using gPXE, please visit the
+    For general information about using iPXE, please visit the
     <a href="http://www.etherboot.org/" target="_blank">
     Etherboot Project Home Page</a>
     <br><br>
   </li>
   <li>
-    For Email-based support for gPXE please join
+    For Email-based support for iPXE please join
     <a href="http://etherboot.org/wiki/mailinglists" target="_blank">
     Etherboot Project mailing lists.</a>
     <br><br>
   </li>
   <li>
-    For real-time online gPXE support via IRC please visit the
+    For real-time online iPXE support via IRC please visit the
     <a href="irc://irc.freenode.net/%23etherboot"> #etherboot channel
     of irc.freenode.net</a>.
     <br><br>
diff --git a/contrib/rom-o-matic/build.php b/contrib/rom-o-matic/build.php
index 1d9ee30..3101b3e 100644
--- a/contrib/rom-o-matic/build.php
+++ b/contrib/rom-o-matic/build.php
@@ -158,19 +158,19 @@ $build_dir = mktempcopy ( "$src_dir", "/tmp", "MDCROM" );
 $config_dir = $build_dir . "/config";
 
 // Write config files with supplied flags
-write_gpxe_config_files ( $config_dir, $flags );
+write_ipxe_config_files ( $config_dir, $flags );
 
 // Handle a possible embedded script
 $emb_script_cmd = "";
 $embedded_script = isset ( $_POST['embedded_script'] ) ? $_POST['embedded_script'] : "";
 if ( $embedded_script != "" ) {
-    $emb_script_path = "$build_dir" . "/script0.gpxe";
+    $emb_script_path = "$build_dir" . "/script0.ipxe";
 
-	if ( substr ( $embedded_script, 0, 5 ) != "#!gpxe" ) {
-		$embedded_script = "#!gpxe\n" . $embedded_script;
+	if ( substr ( $embedded_script, 0, 5 ) != "#!ipxe" ) {
+		$embedded_script = "#!ipxe\n" . $embedded_script;
 	}
 
-    // gPXE 0.9.7 doesn't like '\r\n" in the shebang...
+    // iPXE 0.9.7 doesn't like '\r\n" in the shebang...
     $embedded_script = str_replace ( "\r\n", "\n", $embedded_script );
 
     write_file_from_string ( $emb_script_path, $embedded_script );
@@ -239,7 +239,7 @@ if ( $status == 0 ) {
             // Delete build directory as soon as it is not needed
             rm_build_dir ();
 
-            $output_filename = "gpxe-${version}-${nic}.${fmt_extension}";
+            $output_filename = "ipxe-${version}-${nic}.${fmt_extension}";
 
             // Try to force IE to handle downloading right.
             Header ( "Cache-control: private");
diff --git a/contrib/rom-o-matic/directions.php b/contrib/rom-o-matic/directions.php
index 3c7015e..cba5eb4 100644
--- a/contrib/rom-o-matic/directions.php
+++ b/contrib/rom-o-matic/directions.php
@@ -55,7 +55,7 @@
           above.<br><br>
         </li>
         <li>
-          gPXE does not support all possible PCI IDs for supported
+          iPXE does not support all possible PCI IDs for supported
           NICs.
           <br><br>
         </li>
diff --git a/contrib/rom-o-matic/doc/IMAGE_SCRIPT.html b/contrib/rom-o-matic/doc/IMAGE_SCRIPT.html
index 1f7bed7..8741672 100644
--- a/contrib/rom-o-matic/doc/IMAGE_SCRIPT.html
+++ b/contrib/rom-o-matic/doc/IMAGE_SCRIPT.html
@@ -1 +1 @@
-gPXE script image support
+iPXE script image support
diff --git a/contrib/rom-o-matic/flag-table.php b/contrib/rom-o-matic/flag-table.php
index 82551e4..078e5fd 100644
--- a/contrib/rom-o-matic/flag-table.php
+++ b/contrib/rom-o-matic/flag-table.php
@@ -59,7 +59,7 @@ $flag_table = array (
 	   "flag" => "PRODUCT_SHORT_NAME",
 	   "hide_from_user" => "yes",
 	   "type" => "string",
-	   "value" => "gPXE",
+	   "value" => "iPXE",
 	   "cfgsec" => "general"
 	   ),
 
diff --git a/contrib/rom-o-matic/globals.php b/contrib/rom-o-matic/globals.php
index d4316d0..822e4bc 100644
--- a/contrib/rom-o-matic/globals.php
+++ b/contrib/rom-o-matic/globals.php
@@ -19,10 +19,10 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-// Directory containing gPXE source code tree
+// Directory containing iPXE source code tree
 $src_dir = "../../src";
 
-// Compute gPXE version based on source tree
+// Compute iPXE version based on source tree
 exec ( "make -C '$src_dir' version 2>&1", $make_output, $status );
 $version = ( $status == 0 && count ( $make_output  ) > 1 )
            ? trim ( $make_output[count ( $make_output ) - 2] )
@@ -36,10 +36,10 @@ $top_inc = "top.php";
 $bottom_inc = "bottom.php";
 
 // Descriptive strings
-$header_title = "ROM-o-matic for gPXE $version";
-$html_tagline = "ROM-o-matic dynamically generates gPXE images";
-$html_title   = "ROM-o-matic for gPXE $version";
-$description  = "a dynamic gPXE image generator";
+$header_title = "ROM-o-matic for iPXE $version";
+$html_tagline = "ROM-o-matic dynamically generates iPXE images";
+$html_title   = "ROM-o-matic for iPXE $version";
+$description  = "a dynamic iPXE image generator";
 
 // For emacs:
 // Local variables:
diff --git a/contrib/rom-o-matic/top.php b/contrib/rom-o-matic/top.php
index f94c2b3..2556208 100644
--- a/contrib/rom-o-matic/top.php
+++ b/contrib/rom-o-matic/top.php
@@ -26,7 +26,7 @@
 <html>
 <head>
   <link rev="made" href="mailto:<? echo "${webmaster_email}" ?>">
-  <meta name="keywords" content="rom, etherboot, gpxe, open source, rom-o-matic.net">
+  <meta name="keywords" content="rom, etherboot, ipxe, open source, rom-o-matic.net">
   <title><? echo $header_title ?></title>
   <meta name="description" content="<? echo $description ?>">
 </head>
diff --git a/contrib/rom-o-matic/utils.php b/contrib/rom-o-matic/utils.php
index c5fdc20..dc5bd41 100644
--- a/contrib/rom-o-matic/utils.php
+++ b/contrib/rom-o-matic/utils.php
@@ -19,7 +19,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-// Include table of user-configurable gPXE options
+// Include table of user-configurable iPXE options
 require_once "flag-table.php";
 
 // Include user-shadowable globals
@@ -103,7 +103,7 @@ function curDirURL ()
 /**
  * Extract NIC families and associated ROM PCI IDs from the src/bin/NIC file.
  *
- * $src_dir must contain the path of the gPXE src directory for this build
+ * $src_dir must contain the path of the iPXE src directory for this build
  *
  * @return array[0] array $new_nics
  * @return array[1] array $roms
@@ -161,7 +161,7 @@ function parse_nic_file ()
 
     // add special cases to the top
 
-	$new_nics = array ( "all-drivers" => "gpxe",
+	$new_nics = array ( "all-drivers" => "ipxe",
 						"undionly" => "undionly",
 						"undi" => "undi",
     );
@@ -363,9 +363,9 @@ function get_flags ()
 }
 
 /**
- * Output given value in appropriate format for gPXE config file
+ * Output given value in appropriate format for iPXE config file
  *
- * gPXE config/*.h files use C pre-processor syntax.  Output the given
+ * iPXE config/*.h files use C pre-processor syntax.  Output the given
  * compile option in a format appropriate to its type
  *
  * @param string $key   index into $flag_table for given compile option
@@ -429,7 +429,7 @@ function echo_flags ( $flags )
 
         } else {
 
-            // Flag (gPXE compile option) should be displayed to user
+            // Flag (iPXE compile option) should be displayed to user
 
             if ( $type == "header" ) {
 
@@ -535,9 +535,9 @@ function mktempcopy ( $src, $dst, $prefix )
 }
 
 /**
- * Write gPXE config files based on value of given flags
+ * Write iPXE config files based on value of given flags
  *
- * gPXE compile options are stored in src/config/*.h .
+ * iPXE compile options are stored in src/config/*.h .
  * We write out a config file for each set of options.
  *
  * @param string $config_dir directory to write .h files to
@@ -545,7 +545,7 @@ function mktempcopy ( $src, $dst, $prefix )
  *
  * @return void
  */
-function write_gpxe_config_files ( $config_dir, $flags )
+function write_ipxe_config_files ( $config_dir, $flags )
 {
     global $flag_table;
 
diff --git a/src/Makefile b/src/Makefile
index c02acb9..d7c915d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -93,22 +93,22 @@ INCDIRS		+= include .
 # Default build target: build the most common targets and print out a
 # helpfully suggestive message
 #
-all : bin/blib.a bin/gpxe.dsk bin/gpxe.iso bin/gpxe.usb bin/undionly.kpxe
+all : bin/blib.a bin/ipxe.dsk bin/ipxe.iso bin/ipxe.usb bin/undionly.kpxe
 	@$(ECHO) '==========================================================='
 	@$(ECHO)
 	@$(ECHO) 'To create a bootable floppy, type'
-	@$(ECHO) '    cat bin/gpxe.dsk > /dev/fd0'
+	@$(ECHO) '    cat bin/ipxe.dsk > /dev/fd0'
 	@$(ECHO) 'where /dev/fd0 is your floppy drive.  This will erase any'
 	@$(ECHO) 'data already on the disk.'
 	@$(ECHO)
 	@$(ECHO) 'To create a bootable USB key, type'
-	@$(ECHO) '    cat bin/gpxe.usb > /dev/sdX'
+	@$(ECHO) '    cat bin/ipxe.usb > /dev/sdX'
 	@$(ECHO) 'where /dev/sdX is your USB key, and is *not* a real hard'
 	@$(ECHO) 'disk on your system.  This will erase any data already on'
 	@$(ECHO) 'the USB key.'
 	@$(ECHO)
 	@$(ECHO) 'To create a bootable CD-ROM, burn the ISO image '
-	@$(ECHO) 'bin/gpxe.iso to a blank CD-ROM.'
+	@$(ECHO) 'bin/ipxe.iso to a blank CD-ROM.'
 	@$(ECHO)
 	@$(ECHO) 'These images contain drivers for all supported cards.  You'
 	@$(ECHO) 'can build more customised images, and ROM images, using'
@@ -140,7 +140,7 @@ CFLAGS		+= -DVERSION_MAJOR=$(VERSION_MAJOR) \
 		   -DVERSION_MINOR=$(VERSION_MINOR) \
 		   -DVERSION_PATCH=$(VERSION_PATCH) \
 		   -DVERSION=\"$(VERSION)\"
-IDENT		= '$(@F) $(VERSION) (GPL) etherboot.org'
+IDENT		= '$(@F) $(VERSION) (GPL) ipxe.org'
 version :
 	@$(ECHO) $(VERSION)
 
diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
index c373c88..653542e 100644
--- a/src/Makefile.housekeeping
+++ b/src/Makefile.housekeeping
@@ -569,7 +569,7 @@ CLEANUP		+= $(BIN)/NIC	# Doesn't match the $(BIN)/*.* pattern
 # TGT_ROM_NAME : the ROM name (e.g. "dfe538")
 # TGT_MEDIA    : the media type (e.g. "rom")
 #
-DRIVERS_gpxe	= $(DRIVERS)
+DRIVERS_ipxe	= $(DRIVERS)
 CARD_DRIVER	= $(firstword $(DRIVER_$(1)) $(1))
 TGT_ELEMENTS	= $(subst --, ,$(firstword $(subst ., ,$(notdir $@))))
 TGT_PREFIX	= $(word 2,$(subst ., ,$(notdir $@)))
@@ -851,9 +851,9 @@ allall: allroms allzroms allpxes allisos alldsks
 allroms allzroms : all%s : $(foreach ROM,$(ROMS),$(BIN)/$(ROM).%)
 allpxes allisos alldsks : all%s : $(foreach DRIVER,$(DRIVERS),$(BIN)/$(DRIVER).%)
 
-# Alias for gpxe.%
+# Alias for ipxe.%
 #
-$(BIN)/etherboot.% : $(BIN)/gpxe.%
+$(BIN)/etherboot.% : $(BIN)/ipxe.%
 	ln -sf $(notdir $<) $@
 
 endif # defined(BIN)
diff --git a/src/arch/i386/core/gdbmach.c b/src/arch/i386/core/gdbmach.c
index 97827ec..396d340 100644
--- a/src/arch/i386/core/gdbmach.c
+++ b/src/arch/i386/core/gdbmach.c
@@ -19,8 +19,8 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <assert.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/gdbstub.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/gdbstub.h>
 #include <gdbmach.h>
 
 /** @file
diff --git a/src/arch/i386/core/pic8259.c b/src/arch/i386/core/pic8259.c
index 1e2d23c..0264c0c 100644
--- a/src/arch/i386/core/pic8259.c
+++ b/src/arch/i386/core/pic8259.c
@@ -18,7 +18,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <pic8259.h>
 
 /** @file
diff --git a/src/arch/i386/core/rdtsc_timer.c b/src/arch/i386/core/rdtsc_timer.c
index 7667917..d2a8cc8 100644
--- a/src/arch/i386/core/rdtsc_timer.c
+++ b/src/arch/i386/core/rdtsc_timer.c
@@ -25,8 +25,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
  */
 
 #include <assert.h>
-#include <gpxe/timer.h>
-#include <gpxe/timer2.h>
+#include <ipxe/timer.h>
+#include <ipxe/timer2.h>
 
 /**
  * Number of TSC ticks per microsecond
diff --git a/src/arch/i386/core/relocate.c b/src/arch/i386/core/relocate.c
index 44e764f..1dadb5f 100644
--- a/src/arch/i386/core/relocate.c
+++ b/src/arch/i386/core/relocate.c
@@ -1,6 +1,6 @@
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <registers.h>
-#include <gpxe/memmap.h>
+#include <ipxe/memmap.h>
 
 /*
  * Originally by Eric Biederman
diff --git a/src/arch/i386/core/timer2.c b/src/arch/i386/core/timer2.c
index 6e76b2e..0778665 100644
--- a/src/arch/i386/core/timer2.c
+++ b/src/arch/i386/core/timer2.c
@@ -14,8 +14,8 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stddef.h>
-#include <gpxe/timer2.h>
-#include <gpxe/io.h>
+#include <ipxe/timer2.h>
+#include <ipxe/io.h>
 
 /* Timers tick over at this rate */
 #define TIMER2_TICKS_PER_SEC	1193180U
diff --git a/src/arch/i386/core/video_subr.c b/src/arch/i386/core/video_subr.c
index c821cd0..b10ef7b 100644
--- a/src/arch/i386/core/video_subr.c
+++ b/src/arch/i386/core/video_subr.c
@@ -7,9 +7,9 @@
 
 #include "stddef.h"
 #include "string.h"
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include "console.h"
-#include <gpxe/init.h>
+#include <ipxe/init.h>
 #include "vga.h"
 
 struct console_driver vga_console;
diff --git a/src/arch/i386/core/x86_io.c b/src/arch/i386/core/x86_io.c
index d2c363b..2fba068 100644
--- a/src/arch/i386/core/x86_io.c
+++ b/src/arch/i386/core/x86_io.c
@@ -18,12 +18,12 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/io.h>
-#include <gpxe/x86_io.h>
+#include <ipxe/io.h>
+#include <ipxe/x86_io.h>
 
 /** @file
  *
- * gPXE I/O API for x86
+ * iPXE I/O API for x86
  *
  */
 
diff --git a/src/arch/i386/drivers/net/undi.c b/src/arch/i386/drivers/net/undi.c
index c6e253c..71d8453 100644
--- a/src/arch/i386/drivers/net/undi.c
+++ b/src/arch/i386/drivers/net/undi.c
@@ -22,7 +22,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <gpxe/pci.h>
+#include <ipxe/pci.h>
 #include <undi.h>
 #include <undirom.h>
 #include <undiload.h>
diff --git a/src/arch/i386/drivers/net/undiload.c b/src/arch/i386/drivers/net/undiload.c
index 47a2bae..67ef00d 100644
--- a/src/arch/i386/drivers/net/undiload.c
+++ b/src/arch/i386/drivers/net/undiload.c
@@ -26,7 +26,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <bios.h>
 #include <pnpbios.h>
 #include <basemem.h>
-#include <gpxe/pci.h>
+#include <ipxe/pci.h>
 #include <undi.h>
 #include <undirom.h>
 #include <undiload.h>
diff --git a/src/arch/i386/drivers/net/undinet.c b/src/arch/i386/drivers/net/undinet.c
index 83b79e7..7ec4b50 100644
--- a/src/arch/i386/drivers/net/undinet.c
+++ b/src/arch/i386/drivers/net/undinet.c
@@ -25,11 +25,11 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <biosint.h>
 #include <pnpbios.h>
 #include <basemem_packet.h>
-#include <gpxe/io.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/io.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/ethernet.h>
 #include <undi.h>
 #include <undinet.h>
 #include <pxeparent.h>
diff --git a/src/arch/i386/drivers/net/undionly.c b/src/arch/i386/drivers/net/undionly.c
index 7dfb5d1..ab9c61f 100644
--- a/src/arch/i386/drivers/net/undionly.c
+++ b/src/arch/i386/drivers/net/undionly.c
@@ -21,8 +21,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <gpxe/device.h>
-#include <gpxe/init.h>
+#include <ipxe/device.h>
+#include <ipxe/init.h>
 #include <undi.h>
 #include <undinet.h>
 #include <undipreload.h>
diff --git a/src/arch/i386/firmware/pcbios/basemem.c b/src/arch/i386/firmware/pcbios/basemem.c
index 1ba7d1f..d18e8b8 100644
--- a/src/arch/i386/firmware/pcbios/basemem.c
+++ b/src/arch/i386/firmware/pcbios/basemem.c
@@ -22,7 +22,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <realmode.h>
 #include <bios.h>
 #include <basemem.h>
-#include <gpxe/hidemem.h>
+#include <ipxe/hidemem.h>
 
 /** @file
  *
diff --git a/src/arch/i386/firmware/pcbios/bios_console.c b/src/arch/i386/firmware/pcbios/bios_console.c
index 1d18e54..bf10ebc 100644
--- a/src/arch/i386/firmware/pcbios/bios_console.c
+++ b/src/arch/i386/firmware/pcbios/bios_console.c
@@ -21,7 +21,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <assert.h>
 #include <realmode.h>
 #include <console.h>
-#include <gpxe/ansiesc.h>
+#include <ipxe/ansiesc.h>
 
 #define ATTR_BOLD		0x08
 
diff --git a/src/arch/i386/firmware/pcbios/gateA20.c b/src/arch/i386/firmware/pcbios/gateA20.c
index 1a71472..55f7293 100644
--- a/src/arch/i386/firmware/pcbios/gateA20.c
+++ b/src/arch/i386/firmware/pcbios/gateA20.c
@@ -3,8 +3,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdio.h>
 #include <realmode.h>
 #include <bios.h>
-#include <gpxe/io.h>
-#include <gpxe/timer.h>
+#include <ipxe/io.h>
+#include <ipxe/timer.h>
 
 #define K_RDWR		0x60		/* keyboard data & cmds (read/write) */
 #define K_STATUS	0x64		/* keyboard status */
diff --git a/src/arch/i386/firmware/pcbios/hidemem.c b/src/arch/i386/firmware/pcbios/hidemem.c
index 17082c3..322be9e 100644
--- a/src/arch/i386/firmware/pcbios/hidemem.c
+++ b/src/arch/i386/firmware/pcbios/hidemem.c
@@ -22,9 +22,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <biosint.h>
 #include <basemem.h>
 #include <fakee820.h>
-#include <gpxe/init.h>
-#include <gpxe/memmap.h>
-#include <gpxe/hidemem.h>
+#include <ipxe/init.h>
+#include <ipxe/memmap.h>
+#include <ipxe/hidemem.h>
 
 /** Set to true if you want to test a fake E820 map */
 #define FAKE_E820 0
@@ -33,7 +33,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define ALIGN_HIDDEN 4096   /* 4kB page alignment should be enough */
 
 /**
- * A hidden region of gPXE
+ * A hidden region of iPXE
  *
  * This represents a region that will be edited out of the system's
  * memory map.
@@ -138,7 +138,7 @@ static void hide_etherboot ( void ) {
 	unsigned int fbms;
 
 	/* Dump memory map before mangling */
-	DBG ( "Hiding gPXE from system memory map\n" );
+	DBG ( "Hiding iPXE from system memory map\n" );
 	get_memmap ( &memmap );
 
 	/* Hook in fake E820 map, if we're testing one */
@@ -178,7 +178,7 @@ static void hide_etherboot ( void ) {
 			      &int15_vector );
 
 	/* Dump memory map after mangling */
-	DBG ( "Hidden gPXE from system memory map\n" );
+	DBG ( "Hidden iPXE from system memory map\n" );
 	get_memmap ( &memmap );
 }
 
diff --git a/src/arch/i386/firmware/pcbios/memmap.c b/src/arch/i386/firmware/pcbios/memmap.c
index 8a30dba..c53a35f 100644
--- a/src/arch/i386/firmware/pcbios/memmap.c
+++ b/src/arch/i386/firmware/pcbios/memmap.c
@@ -23,7 +23,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <realmode.h>
 #include <bios.h>
 #include <memsizes.h>
-#include <gpxe/memmap.h>
+#include <ipxe/memmap.h>
 
 /**
  * @file
diff --git a/src/arch/i386/hci/commands/pxe_cmd.c b/src/arch/i386/hci/commands/pxe_cmd.c
index 76c49bb..6b4fa8f 100644
--- a/src/arch/i386/hci/commands/pxe_cmd.c
+++ b/src/arch/i386/hci/commands/pxe_cmd.c
@@ -1,5 +1,5 @@
-#include <gpxe/netdevice.h>
-#include <gpxe/command.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/command.h>
 #include <hci/ifmgmt_cmd.h>
 #include <pxe_call.h>
 
diff --git a/src/arch/i386/image/bzimage.c b/src/arch/i386/image/bzimage.c
index 1945099..900e34e 100644
--- a/src/arch/i386/image/bzimage.c
+++ b/src/arch/i386/image/bzimage.c
@@ -32,12 +32,12 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <assert.h>
 #include <realmode.h>
 #include <bzimage.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/image.h>
-#include <gpxe/segment.h>
-#include <gpxe/init.h>
-#include <gpxe/cpio.h>
-#include <gpxe/features.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/image.h>
+#include <ipxe/segment.h>
+#include <ipxe/init.h>
+#include <ipxe/cpio.h>
+#include <ipxe/features.h>
 
 FEATURE ( FEATURE_IMAGE, "bzImage", DHCP_EB_FEATURE_BZIMAGE, 1 );
 
@@ -201,7 +201,7 @@ static void bzimage_update_header ( struct image *image,
 
 	/* Set loader type */
 	if ( bzimg->version >= 0x0200 )
-		bzimg->bzhdr.type_of_loader = BZI_LOADER_TYPE_GPXE;
+		bzimg->bzhdr.type_of_loader = BZI_LOADER_TYPE_IPXE;
 
 	/* Set heap end pointer */
 	if ( bzimg->version >= 0x0201 ) {
diff --git a/src/arch/i386/image/com32.c b/src/arch/i386/image/com32.c
index 6ab347c..25a77e9 100644
--- a/src/arch/i386/image/com32.c
+++ b/src/arch/i386/image/com32.c
@@ -34,11 +34,11 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <realmode.h>
 #include <basemem.h>
 #include <comboot.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/image.h>
-#include <gpxe/segment.h>
-#include <gpxe/init.h>
-#include <gpxe/memmap.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/image.h>
+#include <ipxe/segment.h>
+#include <ipxe/init.h>
+#include <ipxe/memmap.h>
 
 struct image_type com32_image_type __image_type ( PROBE_NORMAL );
 
diff --git a/src/arch/i386/image/comboot.c b/src/arch/i386/image/comboot.c
index a00b2b9..253cbb6 100644
--- a/src/arch/i386/image/comboot.c
+++ b/src/arch/i386/image/comboot.c
@@ -34,11 +34,11 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <realmode.h>
 #include <basemem.h>
 #include <comboot.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/image.h>
-#include <gpxe/segment.h>
-#include <gpxe/init.h>
-#include <gpxe/features.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/image.h>
+#include <ipxe/segment.h>
+#include <ipxe/init.h>
+#include <ipxe/features.h>
 
 FEATURE ( FEATURE_IMAGE, "COMBOOT", DHCP_EB_FEATURE_COMBOOT, 1 );
 
diff --git a/src/arch/i386/image/elfboot.c b/src/arch/i386/image/elfboot.c
index a41040e..7cb51bf 100644
--- a/src/arch/i386/image/elfboot.c
+++ b/src/arch/i386/image/elfboot.c
@@ -20,10 +20,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <errno.h>
 #include <elf.h>
-#include <gpxe/image.h>
-#include <gpxe/elf.h>
-#include <gpxe/features.h>
-#include <gpxe/init.h>
+#include <ipxe/image.h>
+#include <ipxe/elf.h>
+#include <ipxe/features.h>
+#include <ipxe/init.h>
 
 /**
  * @file
diff --git a/src/arch/i386/image/eltorito.c b/src/arch/i386/image/eltorito.c
index 53eb2c0..a416d15 100644
--- a/src/arch/i386/image/eltorito.c
+++ b/src/arch/i386/image/eltorito.c
@@ -31,11 +31,11 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <realmode.h>
 #include <bootsector.h>
 #include <int13.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/image.h>
-#include <gpxe/segment.h>
-#include <gpxe/ramdisk.h>
-#include <gpxe/init.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/image.h>
+#include <ipxe/segment.h>
+#include <ipxe/ramdisk.h>
+#include <ipxe/init.h>
 
 #define ISO9660_BLKSIZE 2048
 #define ELTORITO_VOL_DESC_OFFSET ( 17 * ISO9660_BLKSIZE )
diff --git a/src/arch/i386/image/multiboot.c b/src/arch/i386/image/multiboot.c
index 5b62095..b3c6b8f 100644
--- a/src/arch/i386/image/multiboot.c
+++ b/src/arch/i386/image/multiboot.c
@@ -30,13 +30,13 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <assert.h>
 #include <realmode.h>
 #include <multiboot.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/image.h>
-#include <gpxe/segment.h>
-#include <gpxe/memmap.h>
-#include <gpxe/elf.h>
-#include <gpxe/init.h>
-#include <gpxe/features.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/image.h>
+#include <ipxe/segment.h>
+#include <ipxe/memmap.h>
+#include <ipxe/elf.h>
+#include <ipxe/init.h>
+#include <ipxe/features.h>
 
 FEATURE ( FEATURE_IMAGE, "Multiboot", DHCP_EB_FEATURE_MULTIBOOT, 1 );
 
@@ -242,7 +242,7 @@ static struct multiboot_info __bss16 ( mbinfo );
 #define mbinfo __use_data16 ( mbinfo )
 
 /** The multiboot bootloader name */
-static char __data16_array ( mb_bootloader_name, [] ) = "gPXE " VERSION;
+static char __data16_array ( mb_bootloader_name, [] ) = "iPXE " VERSION;
 #define mb_bootloader_name __use_data16 ( mb_bootloader_name )
 
 /** The multiboot memory map */
diff --git a/src/arch/i386/image/nbi.c b/src/arch/i386/image/nbi.c
index a4ee442..6849736 100644
--- a/src/arch/i386/image/nbi.c
+++ b/src/arch/i386/image/nbi.c
@@ -4,13 +4,13 @@
 #include <gateA20.h>
 #include <memsizes.h>
 #include <basemem_packet.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/segment.h>
-#include <gpxe/init.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/fakedhcp.h>
-#include <gpxe/image.h>
-#include <gpxe/features.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/segment.h>
+#include <ipxe/init.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/fakedhcp.h>
+#include <ipxe/image.h>
+#include <ipxe/features.h>
 
 /** @file
  *
diff --git a/src/arch/i386/image/pxe_image.c b/src/arch/i386/image/pxe_image.c
index 63429f8..ef776d9 100644
--- a/src/arch/i386/image/pxe_image.c
+++ b/src/arch/i386/image/pxe_image.c
@@ -27,11 +27,11 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <pxe.h>
 #include <pxe_call.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/image.h>
-#include <gpxe/segment.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/features.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/image.h>
+#include <ipxe/segment.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/features.h>
 
 FEATURE ( FEATURE_IMAGE, "PXE", DHCP_EB_FEATURE_PXE, 1 );
 
@@ -87,7 +87,7 @@ int pxe_load ( struct image *image ) {
 		return -ENOEXEC;
 
 	/* Rejecting zero-length images is also useful, since these
-	 * end up looking to the user like bugs in gPXE.
+	 * end up looking to the user like bugs in iPXE.
 	 */
 	if ( ! filesz )
 		return -ENOEXEC;
diff --git a/src/arch/i386/include/bits/io.h b/src/arch/i386/include/bits/io.h
index eded977..f3ecf89 100644
--- a/src/arch/i386/include/bits/io.h
+++ b/src/arch/i386/include/bits/io.h
@@ -9,6 +9,6 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/x86_io.h>
+#include <ipxe/x86_io.h>
 
 #endif /* _BITS_IO_H */
diff --git a/src/arch/i386/include/bits/nap.h b/src/arch/i386/include/bits/nap.h
index 1354f6b..64066e6 100644
--- a/src/arch/i386/include/bits/nap.h
+++ b/src/arch/i386/include/bits/nap.h
@@ -9,7 +9,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/bios_nap.h>
-#include <gpxe/efi/efix86_nap.h>
+#include <ipxe/bios_nap.h>
+#include <ipxe/efi/efix86_nap.h>
 
 #endif /* _BITS_MAP_H */
diff --git a/src/arch/i386/include/bits/smbios.h b/src/arch/i386/include/bits/smbios.h
index a68413a..cc79eec 100644
--- a/src/arch/i386/include/bits/smbios.h
+++ b/src/arch/i386/include/bits/smbios.h
@@ -9,6 +9,6 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/bios_smbios.h>
+#include <ipxe/bios_smbios.h>
 
 #endif /* _BITS_SMBIOS_H */
diff --git a/src/arch/i386/include/bits/timer.h b/src/arch/i386/include/bits/timer.h
index 32e6bd4..50b676b 100644
--- a/src/arch/i386/include/bits/timer.h
+++ b/src/arch/i386/include/bits/timer.h
@@ -9,7 +9,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/bios_timer.h>
-#include <gpxe/rdtsc_timer.h>
+#include <ipxe/bios_timer.h>
+#include <ipxe/rdtsc_timer.h>
 
 #endif /* _BITS_TIMER_H */
diff --git a/src/arch/i386/include/bits/umalloc.h b/src/arch/i386/include/bits/umalloc.h
index 17ba2cb..54fb006 100644
--- a/src/arch/i386/include/bits/umalloc.h
+++ b/src/arch/i386/include/bits/umalloc.h
@@ -9,6 +9,6 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/memtop_umalloc.h>
+#include <ipxe/memtop_umalloc.h>
 
 #endif /* _BITS_UMALLOC_H */
diff --git a/src/arch/i386/include/bzimage.h b/src/arch/i386/include/bzimage.h
index 42b31fe..ccf8e35 100644
--- a/src/arch/i386/include/bzimage.h
+++ b/src/arch/i386/include/bzimage.h
@@ -86,11 +86,11 @@ struct bzimage_header {
 /** bzImage boot loader identifier for Etherboot */
 #define BZI_LOADER_TYPE_ETHERBOOT 0x40
 
-/** bzImage boot loader identifier for gPXE
+/** bzImage boot loader identifier for iPXE
  *
  * We advertise ourselves as Etherboot version 6.
  */
-#define BZI_LOADER_TYPE_GPXE ( BZI_LOADER_TYPE_ETHERBOOT | 0x06 )
+#define BZI_LOADER_TYPE_IPXE ( BZI_LOADER_TYPE_ETHERBOOT | 0x06 )
 
 /** bzImage "load high" flag */
 #define BZI_LOAD_HIGH 0x01
diff --git a/src/arch/i386/include/comboot.h b/src/arch/i386/include/comboot.h
index 1232f0a..99ce79e 100644
--- a/src/arch/i386/include/comboot.h
+++ b/src/arch/i386/include/comboot.h
@@ -11,7 +11,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
 #include <setjmp.h>
-#include <gpxe/in.h>
+#include <ipxe/in.h>
 
 /** Segment used for COMBOOT PSP and image */
 #define COMBOOT_PSP_SEG 0x07C0
diff --git a/src/arch/i386/include/int13.h b/src/arch/i386/include/int13.h
index e1884d9..ed085d5 100644
--- a/src/arch/i386/include/int13.h
+++ b/src/arch/i386/include/int13.h
@@ -10,7 +10,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/list.h>
+#include <ipxe/list.h>
 #include <realmode.h>
 
 struct block_device;
diff --git a/src/arch/i386/include/gpxe/abft.h b/src/arch/i386/include/ipxe/abft.h
index 9065e61..ca96302 100644
--- a/src/arch/i386/include/gpxe/abft.h
+++ b/src/arch/i386/include/ipxe/abft.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ABFT_H
-#define _GPXE_ABFT_H
+#ifndef _IPXE_ABFT_H
+#define _IPXE_ABFT_H
 
 /** @file
  *
@@ -10,8 +10,8 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/acpi.h>
-#include <gpxe/if_ether.h>
+#include <ipxe/acpi.h>
+#include <ipxe/if_ether.h>
 
 /** AoE boot firmware table signature */
 #define ABFT_SIG "aBFT"
@@ -34,4 +34,4 @@ struct abft_table {
 
 extern void abft_fill_data ( struct aoe_session *aoe );
 
-#endif /* _GPXE_ABFT_H */
+#endif /* _IPXE_ABFT_H */
diff --git a/src/arch/i386/include/gpxe/bios_nap.h b/src/arch/i386/include/ipxe/bios_nap.h
index c32429b..5b684c0 100644
--- a/src/arch/i386/include/gpxe/bios_nap.h
+++ b/src/arch/i386/include/ipxe/bios_nap.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_BIOS_NAP_H
-#define _GPXE_BIOS_NAP_H
+#ifndef _IPXE_BIOS_NAP_H
+#define _IPXE_BIOS_NAP_H
 
 /** @file
  *
@@ -15,4 +15,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define NAP_PREFIX_pcbios __pcbios_
 #endif
 
-#endif /* _GPXE_BIOS_NAP_H */
+#endif /* _IPXE_BIOS_NAP_H */
diff --git a/src/arch/i386/include/gpxe/bios_smbios.h b/src/arch/i386/include/ipxe/bios_smbios.h
index 83726b1..d8c7f64 100644
--- a/src/arch/i386/include/gpxe/bios_smbios.h
+++ b/src/arch/i386/include/ipxe/bios_smbios.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_BIOS_SMBIOS_H
-#define _GPXE_BIOS_SMBIOS_H
+#ifndef _IPXE_BIOS_SMBIOS_H
+#define _IPXE_BIOS_SMBIOS_H
 
 /** @file
  *
@@ -15,4 +15,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define SMBIOS_PREFIX_pcbios __pcbios_
 #endif
 
-#endif /* _GPXE_BIOS_SMBIOS_H */
+#endif /* _IPXE_BIOS_SMBIOS_H */
diff --git a/src/arch/i386/include/gpxe/bios_timer.h b/src/arch/i386/include/ipxe/bios_timer.h
index ed9df52..f9fc804 100644
--- a/src/arch/i386/include/gpxe/bios_timer.h
+++ b/src/arch/i386/include/ipxe/bios_timer.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_BIOS_TIMER_H
-#define _GPXE_BIOS_TIMER_H
+#ifndef _IPXE_BIOS_TIMER_H
+#define _IPXE_BIOS_TIMER_H
 
 /** @file
  *
@@ -15,7 +15,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define TIMER_PREFIX_pcbios __pcbios_
 #endif
 
-#include <gpxe/timer2.h>
+#include <ipxe/timer2.h>
 
 /**
  * Delay for a fixed number of microseconds
@@ -41,4 +41,4 @@ TIMER_INLINE ( pcbios, ticks_per_sec ) ( void ) {
 	return 18;
 }
 
-#endif /* _GPXE_BIOS_TIMER_H */
+#endif /* _IPXE_BIOS_TIMER_H */
diff --git a/src/arch/i386/include/gpxe/ibft.h b/src/arch/i386/include/ipxe/ibft.h
index c41e2e4..8525fe8 100644
--- a/src/arch/i386/include/gpxe/ibft.h
+++ b/src/arch/i386/include/ipxe/ibft.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IBFT_H
-#define _GPXE_IBFT_H
+#ifndef _IPXE_IBFT_H
+#define _IPXE_IBFT_H
 
 /*
  * Copyright Fen Systems Ltd. 2007.  Portions of this code are derived
@@ -42,8 +42,8 @@ FILE_LICENCE ( BSD2 );
  */
 
 #include <stdint.h>
-#include <gpxe/acpi.h>
-#include <gpxe/in.h>
+#include <ipxe/acpi.h>
+#include <ipxe/in.h>
 
 /** iSCSI Boot Firmware Table signature */
 #define IBFT_SIG "iBFT"
@@ -273,14 +273,14 @@ struct ibft_string_block {
 	unsigned int offset;
 };
 
-/** Amount of space reserved for strings in a gPXE iBFT */
+/** Amount of space reserved for strings in a iPXE iBFT */
 #define IBFT_STRINGS_SIZE 384
 
 /**
- * An iBFT created by gPXE
+ * An iBFT created by iPXE
  *
  */
-struct gpxe_ibft {
+struct ipxe_ibft {
 	/** The fixed section */
 	struct ibft_table table;
 	/** The Initiator section */
@@ -299,4 +299,4 @@ struct iscsi_session;
 extern int ibft_fill_data ( struct net_device *netdev,
 			    struct iscsi_session *iscsi );
 
-#endif /* _GPXE_IBFT_H */
+#endif /* _IPXE_IBFT_H */
diff --git a/src/arch/i386/include/gpxe/memtop_umalloc.h b/src/arch/i386/include/ipxe/memtop_umalloc.h
index eaf7025..001648f 100644
--- a/src/arch/i386/include/gpxe/memtop_umalloc.h
+++ b/src/arch/i386/include/ipxe/memtop_umalloc.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_MEMTOP_UMALLOC_H
-#define _GPXE_MEMTOP_UMALLOC_H
+#ifndef _IPXE_MEMTOP_UMALLOC_H
+#define _IPXE_MEMTOP_UMALLOC_H
 
 /** @file
  *
@@ -15,4 +15,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define UMALLOC_PREFIX_memtop __memtop_
 #endif
 
-#endif /* _GPXE_MEMTOP_UMALLOC_H */
+#endif /* _IPXE_MEMTOP_UMALLOC_H */
diff --git a/src/arch/i386/include/gpxe/rdtsc_timer.h b/src/arch/i386/include/ipxe/rdtsc_timer.h
index 67ba22f..472e140 100644
--- a/src/arch/i386/include/gpxe/rdtsc_timer.h
+++ b/src/arch/i386/include/ipxe/rdtsc_timer.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_RDTSC_TIMER_H
-#define _GPXE_RDTSC_TIMER_H
+#ifndef _IPXE_RDTSC_TIMER_H
+#define _IPXE_RDTSC_TIMER_H
 
 /** @file
  *
@@ -36,4 +36,4 @@ TIMER_INLINE ( rdtsc, currticks ) ( void ) {
 	return ticks;
 }
 
-#endif /* _GPXE_RDTSC_TIMER_H */
+#endif /* _IPXE_RDTSC_TIMER_H */
diff --git a/src/arch/i386/include/gpxe/sbft.h b/src/arch/i386/include/ipxe/sbft.h
index 3003843..f991062 100644
--- a/src/arch/i386/include/gpxe/sbft.h
+++ b/src/arch/i386/include/ipxe/sbft.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_SBFT_H
-#define _GPXE_SBFT_H
+#ifndef _IPXE_SBFT_H
+#define _IPXE_SBFT_H
 
 /*
  * Copyright (C) 2009 Fen Systems Ltd <mbrown@fensystems.co.uk>.
@@ -40,15 +40,15 @@ FILE_LICENCE ( BSD2 );
  * The working draft specification for the SRP boot firmware table can
  * be found at
  *
- *   http://etherboot.org/wiki/srp/sbft
+ *   http://ipxe.org/wiki/srp/sbft
  *
  */
 
 #include <stdint.h>
-#include <gpxe/acpi.h>
-#include <gpxe/scsi.h>
-#include <gpxe/srp.h>
-#include <gpxe/ib_srp.h>
+#include <ipxe/acpi.h>
+#include <ipxe/scsi.h>
+#include <ipxe/srp.h>
+#include <ipxe/ib_srp.h>
 
 /** SRP Boot Firmware Table signature */
 #define SBFT_SIG "sBFT"
@@ -105,9 +105,9 @@ struct sbft_ib_subtable {
 } __attribute__ (( packed ));
 
 /**
- * An sBFT created by gPXE
+ * An sBFT created by iPXE
  */
-struct gpxe_sbft {
+struct ipxe_sbft {
 	/** The table header */
 	struct sbft_table table;
 	/** The SCSI subtable */
@@ -122,4 +122,4 @@ struct srp_device;
 
 extern int sbft_fill_data ( struct srp_device *srp );
 
-#endif /* _GPXE_SBFT_H */
+#endif /* _IPXE_SBFT_H */
diff --git a/src/arch/i386/include/gpxe/timer2.h b/src/arch/i386/include/ipxe/timer2.h
index 8f11951..322a3ed 100644
--- a/src/arch/i386/include/gpxe/timer2.h
+++ b/src/arch/i386/include/ipxe/timer2.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_TIMER2_H
-#define _GPXE_TIMER2_H
+#ifndef _IPXE_TIMER2_H
+#define _IPXE_TIMER2_H
 
 /** @file
  *
@@ -11,4 +11,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 extern void timer2_udelay ( unsigned long usecs );
 
-#endif /* _GPXE_TIMER2_H */
+#endif /* _IPXE_TIMER2_H */
diff --git a/src/arch/i386/include/gpxe/x86_io.h b/src/arch/i386/include/ipxe/x86_io.h
index beb5b22..a79501e 100644
--- a/src/arch/i386/include/gpxe/x86_io.h
+++ b/src/arch/i386/include/ipxe/x86_io.h
@@ -1,9 +1,9 @@
-#ifndef _GPXE_X86_IO_H
-#define _GPXE_X86_IO_H
+#ifndef _IPXE_X86_IO_H
+#define _IPXE_X86_IO_H
 
 /** @file
  *
- * gPXE I/O API for x86
+ * iPXE I/O API for x86
  *
  * i386 uses direct pointer dereferences for accesses to memory-mapped
  * I/O space, and the inX/outX instructions for accesses to
@@ -150,4 +150,4 @@ IOAPI_INLINE ( x86, mb ) ( void ) {
 	__asm__ __volatile__ ( "lock; addl $0, 0(%%esp)" : : : "memory" );
 }
 
-#endif /* _GPXE_X86_IO_H */
+#endif /* _IPXE_X86_IO_H */
diff --git a/src/arch/i386/include/pxe.h b/src/arch/i386/include/pxe.h
index f4a34a6..f93a1cd 100644
--- a/src/arch/i386/include/pxe.h
+++ b/src/arch/i386/include/pxe.h
@@ -5,7 +5,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include "pxe_types.h"
 #include "pxe_api.h"
-#include <gpxe/device.h>
+#include <ipxe/device.h>
 
 /* Parameter block for pxenv_unknown() */
 struct s_PXENV_UNKNOWN {
diff --git a/src/arch/i386/include/realmode.h b/src/arch/i386/include/realmode.h
index a0a830b..dafc5a3 100644
--- a/src/arch/i386/include/realmode.h
+++ b/src/arch/i386/include/realmode.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 #include <registers.h>
-#include <gpxe/uaccess.h>
+#include <ipxe/uaccess.h>
 
 /*
  * Data structures and type definitions
diff --git a/src/arch/i386/include/undi.h b/src/arch/i386/include/undi.h
index de6925b..325fcbb 100644
--- a/src/arch/i386/include/undi.h
+++ b/src/arch/i386/include/undi.h
@@ -11,7 +11,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #ifndef ASSEMBLY
 
-#include <gpxe/device.h>
+#include <ipxe/device.h>
 #include <pxe_types.h>
 
 /** An UNDI device
diff --git a/src/arch/i386/interface/pcbios/abft.c b/src/arch/i386/interface/pcbios/abft.c
index 8694172..9aa2f09 100644
--- a/src/arch/i386/interface/pcbios/abft.c
+++ b/src/arch/i386/interface/pcbios/abft.c
@@ -19,9 +19,9 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <realmode.h>
-#include <gpxe/aoe.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/abft.h>
+#include <ipxe/aoe.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/abft.h>
 
 /** @file
  *
@@ -30,7 +30,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
  */
 
 #define abftab __use_data16 ( abftab )
-/** The aBFT used by gPXE */
+/** The aBFT used by iPXE */
 struct abft_table __data16 ( abftab ) __attribute__ (( aligned ( 16 ) )) = {
 	/* ACPI header */
 	.acpi = {
@@ -38,7 +38,7 @@ struct abft_table __data16 ( abftab ) __attribute__ (( aligned ( 16 ) )) = {
 		.length = sizeof ( abftab ),
 		.revision = 1,
 		.oem_id = "FENSYS",
-		.oem_table_id = "gPXE",
+		.oem_table_id = "iPXE",
 	},
 };
 
diff --git a/src/arch/i386/interface/pcbios/aoeboot.c b/src/arch/i386/interface/pcbios/aoeboot.c
index 2670b15..388cd14 100644
--- a/src/arch/i386/interface/pcbios/aoeboot.c
+++ b/src/arch/i386/interface/pcbios/aoeboot.c
@@ -3,11 +3,11 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
-#include <gpxe/aoe.h>
-#include <gpxe/ata.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/sanboot.h>
-#include <gpxe/abft.h>
+#include <ipxe/aoe.h>
+#include <ipxe/ata.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/sanboot.h>
+#include <ipxe/abft.h>
 #include <int13.h>
 
 FILE_LICENCE ( GPL2_OR_LATER );
diff --git a/src/arch/i386/interface/pcbios/bios_nap.c b/src/arch/i386/interface/pcbios/bios_nap.c
index e38cac7..7f46146 100644
--- a/src/arch/i386/interface/pcbios/bios_nap.c
+++ b/src/arch/i386/interface/pcbios/bios_nap.c
@@ -1,4 +1,4 @@
-#include <gpxe/nap.h>
+#include <ipxe/nap.h>
 #include <realmode.h>
 
 FILE_LICENCE ( GPL2_OR_LATER );
diff --git a/src/arch/i386/interface/pcbios/bios_smbios.c b/src/arch/i386/interface/pcbios/bios_smbios.c
index 094214b..cde3d06 100644
--- a/src/arch/i386/interface/pcbios/bios_smbios.c
+++ b/src/arch/i386/interface/pcbios/bios_smbios.c
@@ -22,8 +22,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/smbios.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/smbios.h>
 #include <realmode.h>
 #include <pnpbios.h>
 
diff --git a/src/arch/i386/interface/pcbios/bios_timer.c b/src/arch/i386/interface/pcbios/bios_timer.c
index 8ecf7c1..70c3986 100644
--- a/src/arch/i386/interface/pcbios/bios_timer.c
+++ b/src/arch/i386/interface/pcbios/bios_timer.c
@@ -24,7 +24,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
  *
  */
 
-#include <gpxe/timer.h>
+#include <ipxe/timer.h>
 #include <realmode.h>
 #include <bios.h>
 
diff --git a/src/arch/i386/interface/pcbios/ib_srpboot.c b/src/arch/i386/interface/pcbios/ib_srpboot.c
index b1cbc33..711c1e9 100644
--- a/src/arch/i386/interface/pcbios/ib_srpboot.c
+++ b/src/arch/i386/interface/pcbios/ib_srpboot.c
@@ -3,10 +3,10 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
-#include <gpxe/sanboot.h>
+#include <ipxe/sanboot.h>
 #include <int13.h>
-#include <gpxe/srp.h>
-#include <gpxe/sbft.h>
+#include <ipxe/srp.h>
+#include <ipxe/sbft.h>
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
diff --git a/src/arch/i386/interface/pcbios/ibft.c b/src/arch/i386/interface/pcbios/ibft.c
index adf8e6b..63dba65 100644
--- a/src/arch/i386/interface/pcbios/ibft.c
+++ b/src/arch/i386/interface/pcbios/ibft.c
@@ -33,14 +33,14 @@ FILE_LICENCE ( BSD2 );
 #include <errno.h>
 #include <byteswap.h>
 #include <realmode.h>
-#include <gpxe/pci.h>
-#include <gpxe/acpi.h>
-#include <gpxe/in.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/dhcp.h>
-#include <gpxe/iscsi.h>
-#include <gpxe/ibft.h>
+#include <ipxe/pci.h>
+#include <ipxe/acpi.h>
+#include <ipxe/in.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/dhcp.h>
+#include <ipxe/iscsi.h>
+#include <ipxe/ibft.h>
 
 /** @file
  *
@@ -54,8 +54,8 @@ FILE_LICENCE ( BSD2 );
  */
 
 #define ibftab __use_data16 ( ibftab )
-/** The iBFT used by gPXE */
-struct gpxe_ibft __data16 ( ibftab ) = {
+/** The iBFT used by iPXE */
+struct ipxe_ibft __data16 ( ibftab ) = {
 	/* Table header */
 	.table = {
 		/* ACPI header */
@@ -64,7 +64,7 @@ struct gpxe_ibft __data16 ( ibftab ) = {
 			.length = sizeof ( ibftab ),
 			.revision = 1,
 			.oem_id = "FENSYS",
-			.oem_table_id = "gPXE",
+			.oem_table_id = "iPXE",
 		},
 		/* Control block */
 		.control = {
diff --git a/src/arch/i386/interface/pcbios/int13.c b/src/arch/i386/interface/pcbios/int13.c
index 87b613a..a2cf5e6 100644
--- a/src/arch/i386/interface/pcbios/int13.c
+++ b/src/arch/i386/interface/pcbios/int13.c
@@ -23,9 +23,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <byteswap.h>
 #include <errno.h>
 #include <assert.h>
-#include <gpxe/list.h>
-#include <gpxe/blockdev.h>
-#include <gpxe/memmap.h>
+#include <ipxe/list.h>
+#include <ipxe/blockdev.h>
+#include <ipxe/memmap.h>
 #include <realmode.h>
 #include <bios.h>
 #include <biosint.h>
diff --git a/src/arch/i386/interface/pcbios/iscsiboot.c b/src/arch/i386/interface/pcbios/iscsiboot.c
index 00efd8f..12c5566 100644
--- a/src/arch/i386/interface/pcbios/iscsiboot.c
+++ b/src/arch/i386/interface/pcbios/iscsiboot.c
@@ -3,10 +3,10 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
-#include <gpxe/iscsi.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/ibft.h>
-#include <gpxe/sanboot.h>
+#include <ipxe/iscsi.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/ibft.h>
+#include <ipxe/sanboot.h>
 #include <int13.h>
 
 FILE_LICENCE ( GPL2_OR_LATER );
diff --git a/src/arch/i386/interface/pcbios/keepsan.c b/src/arch/i386/interface/pcbios/keepsan.c
index 904e017..b2a9317 100644
--- a/src/arch/i386/interface/pcbios/keepsan.c
+++ b/src/arch/i386/interface/pcbios/keepsan.c
@@ -1,9 +1,9 @@
 #include <stdint.h>
 #include <stdio.h>
-#include <gpxe/settings.h>
-#include <gpxe/dhcp.h>
-#include <gpxe/init.h>
-#include <gpxe/sanboot.h>
+#include <ipxe/settings.h>
+#include <ipxe/dhcp.h>
+#include <ipxe/init.h>
+#include <ipxe/sanboot.h>
 #include <usr/autoboot.h>
 
 struct setting keep_san_setting __setting = {
diff --git a/src/arch/i386/interface/pcbios/memtop_umalloc.c b/src/arch/i386/interface/pcbios/memtop_umalloc.c
index 0645fe6..51240f2 100644
--- a/src/arch/i386/interface/pcbios/memtop_umalloc.c
+++ b/src/arch/i386/interface/pcbios/memtop_umalloc.c
@@ -27,10 +27,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <limits.h>
 #include <errno.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/hidemem.h>
-#include <gpxe/memmap.h>
-#include <gpxe/umalloc.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/hidemem.h>
+#include <ipxe/memmap.h>
+#include <ipxe/umalloc.h>
 
 /** Alignment of external allocated memory */
 #define EM_ALIGN ( 4 * 1024 )
diff --git a/src/arch/i386/interface/pcbios/pcibios.c b/src/arch/i386/interface/pcbios/pcibios.c
index f2c3880..4d09c05 100644
--- a/src/arch/i386/interface/pcbios/pcibios.c
+++ b/src/arch/i386/interface/pcbios/pcibios.c
@@ -19,7 +19,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/pci.h>
+#include <ipxe/pci.h>
 #include <realmode.h>
 
 /** @file
diff --git a/src/arch/i386/interface/pcbios/sbft.c b/src/arch/i386/interface/pcbios/sbft.c
index 12927c7..6d51020 100644
--- a/src/arch/i386/interface/pcbios/sbft.c
+++ b/src/arch/i386/interface/pcbios/sbft.c
@@ -38,14 +38,14 @@ FILE_LICENCE ( BSD2 );
 
 #include <assert.h>
 #include <realmode.h>
-#include <gpxe/srp.h>
-#include <gpxe/ib_srp.h>
-#include <gpxe/acpi.h>
-#include <gpxe/sbft.h>
+#include <ipxe/srp.h>
+#include <ipxe/ib_srp.h>
+#include <ipxe/acpi.h>
+#include <ipxe/sbft.h>
 
 #define sbftab __use_data16 ( sbftab )
-/** The sBFT used by gPXE */
-struct gpxe_sbft __data16 ( sbftab ) = {
+/** The sBFT used by iPXE */
+struct ipxe_sbft __data16 ( sbftab ) = {
 	/* Table header */
 	.table = {
 		/* ACPI header */
@@ -54,7 +54,7 @@ struct gpxe_sbft __data16 ( sbftab ) = {
 			.length = sizeof ( sbftab ),
 			.revision = 1,
 			.oem_id = "FENSYS",
-			.oem_table_id = "gPXE",
+			.oem_table_id = "iPXE",
 		},
 		.scsi_offset = offsetof ( typeof ( sbftab ), scsi ),
 		.srp_offset = offsetof ( typeof ( sbftab ), srp ),
diff --git a/src/arch/i386/interface/pxe/pxe_call.c b/src/arch/i386/interface/pxe/pxe_call.c
index 66a9b1e..f6b3fc5 100644
--- a/src/arch/i386/interface/pxe/pxe_call.c
+++ b/src/arch/i386/interface/pxe/pxe_call.c
@@ -18,8 +18,8 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/uaccess.h>
-#include <gpxe/init.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/init.h>
 #include <registers.h>
 #include <biosint.h>
 #include <pxe.h>
diff --git a/src/arch/i386/interface/pxe/pxe_errors.c b/src/arch/i386/interface/pxe/pxe_errors.c
index f884ef8..f6bbd30 100644
--- a/src/arch/i386/interface/pxe/pxe_errors.c
+++ b/src/arch/i386/interface/pxe/pxe_errors.c
@@ -1,5 +1,5 @@
 #include <errno.h>
-#include <gpxe/errortab.h>
+#include <ipxe/errortab.h>
 
 /*
  * This table was generated from the relevant section of errno.h using
diff --git a/src/arch/i386/interface/pxe/pxe_file.c b/src/arch/i386/interface/pxe/pxe_file.c
index 8d83212..2676256 100644
--- a/src/arch/i386/interface/pxe/pxe_file.c
+++ b/src/arch/i386/interface/pxe/pxe_file.c
@@ -8,9 +8,9 @@
 #include <stdio.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/posix_io.h>
-#include <gpxe/features.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/posix_io.h>
+#include <ipxe/features.h>
 #include <pxe.h>
 #include <realmode.h>
 
@@ -245,7 +245,7 @@ segoff_t __data16 ( pxe_exit_hook ) = { 0, 0 };
  * @ret #PXENV_EXIT_FAILURE		Command was not executed successfully
  * @ret s_PXENV_FILE_API_CHECK::Status	PXE status code
  * @ret s_PXENV_FILE_API_CHECK::Magic	Outbound magic number (0xe9c17b20)
- * @ret s_PXENV_FILE_API_CHECK::Provider "gPXE" (0x45585067)
+ * @ret s_PXENV_FILE_API_CHECK::Provider "iPXE" (0x45585067)
  * @ret s_PXENV_FILE_API_CHECK::APIMask API function bitmask
  * @ret s_PXENV_FILE_API_CHECK::Flags	Reserved
  *
@@ -264,7 +264,7 @@ PXENV_EXIT_t pxenv_file_api_check ( struct s_PXENV_FILE_API_CHECK *file_api_chec
 		file_api_check->Status   = PXENV_STATUS_SUCCESS;
 		file_api_check->Size     = sizeof(struct s_PXENV_FILE_API_CHECK);
 		file_api_check->Magic    = 0xe9c17b20;
-		file_api_check->Provider = 0x45585067; /* "gPXE" */
+		file_api_check->Provider = 0x45585067; /* "iPXE" */
 		file_api_check->APIMask  = 0x0000007f; /* Functions e0-e6 */
 		/* Check to see if we have a PXE exit hook */
 		if ( pxe_exit_hook.segment | pxe_exit_hook.offset )
diff --git a/src/arch/i386/interface/pxe/pxe_loader.c b/src/arch/i386/interface/pxe/pxe_loader.c
index b35caf7..63858be 100644
--- a/src/arch/i386/interface/pxe/pxe_loader.c
+++ b/src/arch/i386/interface/pxe/pxe_loader.c
@@ -18,7 +18,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/init.h>
+#include <ipxe/init.h>
 #include "pxe.h"
 #include "pxe_call.h"
 
diff --git a/src/arch/i386/interface/pxe/pxe_preboot.c b/src/arch/i386/interface/pxe/pxe_preboot.c
index 22be2e0..1d36fae 100644
--- a/src/arch/i386/interface/pxe/pxe_preboot.c
+++ b/src/arch/i386/interface/pxe/pxe_preboot.c
@@ -28,14 +28,14 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/dhcp.h>
-#include <gpxe/fakedhcp.h>
-#include <gpxe/device.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/isapnp.h>
-#include <gpxe/init.h>
-#include <gpxe/if_ether.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/dhcp.h>
+#include <ipxe/fakedhcp.h>
+#include <ipxe/device.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/isapnp.h>
+#include <ipxe/init.h>
+#include <ipxe/if_ether.h>
 #include <basemem_packet.h>
 #include <biosint.h>
 #include "pxe.h"
diff --git a/src/arch/i386/interface/pxe/pxe_tftp.c b/src/arch/i386/interface/pxe/pxe_tftp.c
index e0ec5f1..84f6527 100644
--- a/src/arch/i386/interface/pxe/pxe_tftp.c
+++ b/src/arch/i386/interface/pxe/pxe_tftp.c
@@ -28,12 +28,12 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdio.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/in.h>
-#include <gpxe/tftp.h>
-#include <gpxe/xfer.h>
-#include <gpxe/open.h>
-#include <gpxe/process.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/in.h>
+#include <ipxe/tftp.h>
+#include <ipxe/xfer.h>
+#include <ipxe/open.h>
+#include <ipxe/process.h>
 #include <pxe.h>
 
 /** A PXE TFTP connection */
diff --git a/src/arch/i386/interface/pxe/pxe_udp.c b/src/arch/i386/interface/pxe/pxe_udp.c
index f470220..cdc9d0a 100644
--- a/src/arch/i386/interface/pxe/pxe_udp.c
+++ b/src/arch/i386/interface/pxe/pxe_udp.c
@@ -6,10 +6,10 @@
 
 #include <string.h>
 #include <byteswap.h>
-#include <gpxe/xfer.h>
-#include <gpxe/udp.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/process.h>
+#include <ipxe/xfer.h>
+#include <ipxe/udp.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/process.h>
 #include <pxe.h>
 
 /*
diff --git a/src/arch/i386/interface/pxe/pxe_undi.c b/src/arch/i386/interface/pxe/pxe_undi.c
index a2b0b77..3ebee94 100644
--- a/src/arch/i386/interface/pxe/pxe_undi.c
+++ b/src/arch/i386/interface/pxe/pxe_undi.c
@@ -29,14 +29,14 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <byteswap.h>
 #include <basemem_packet.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/device.h>
-#include <gpxe/pci.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/ip.h>
-#include <gpxe/arp.h>
-#include <gpxe/rarp.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/device.h>
+#include <ipxe/pci.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/ip.h>
+#include <ipxe/arp.h>
+#include <ipxe/rarp.h>
 #include "pxe.h"
 
 /**
diff --git a/src/arch/i386/interface/pxeparent/pxeparent.c b/src/arch/i386/interface/pxeparent/pxeparent.c
index 582db5d..dd0bbc5 100644
--- a/src/arch/i386/interface/pxeparent/pxeparent.c
+++ b/src/arch/i386/interface/pxeparent/pxeparent.c
@@ -18,7 +18,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/dhcp.h>
+#include <ipxe/dhcp.h>
 #include <pxeparent.h>
 #include <pxe_api.h>
 #include <pxe_types.h>
diff --git a/src/arch/i386/interface/pxeparent/pxeparent_dhcp.c b/src/arch/i386/interface/pxeparent/pxeparent_dhcp.c
index 6605943..439ebda 100644
--- a/src/arch/i386/interface/pxeparent/pxeparent_dhcp.c
+++ b/src/arch/i386/interface/pxeparent/pxeparent_dhcp.c
@@ -19,8 +19,8 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <string.h>
-#include <gpxe/dhcp.h>
-#include <gpxe/netdevice.h>
+#include <ipxe/dhcp.h>
+#include <ipxe/netdevice.h>
 #include <undipreload.h>
 #include <pxeparent.h>
 #include <realmode.h>
diff --git a/src/arch/i386/interface/syslinux/com32_call.c b/src/arch/i386/interface/syslinux/com32_call.c
index d2c3f91..7a75837 100644
--- a/src/arch/i386/interface/syslinux/com32_call.c
+++ b/src/arch/i386/interface/syslinux/com32_call.c
@@ -27,7 +27,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <realmode.h>
 #include <comboot.h>
 #include <assert.h>
-#include <gpxe/uaccess.h>
+#include <ipxe/uaccess.h>
 
 static com32sys_t __bss16 ( com32_regs );
 #define com32_regs __use_data16 ( com32_regs )
diff --git a/src/arch/i386/interface/syslinux/com32_wrapper.S b/src/arch/i386/interface/syslinux/com32_wrapper.S
index 5c5bd13..0ac6ff2 100644
--- a/src/arch/i386/interface/syslinux/com32_wrapper.S
+++ b/src/arch/i386/interface/syslinux/com32_wrapper.S
@@ -82,7 +82,7 @@ com32_wrapper:
 
 	.data
 
-/* Internal gPXE virtual address space %esp */
+/* Internal iPXE virtual address space %esp */
 .globl com32_internal_esp
 .lcomm com32_internal_esp, 4
 
diff --git a/src/arch/i386/interface/syslinux/comboot_call.c b/src/arch/i386/interface/syslinux/comboot_call.c
index 51a1b6d..e5bf11c 100644
--- a/src/arch/i386/interface/syslinux/comboot_call.c
+++ b/src/arch/i386/interface/syslinux/comboot_call.c
@@ -33,21 +33,21 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <pxe_call.h>
 #include <setjmp.h>
 #include <string.h>
-#include <gpxe/posix_io.h>
-#include <gpxe/process.h>
-#include <gpxe/serial.h>
-#include <gpxe/init.h>
-#include <gpxe/image.h>
+#include <ipxe/posix_io.h>
+#include <ipxe/process.h>
+#include <ipxe/serial.h>
+#include <ipxe/init.h>
+#include <ipxe/image.h>
 #include <usr/imgmgmt.h>
 #include "config/console.h"
 #include "config/serial.h"
 
 /** The "SYSLINUX" version string */
-static char __data16_array ( syslinux_version, [] ) = "\r\ngPXE " VERSION;
+static char __data16_array ( syslinux_version, [] ) = "\r\niPXE " VERSION;
 #define syslinux_version __use_data16 ( syslinux_version )
 
 /** The "SYSLINUX" copyright string */
-static char __data16_array ( syslinux_copyright, [] ) = " http://etherboot.org";
+static char __data16_array ( syslinux_copyright, [] ) = " http://ipxe.org";
 #define syslinux_copyright __use_data16 ( syslinux_copyright )
 
 static char __data16_array ( syslinux_configuration_file, [] ) = "";
@@ -335,7 +335,7 @@ static __asmcall void int22 ( struct i386_all_regs *ix86 ) {
 		ix86->regs.cl = 0; /* minor */
 
 		/* SYSLINUX derivative ID */
-		ix86->regs.dl = BZI_LOADER_TYPE_GPXE;
+		ix86->regs.dl = BZI_LOADER_TYPE_IPXE;
 
 		/* SYSLINUX version and copyright strings */
 		ix86->segs.es = rm_ds;
@@ -396,7 +396,7 @@ static __asmcall void int22 ( struct i386_all_regs *ix86 ) {
 				break;
 			}
 
-			/* This relies on the fact that a gPXE POSIX fd will
+			/* This relies on the fact that a iPXE POSIX fd will
 			 * always fit in 16 bits.
 			 */
 #if (POSIX_FD_MAX > 65535)
@@ -453,9 +453,9 @@ static __asmcall void int22 ( struct i386_all_regs *ix86 ) {
 
 	case 0x000A: /* Get Derivative-Specific Information */
 
-		/* gPXE has its own derivative ID, so there is no defined
+		/* iPXE has its own derivative ID, so there is no defined
 		 * output here; just return AL for now */
-		ix86->regs.al = BZI_LOADER_TYPE_GPXE;
+		ix86->regs.al = BZI_LOADER_TYPE_IPXE;
 		ix86->flags &= ~CF;
 		break;
 
diff --git a/src/arch/i386/interface/syslinux/comboot_resolv.c b/src/arch/i386/interface/syslinux/comboot_resolv.c
index 30ac502..c505d96 100644
--- a/src/arch/i386/interface/syslinux/comboot_resolv.c
+++ b/src/arch/i386/interface/syslinux/comboot_resolv.c
@@ -1,9 +1,9 @@
 #include <errno.h>
 #include <comboot.h>
-#include <gpxe/in.h>
-#include <gpxe/list.h>
-#include <gpxe/process.h>
-#include <gpxe/resolv.h>
+#include <ipxe/in.h>
+#include <ipxe/list.h>
+#include <ipxe/process.h>
+#include <ipxe/resolv.h>
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
diff --git a/src/arch/i386/prefix/dskprefix.S b/src/arch/i386/prefix/dskprefix.S
index 60d351f..0f4b3ba 100644
--- a/src/arch/i386/prefix/dskprefix.S
+++ b/src/arch/i386/prefix/dskprefix.S
@@ -355,7 +355,7 @@ msg1end:
 	.word 0xAA55
 
 start_runtime:
-	/* Install gPXE */
+	/* Install iPXE */
 	call	install
 
 	/* Set up real-mode stack */
@@ -373,7 +373,7 @@ start_runtime:
 	call	prot_call
 	popl	%ecx /* discard */
 
-	/* Uninstall gPXE */
+	/* Uninstall iPXE */
 	call	uninstall
 
 	/* Boot next device */
diff --git a/src/arch/i386/prefix/hdprefix.S b/src/arch/i386/prefix/hdprefix.S
index 0576756..820bad3 100644
--- a/src/arch/i386/prefix/hdprefix.S
+++ b/src/arch/i386/prefix/hdprefix.S
@@ -78,13 +78,13 @@ load_length:
 load_failed:
 	movw	$10f, %si
 	jmp	boot_error
-10:	.asciz	"Could not load gPXE\r\n"
+10:	.asciz	"Could not load iPXE\r\n"
 
 	.org 510
 	.byte 0x55, 0xaa
 
 start_image:
-	/* Install gPXE */
+	/* Install iPXE */
 	call	install
 
 	/* Set up real-mode stack */
@@ -102,7 +102,7 @@ start_image:
 	call	prot_call
 	popl	%ecx /* discard */
 
-	/* Uninstall gPXE */
+	/* Uninstall iPXE */
 	call	uninstall
 
 	/* Boot next device */
diff --git a/src/arch/i386/prefix/lkrnprefix.S b/src/arch/i386/prefix/lkrnprefix.S
index 101d038..bbda336 100644
--- a/src/arch/i386/prefix/lkrnprefix.S
+++ b/src/arch/i386/prefix/lkrnprefix.S
@@ -178,20 +178,20 @@ setup_code:
 	 * in the prefix, it doesn't matter: we just have to ensure that
 	 * %cs:0000 is where the start of the image *would* be.
 	 */
-	ljmp	$(SYSSEG-(PREFIXSIZE/16)), $run_gpxe
+	ljmp	$(SYSSEG-(PREFIXSIZE/16)), $run_ipxe
 
 
 	.org	PREFIXSIZE
 /*
 	We're now at the beginning of the kernel proper.
  */
-run_gpxe:
+run_ipxe:
 	/* Set up stack just below 0x7c00 */
 	xorw	%ax, %ax
 	movw	%ax, %ss
 	movw	$0x7c00, %sp
 
-	/* Install gPXE */
+	/* Install iPXE */
 	call	install
 
 	/* Set up real-mode stack */
@@ -209,7 +209,7 @@ run_gpxe:
 	call	prot_call
 	popl	%ecx /* discard */
 
-	/* Uninstall gPXE */
+	/* Uninstall iPXE */
 	call	uninstall
 
 	/* Boot next device */
diff --git a/src/arch/i386/prefix/nbiprefix.S b/src/arch/i386/prefix/nbiprefix.S
index 607d80f..16d22de 100644
--- a/src/arch/i386/prefix/nbiprefix.S
+++ b/src/arch/i386/prefix/nbiprefix.S
@@ -50,7 +50,7 @@ memlen:	.long	-512
  *****************************************************************************
  */
 entry:
-	/* Install gPXE */
+	/* Install iPXE */
 	call	install
 
 	/* Jump to .text16 segment */
@@ -64,7 +64,7 @@ entry:
 	call	prot_call
 	popl	%ecx /* discard */
 
-	/* Uninstall gPXE */
+	/* Uninstall iPXE */
 	call	uninstall
 
 	/* Reboot system */
diff --git a/src/arch/i386/prefix/pxeprefix.S b/src/arch/i386/prefix/pxeprefix.S
index e728c48..1f5930a 100644
--- a/src/arch/i386/prefix/pxeprefix.S
+++ b/src/arch/i386/prefix/pxeprefix.S
@@ -441,7 +441,7 @@ print_free_basemem:
  *****************************************************************************
  */	
 finished:
-	jmp	run_gpxe
+	jmp	run_ipxe
 
 /*****************************************************************************
  * Subroutine: print segment:offset address
@@ -686,12 +686,12 @@ flags:
 	.equ undi_device_size, ( . - undi_device )
 
 /*****************************************************************************
- * Run gPXE main code
+ * Run iPXE main code
  *****************************************************************************
  */
 	.section ".prefix"
-run_gpxe:
-	/* Install gPXE */
+run_ipxe:
+	/* Install iPXE */
 	call	install
 
 	/* Set up real-mode stack */
@@ -731,7 +731,7 @@ run_gpxe:
 	call	prot_call
 	popl	%ecx /* discard */
 
-	/* Uninstall gPXE */
+	/* Uninstall iPXE */
 	call	uninstall
 
 	/* Restore PXE stack */
diff --git a/src/arch/i386/prefix/romprefix.S b/src/arch/i386/prefix/romprefix.S
index 02e5497..5ea53aa 100644
--- a/src/arch/i386/prefix/romprefix.S
+++ b/src/arch/i386/prefix/romprefix.S
@@ -130,7 +130,7 @@ pnpheader:
 
 /* Manufacturer string */
 mfgstr:
-	.asciz	"http://etherboot.org"
+	.asciz	"http://ipxe.org"
 	.size mfgstr, . - mfgstr
 
 /* Product string
@@ -477,7 +477,7 @@ no_pmm:
 	call	print_message
 	popf
 	jnz	out
-	/* Ctrl-B was pressed: invoke gPXE.  The keypress will be
+	/* Ctrl-B was pressed: invoke iPXE.  The keypress will be
 	 * picked up by the initial shell prompt, and we will drop
 	 * into a shell.
 	 */
@@ -503,7 +503,7 @@ out:
  * strings PRODUCT_NAME and PRODUCT_SHORT_NAME in config/general.h.
  *
  * While nothing in the GPL prevents you from removing all references
- * to gPXE or http://etherboot.org, we prefer you not to do so.
+ * to iPXE or http://ipxe.org, we prefer you not to do so.
  *
  * If you have an OEM-mandated branding requirement that cannot be
  * satisfied simply by defining PRODUCT_NAME and PRODUCT_SHORT_NAME,
@@ -516,7 +516,7 @@ init_message:
 	.ascii	"\n"
 	.ascii	PRODUCT_NAME
 	.ascii	"\n"
-	.asciz	"gPXE (http://etherboot.org) - "
+	.asciz	"iPXE (http://ipxe.org) - "
 	.size	init_message, . - init_message
 init_message_pci:
 	.asciz	" PCI"
@@ -913,7 +913,7 @@ int19_entry:
 	call	print_message
 	popf
 	jz	1f
-	/* Leave keypress in buffer and start gPXE.  The keypress will
+	/* Leave keypress in buffer and start iPXE.  The keypress will
 	 * cause the usual initial Ctrl-B prompt to be skipped.
 	 */
 	pushw	%cs
@@ -972,7 +972,7 @@ exec:	/* Set %ds = %cs */
 	movw	%ax, %ss
 	movw	$0x7c00, %sp
 
-	/* Install gPXE */
+	/* Install iPXE */
 	movl	image_source, %esi
 	movl	decompress_to, %edi
 	call	alloc_basemem
@@ -993,7 +993,7 @@ exec:	/* Set %ds = %cs */
 	call	prot_call
 	popl	%ecx /* discard */
 
-	/* Uninstall gPXE */
+	/* Uninstall iPXE */
 	call	uninstall
 
 	/* Restore BIOS stack */
diff --git a/src/arch/x86/core/pcidirect.c b/src/arch/x86/core/pcidirect.c
index 2c61d9c..38e056d 100644
--- a/src/arch/x86/core/pcidirect.c
+++ b/src/arch/x86/core/pcidirect.c
@@ -18,8 +18,8 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/io.h>
-#include <gpxe/pci.h>
+#include <ipxe/io.h>
+#include <ipxe/pci.h>
 
 /** @file
  *
diff --git a/src/arch/x86/include/bits/pci_io.h b/src/arch/x86/include/bits/pci_io.h
index f6efcda..01b1232 100644
--- a/src/arch/x86/include/bits/pci_io.h
+++ b/src/arch/x86/include/bits/pci_io.h
@@ -9,7 +9,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/pcibios.h>
-#include <gpxe/pcidirect.h>
+#include <ipxe/pcibios.h>
+#include <ipxe/pcidirect.h>
 
 #endif /* _BITS_PCI_IO_H */
diff --git a/src/arch/x86/include/gpxe/efi/efix86_nap.h b/src/arch/x86/include/ipxe/efi/efix86_nap.h
index 833c922..e85a272 100644
--- a/src/arch/x86/include/gpxe/efi/efix86_nap.h
+++ b/src/arch/x86/include/ipxe/efi/efix86_nap.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_EFIX86_NAP_H
-#define _GPXE_EFIX86_NAP_H
+#ifndef _IPXE_EFIX86_NAP_H
+#define _IPXE_EFIX86_NAP_H
 
 /** @file
  *
@@ -15,4 +15,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define NAP_PREFIX_efix86 __efix86_
 #endif
 
-#endif /* _GPXE_EFIX86_NAP_H */
+#endif /* _IPXE_EFIX86_NAP_H */
diff --git a/src/arch/x86/include/gpxe/pcibios.h b/src/arch/x86/include/ipxe/pcibios.h
index 93a6eb8..36af7fc 100644
--- a/src/arch/x86/include/gpxe/pcibios.h
+++ b/src/arch/x86/include/ipxe/pcibios.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_PCIBIOS_H
-#define _GPXE_PCIBIOS_H
+#ifndef _IPXE_PCIBIOS_H
+#define _IPXE_PCIBIOS_H
 
 #include <stdint.h>
 
@@ -132,4 +132,4 @@ PCIAPI_INLINE ( pcbios, pci_write_config_dword ) ( struct pci_device *pci,
 	return pcibios_write ( pci, PCIBIOS_WRITE_CONFIG_DWORD | where, value);
 }
 
-#endif /* _GPXE_PCIBIOS_H */
+#endif /* _IPXE_PCIBIOS_H */
diff --git a/src/arch/x86/include/gpxe/pcidirect.h b/src/arch/x86/include/ipxe/pcidirect.h
index 8b705fb..4e933c4 100644
--- a/src/arch/x86/include/gpxe/pcidirect.h
+++ b/src/arch/x86/include/ipxe/pcidirect.h
@@ -4,7 +4,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 
 #ifdef PCIAPI_DIRECT
 #define PCIAPI_PREFIX_direct
diff --git a/src/arch/x86/interface/efi/efix86_nap.c b/src/arch/x86/interface/efi/efix86_nap.c
index 89a4e3b..b6bee62 100644
--- a/src/arch/x86/interface/efi/efix86_nap.c
+++ b/src/arch/x86/interface/efi/efix86_nap.c
@@ -18,12 +18,12 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/nap.h>
-#include <gpxe/efi/efi.h>
+#include <ipxe/nap.h>
+#include <ipxe/efi/efi.h>
 
 /** @file
  *
- * gPXE CPU sleeping API for EFI
+ * iPXE CPU sleeping API for EFI
  *
  */
 
diff --git a/src/arch/x86/prefix/efidrvprefix.c b/src/arch/x86/prefix/efidrvprefix.c
index 36d5650..1de08a3 100644
--- a/src/arch/x86/prefix/efidrvprefix.c
+++ b/src/arch/x86/prefix/efidrvprefix.c
@@ -19,8 +19,8 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdlib.h>
-#include <gpxe/init.h>
-#include <gpxe/efi/efi.h>
+#include <ipxe/init.h>
+#include <ipxe/efi/efi.h>
 
 /**
  * EFI entry point
@@ -37,7 +37,7 @@ EFI_STATUS EFIAPI _start ( EFI_HANDLE image_handle,
 	if ( ( efirc = efi_init ( image_handle, systab ) ) != 0 )
 		return efirc;
 
-	/* Initialise gPXE environment */
+	/* Initialise iPXE environment */
 	initialise();
 	startup();
 
diff --git a/src/arch/x86/prefix/efiprefix.c b/src/arch/x86/prefix/efiprefix.c
index 4cc9e04..61a9fc6 100644
--- a/src/arch/x86/prefix/efiprefix.c
+++ b/src/arch/x86/prefix/efiprefix.c
@@ -19,7 +19,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdlib.h>
-#include <gpxe/efi/efi.h>
+#include <ipxe/efi/efi.h>
 
 /**
  * EFI entry point
diff --git a/src/arch/x86_64/include/bits/nap.h b/src/arch/x86_64/include/bits/nap.h
index 0a0c8a2..8b42c0a 100644
--- a/src/arch/x86_64/include/bits/nap.h
+++ b/src/arch/x86_64/include/bits/nap.h
@@ -7,6 +7,6 @@
  *
  */
 
-#include <gpxe/efi/efix86_nap.h>
+#include <ipxe/efi/efix86_nap.h>
 
 #endif /* _BITS_MAP_H */
diff --git a/src/config/config.c b/src/config/config.c
index a6e7622..98be65d 100644
--- a/src/config/config.c
+++ b/src/config/config.c
@@ -16,7 +16,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
  *
  * This file contains macros that pull various objects into the link
  * based on definitions in configuration header files. Ideally it
- * should be the only place in gPXE where one might need to use #ifdef
+ * should be the only place in iPXE where one might need to use #ifdef
  * for compile-time options.
  *
  * In the fairly common case where an object should only be considered
@@ -25,7 +25,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
  * <tt>config_<i>subsystem</i>.c</tt>, where @e subsystem is the
  * object basename of the main source file for that subsystem. The
  * build system will pull in that file if @c subsystem.c is included
- * in the final gPXE executable built.
+ * in the final iPXE executable built.
  */
 
 /*
diff --git a/src/config/defaults/pcbios.h b/src/config/defaults/pcbios.h
index c09105c..ec9a002 100644
--- a/src/config/defaults/pcbios.h
+++ b/src/config/defaults/pcbios.h
@@ -21,11 +21,11 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define	IMAGE_ELF		/* ELF image support */
 #define	IMAGE_MULTIBOOT		/* MultiBoot image support */
 #define	IMAGE_PXE		/* PXE image support */
-#define IMAGE_SCRIPT		/* gPXE script image support */
+#define IMAGE_SCRIPT		/* iPXE script image support */
 #define IMAGE_BZIMAGE		/* Linux bzImage image support */
 #define IMAGE_COMBOOT		/* SYSLINUX COMBOOT image support */
 
-#define PXE_STACK		/* PXE stack in gPXE - required for PXELINUX */
+#define PXE_STACK		/* PXE stack in iPXE - required for PXELINUX */
 #define PXE_MENU		/* PXE menu booting */
 #define	PXE_CMD			/* PXE commands */
 
diff --git a/src/config/general.h b/src/config/general.h
index bfab5b6..c9bf726 100644
--- a/src/config/general.h
+++ b/src/config/general.h
@@ -14,18 +14,18 @@ FILE_LICENCE ( GPL2_OR_LATER );
 /*
  * Branding
  *
- * Vendors may use these strings to add their own branding to gPXE.
- * PRODUCT_NAME is displayed prior to any gPXE branding in startup
+ * Vendors may use these strings to add their own branding to iPXE.
+ * PRODUCT_NAME is displayed prior to any iPXE branding in startup
  * messages, and PRODUCT_SHORT_NAME is used where a brief product
  * label is required (e.g. in BIOS boot selection menus).
  *
  * To minimise end-user confusion, it's probably a good idea to either
  * make PRODUCT_SHORT_NAME a substring of PRODUCT_NAME or leave it as
- * "gPXE".
+ * "iPXE".
  *
  */
 #define PRODUCT_NAME ""
-#define PRODUCT_SHORT_NAME "gPXE"
+#define PRODUCT_SHORT_NAME "iPXE"
 
 /*
  * Timer configuration
@@ -45,7 +45,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
  * PXE support
  *
  */
-//#undef	PXE_STACK		/* PXE stack in gPXE - you want this! */
+//#undef	PXE_STACK		/* PXE stack in iPXE - you want this! */
 //#undef	PXE_MENU		/* PXE menu booting */
 
 /*
@@ -98,7 +98,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 //#define	IMAGE_AOUT		/* a.out image support */
 //#define	IMAGE_WINCE		/* WinCE image support */
 //#define	IMAGE_PXE		/* PXE image support */
-//#define	IMAGE_SCRIPT		/* gPXE script image support */
+//#define	IMAGE_SCRIPT		/* iPXE script image support */
 //#define	IMAGE_BZIMAGE		/* Linux bzImage image support */
 //#define	IMAGE_COMBOOT		/* SYSLINUX COMBOOT image support */
 //#define	IMAGE_EFI		/* EFI image support */
diff --git a/src/core/acpi.c b/src/core/acpi.c
index b65f4d4..d573d2e 100644
--- a/src/core/acpi.c
+++ b/src/core/acpi.c
@@ -18,7 +18,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/acpi.h>
+#include <ipxe/acpi.h>
 
 /** @file
  *
diff --git a/src/core/ansiesc.c b/src/core/ansiesc.c
index 31306e2..05bbb86 100644
--- a/src/core/ansiesc.c
+++ b/src/core/ansiesc.c
@@ -20,7 +20,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <string.h>
 #include <assert.h>
-#include <gpxe/ansiesc.h>
+#include <ipxe/ansiesc.h>
 
 /** @file
  *
diff --git a/src/core/base64.c b/src/core/base64.c
index 5619ef7..01bf46e 100644
--- a/src/core/base64.c
+++ b/src/core/base64.c
@@ -21,7 +21,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdint.h>
 #include <string.h>
 #include <assert.h>
-#include <gpxe/base64.h>
+#include <ipxe/base64.h>
 
 /** @file
  *
diff --git a/src/core/bitmap.c b/src/core/bitmap.c
index bbe9cba..76fcef6 100644
--- a/src/core/bitmap.c
+++ b/src/core/bitmap.c
@@ -19,7 +19,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <errno.h>
-#include <gpxe/bitmap.h>
+#include <ipxe/bitmap.h>
 
 /** @file
  *
diff --git a/src/core/btext.c b/src/core/btext.c
index 122d89f..994ebbf 100644
--- a/src/core/btext.c
+++ b/src/core/btext.c
@@ -10,8 +10,8 @@
  */
 
 #include "console.h"
-#include <gpxe/init.h>
-#include <gpxe/pci.h>
+#include <ipxe/init.h>
+#include <ipxe/pci.h>
 
 #undef __BIG_ENDIAN
 #if 0
diff --git a/src/core/console.c b/src/core/console.c
index e22d260..1d2aa5e 100644
--- a/src/core/console.c
+++ b/src/core/console.c
@@ -1,7 +1,7 @@
 #include "stddef.h"
 #include "console.h"
-#include <gpxe/process.h>
-#include <gpxe/nap.h>
+#include <ipxe/process.h>
+#include <ipxe/nap.h>
 
 /** @file */
 
diff --git a/src/core/cpio.c b/src/core/cpio.c
index b303fa3..5b7b3aa 100644
--- a/src/core/cpio.c
+++ b/src/core/cpio.c
@@ -26,7 +26,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdio.h>
 #include <string.h>
-#include <gpxe/cpio.h>
+#include <ipxe/cpio.h>
 
 /**
  * Set field within a CPIO header
diff --git a/src/core/cwuri.c b/src/core/cwuri.c
index 65e01b2..f649ba4 100644
--- a/src/core/cwuri.c
+++ b/src/core/cwuri.c
@@ -19,7 +19,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stddef.h>
-#include <gpxe/uri.h>
+#include <ipxe/uri.h>
 
 /** @file
  *
diff --git a/src/core/debug.c b/src/core/debug.c
index 8f92930..a08be9c 100644
--- a/src/core/debug.c
+++ b/src/core/debug.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <stdarg.h>
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <console.h>
 
 void pause ( void ) {
diff --git a/src/core/device.c b/src/core/device.c
index 96ccc9f..1a227fd 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -19,10 +19,10 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <string.h>
-#include <gpxe/list.h>
-#include <gpxe/tables.h>
-#include <gpxe/device.h>
-#include <gpxe/init.h>
+#include <ipxe/list.h>
+#include <ipxe/tables.h>
+#include <ipxe/device.h>
+#include <ipxe/init.h>
 
 /**
  * @file
diff --git a/src/core/downloader.c b/src/core/downloader.c
index 86c144d..9285efa 100644
--- a/src/core/downloader.c
+++ b/src/core/downloader.c
@@ -21,13 +21,13 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdlib.h>
 #include <stdarg.h>
 #include <errno.h>
-#include <gpxe/xfer.h>
-#include <gpxe/open.h>
-#include <gpxe/job.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/umalloc.h>
-#include <gpxe/image.h>
-#include <gpxe/downloader.h>
+#include <ipxe/xfer.h>
+#include <ipxe/open.h>
+#include <ipxe/job.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/umalloc.h>
+#include <ipxe/image.h>
+#include <ipxe/downloader.h>
 
 /** @file
  *
diff --git a/src/core/exec.c b/src/core/exec.c
index 6c16aa4..7e86632 100644
--- a/src/core/exec.c
+++ b/src/core/exec.c
@@ -27,9 +27,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <getopt.h>
 #include <errno.h>
 #include <assert.h>
-#include <gpxe/tables.h>
-#include <gpxe/command.h>
-#include <gpxe/settings.h>
+#include <ipxe/tables.h>
+#include <ipxe/command.h>
+#include <ipxe/settings.h>
 
 /** @file
  *
diff --git a/src/core/filter.c b/src/core/filter.c
index a8bee7d..94a5214 100644
--- a/src/core/filter.c
+++ b/src/core/filter.c
@@ -18,8 +18,8 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/xfer.h>
-#include <gpxe/filter.h>
+#include <ipxe/xfer.h>
+#include <ipxe/filter.h>
 
 /** @file
  *
diff --git a/src/core/fnrec.c b/src/core/fnrec.c
index c768c91..888a4a2 100644
--- a/src/core/fnrec.c
+++ b/src/core/fnrec.c
@@ -21,8 +21,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <gpxe/init.h>
-#include <gpxe/uaccess.h>
+#include <ipxe/init.h>
+#include <ipxe/uaccess.h>
 
 /** @file
  *
diff --git a/src/core/gdbserial.c b/src/core/gdbserial.c
index b0d5047..d372da9 100644
--- a/src/core/gdbserial.c
+++ b/src/core/gdbserial.c
@@ -17,9 +17,9 @@
  */
 
 #include <assert.h>
-#include <gpxe/serial.h>
-#include <gpxe/gdbstub.h>
-#include <gpxe/gdbserial.h>
+#include <ipxe/serial.h>
+#include <ipxe/gdbstub.h>
+#include <ipxe/gdbserial.h>
 
 struct gdb_transport serial_gdb_transport __gdb_transport;
 
diff --git a/src/core/gdbstub.c b/src/core/gdbstub.c
index c808395..2cae29f 100644
--- a/src/core/gdbstub.c
+++ b/src/core/gdbstub.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <byteswap.h>
-#include <gpxe/gdbstub.h>
+#include <ipxe/gdbstub.h>
 #include "gdbmach.h"
 
 enum {
diff --git a/src/core/gdbudp.c b/src/core/gdbudp.c
index 26feb38..287ec63 100644
--- a/src/core/gdbudp.c
+++ b/src/core/gdbudp.c
@@ -19,16 +19,16 @@
 #include <stdio.h>
 #include <string.h>
 #include <byteswap.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/in.h>
-#include <gpxe/if_arp.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/ip.h>
-#include <gpxe/udp.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/nap.h>
-#include <gpxe/gdbstub.h>
-#include <gpxe/gdbudp.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/in.h>
+#include <ipxe/if_arp.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/ip.h>
+#include <ipxe/udp.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/nap.h>
+#include <ipxe/gdbstub.h>
+#include <ipxe/gdbudp.h>
 
 /** @file
  *
diff --git a/src/core/getkey.c b/src/core/getkey.c
index dbd074c..b159656 100644
--- a/src/core/getkey.c
+++ b/src/core/getkey.c
@@ -20,9 +20,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <ctype.h>
 #include <console.h>
-#include <gpxe/process.h>
-#include <gpxe/keys.h>
-#include <gpxe/timer.h>
+#include <ipxe/process.h>
+#include <ipxe/keys.h>
+#include <ipxe/timer.h>
 
 /** @file
  *
diff --git a/src/core/hw.c b/src/core/hw.c
index 65604ee..f8dc6be 100644
--- a/src/core/hw.c
+++ b/src/core/hw.c
@@ -2,10 +2,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <gpxe/refcnt.h>
-#include <gpxe/process.h>
-#include <gpxe/xfer.h>
-#include <gpxe/open.h>
+#include <ipxe/refcnt.h>
+#include <ipxe/process.h>
+#include <ipxe/xfer.h>
+#include <ipxe/open.h>
 
 /** @file
  *
diff --git a/src/core/image.c b/src/core/image.c
index 24fe51a..c6ef71f 100644
--- a/src/core/image.c
+++ b/src/core/image.c
@@ -25,10 +25,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <errno.h>
 #include <assert.h>
 #include <libgen.h>
-#include <gpxe/list.h>
-#include <gpxe/umalloc.h>
-#include <gpxe/uri.h>
-#include <gpxe/image.h>
+#include <ipxe/list.h>
+#include <ipxe/umalloc.h>
+#include <ipxe/uri.h>
+#include <ipxe/image.h>
 
 /** @file
  *
diff --git a/src/core/init.c b/src/core/init.c
index cd0f6dc..4dc706f 100644
--- a/src/core/init.c
+++ b/src/core/init.c
@@ -18,8 +18,8 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/device.h>
-#include <gpxe/init.h>
+#include <ipxe/device.h>
+#include <ipxe/init.h>
 
 /** @file
  *
@@ -31,7 +31,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 static int started = 0;
 
 /**
- * Initialise gPXE
+ * Initialise iPXE
  *
  * This function performs the one-time-only and irreversible
  * initialisation steps, such as initialising the heap.  It must be
@@ -49,7 +49,7 @@ void initialise ( void ) {
 }
 
 /**
- * Start up gPXE
+ * Start up iPXE
  *
  * This function performs the repeatable initialisation steps, such as
  * probing devices.  You may call startup() and shutdown() multiple
@@ -71,11 +71,11 @@ void startup ( void ) {
 }
 
 /**
- * Shut down gPXE
+ * Shut down iPXE
  *
  * @v flags		Shutdown behaviour flags
  *
- * This function reverses the actions of startup(), and leaves gPXE in
+ * This function reverses the actions of startup(), and leaves iPXE in
  * a state ready to be removed from memory.  You may call startup()
  * again after calling shutdown().
  *
diff --git a/src/core/interface.c b/src/core/interface.c
index 43d58ed..d1583a8 100644
--- a/src/core/interface.c
+++ b/src/core/interface.c
@@ -18,7 +18,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/interface.h>
+#include <ipxe/interface.h>
 
 /** @file
  *
diff --git a/src/core/iobuf.c b/src/core/iobuf.c
index 1ce7890..d776d60 100644
--- a/src/core/iobuf.c
+++ b/src/core/iobuf.c
@@ -20,8 +20,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
 #include <errno.h>
-#include <gpxe/malloc.h>
-#include <gpxe/iobuf.h>
+#include <ipxe/malloc.h>
+#include <ipxe/iobuf.h>
 
 /** @file
  *
diff --git a/src/core/job.c b/src/core/job.c
index 438064e..ffc0057 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -20,7 +20,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <string.h>
 #include <errno.h>
-#include <gpxe/job.h>
+#include <ipxe/job.h>
 
 /** @file
  *
diff --git a/src/core/linebuf.c b/src/core/linebuf.c
index 221f4e1..f152bcc 100644
--- a/src/core/linebuf.c
+++ b/src/core/linebuf.c
@@ -29,7 +29,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <gpxe/linebuf.h>
+#include <ipxe/linebuf.h>
 
 /**
  * Retrieve buffered-up line
diff --git a/src/core/main.c b/src/core/main.c
index d07d24c..ac81c28 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1,5 +1,5 @@
 /**************************************************************************
-gPXE -  Network Bootstrap Program
+iPXE -  Network Bootstrap Program
 
 Literature dealing with the network protocols:
 	ARP - RFC826
@@ -15,11 +15,11 @@ Literature dealing with the network protocols:
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdio.h>
-#include <gpxe/init.h>
-#include <gpxe/features.h>
-#include <gpxe/shell.h>
-#include <gpxe/shell_banner.h>
-#include <gpxe/image.h>
+#include <ipxe/init.h>
+#include <ipxe/features.h>
+#include <ipxe/shell.h>
+#include <ipxe/shell_banner.h>
+#include <ipxe/image.h>
 #include <usr/autoboot.h>
 #include <config/general.h>
 
@@ -46,17 +46,17 @@ __asmcall int main ( void ) {
 	 * Print welcome banner
 	 *
 	 *
-	 * If you wish to brand this build of gPXE, please do so by
+	 * If you wish to brand this build of iPXE, please do so by
 	 * defining the string PRODUCT_NAME in config/general.h.
 	 *
 	 * While nothing in the GPL prevents you from removing all
-	 * references to gPXE or http://etherboot.org, we prefer you
-	 * not to do so.
+	 * references to iPXE or http://ipxe.org, we prefer you not to
+	 * do so.
 	 *
 	 */
-	printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD "gPXE " VERSION
-		 NORMAL " -- Open Source Boot Firmware -- "
-		 CYAN "http://etherboot.org" NORMAL "\n"
+	printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD "iPXE " VERSION
+		 NORMAL " -- Open Source Network Boot Firmware -- "
+		 CYAN "http://ipxe.org" NORMAL "\n"
 		 "Features:" );
 	for_each_table_entry ( feature, FEATURES )
 		printf ( " %s", feature->name );
diff --git a/src/core/malloc.c b/src/core/malloc.c
index 8b0bc24..bf01b27 100644
--- a/src/core/malloc.c
+++ b/src/core/malloc.c
@@ -22,10 +22,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdint.h>
 #include <string.h>
 #include <strings.h>
-#include <gpxe/io.h>
-#include <gpxe/list.h>
-#include <gpxe/init.h>
-#include <gpxe/malloc.h>
+#include <ipxe/io.h>
+#include <ipxe/list.h>
+#include <ipxe/init.h>
+#include <ipxe/malloc.h>
 
 /** @file
  *
diff --git a/src/core/misc.c b/src/core/misc.c
index c19591b..7996935 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -7,8 +7,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdlib.h>
 #include <ctype.h>
 #include <byteswap.h>
-#include <gpxe/in.h>
-#include <gpxe/timer.h>
+#include <ipxe/in.h>
+#include <ipxe/timer.h>
 
 /**************************************************************************
 INET_ATON - Convert an ascii x.x.x.x to binary form
diff --git a/src/core/monojob.c b/src/core/monojob.c
index a24b559..cd25507 100644
--- a/src/core/monojob.c
+++ b/src/core/monojob.c
@@ -21,12 +21,12 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include <gpxe/process.h>
+#include <ipxe/process.h>
 #include <console.h>
-#include <gpxe/keys.h>
-#include <gpxe/job.h>
-#include <gpxe/monojob.h>
-#include <gpxe/timer.h>
+#include <ipxe/keys.h>
+#include <ipxe/job.h>
+#include <ipxe/monojob.h>
+#include <ipxe/timer.h>
 
 /** @file
  *
diff --git a/src/core/null_nap.c b/src/core/null_nap.c
index a3b01eb..c886f54 100644
--- a/src/core/null_nap.c
+++ b/src/core/null_nap.c
@@ -1,3 +1,3 @@
-#include <gpxe/nap.h>
+#include <ipxe/nap.h>
 
 PROVIDE_NAP_INLINE ( null, cpu_nap );
diff --git a/src/core/nvo.c b/src/core/nvo.c
index 3dbf51d..327f4f9 100644
--- a/src/core/nvo.c
+++ b/src/core/nvo.c
@@ -22,9 +22,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <gpxe/dhcp.h>
-#include <gpxe/nvs.h>
-#include <gpxe/nvo.h>
+#include <ipxe/dhcp.h>
+#include <ipxe/nvs.h>
+#include <ipxe/nvo.h>
 
 /** @file
  *
diff --git a/src/core/open.c b/src/core/open.c
index 70b427b..58edef5 100644
--- a/src/core/open.c
+++ b/src/core/open.c
@@ -21,10 +21,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdarg.h>
 #include <string.h>
 #include <errno.h>
-#include <gpxe/xfer.h>
-#include <gpxe/uri.h>
-#include <gpxe/socket.h>
-#include <gpxe/open.h>
+#include <ipxe/xfer.h>
+#include <ipxe/uri.h>
+#include <ipxe/socket.h>
+#include <ipxe/open.h>
 
 /** @file
  *
@@ -73,7 +73,7 @@ int xfer_open_uri ( struct xfer_interface *xfer, struct uri *uri ) {
  * Open URI string
  *
  * @v xfer		Data transfer interface
- * @v uri_string	URI string (e.g. "http://etherboot.org/kernel")
+ * @v uri_string	URI string (e.g. "http://ipxe.org/kernel")
  * @ret rc		Return status code
  *
  * The URI will be regarded as being relative to the current working
diff --git a/src/core/pc_kbd.c b/src/core/pc_kbd.c
index 799c8be..8c07a7f 100644
--- a/src/core/pc_kbd.c
+++ b/src/core/pc_kbd.c
@@ -10,7 +10,7 @@
  *		yhlu@tyan.com
  */
 
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include "console.h"
 
 static char key_map[][128] = {
diff --git a/src/core/pcmcia.c b/src/core/pcmcia.c
index 631971e..72d59b7 100644
--- a/src/core/pcmcia.c
+++ b/src/core/pcmcia.c
@@ -32,7 +32,7 @@
 #define	CODE_VERSION "0.1.3"
 #include <pcmcia-opts.h>
 #include <console.h>
-#include <gpxe/init.h>
+#include <ipxe/init.h>
 
 int	sockets; /* AHTODO: Phase this out! */
 u_int	pccsocks;
diff --git a/src/core/posix_io.c b/src/core/posix_io.c
index e6b1a0f..05077c8 100644
--- a/src/core/posix_io.c
+++ b/src/core/posix_io.c
@@ -21,11 +21,11 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <gpxe/list.h>
-#include <gpxe/xfer.h>
-#include <gpxe/open.h>
-#include <gpxe/process.h>
-#include <gpxe/posix_io.h>
+#include <ipxe/list.h>
+#include <ipxe/xfer.h>
+#include <ipxe/open.h>
+#include <ipxe/process.h>
+#include <ipxe/posix_io.h>
 
 /** @file
  *
@@ -33,7 +33,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
  *
  * These functions provide traditional blocking I/O semantics.  They
  * are designed to be used by the PXE TFTP API.  Because they block,
- * they may not be used by most other portions of the gPXE codebase.
+ * they may not be used by most other portions of the iPXE codebase.
  */
 
 /** An open file */
diff --git a/src/core/process.c b/src/core/process.c
index 9c13e02..940e3b8 100644
--- a/src/core/process.c
+++ b/src/core/process.c
@@ -18,9 +18,9 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/list.h>
-#include <gpxe/init.h>
-#include <gpxe/process.h>
+#include <ipxe/list.h>
+#include <ipxe/init.h>
+#include <ipxe/process.h>
 
 /** @file
  *
diff --git a/src/core/random.c b/src/core/random.c
index 6e7374e..8824dca 100644
--- a/src/core/random.c
+++ b/src/core/random.c
@@ -7,7 +7,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdlib.h>
-#include <gpxe/timer.h>
+#include <ipxe/timer.h>
 
 static int32_t rnd_seed = 0;
 
diff --git a/src/core/refcnt.c b/src/core/refcnt.c
index f2286ca..cd6ab96 100644
--- a/src/core/refcnt.c
+++ b/src/core/refcnt.c
@@ -19,7 +19,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdlib.h>
-#include <gpxe/refcnt.h>
+#include <ipxe/refcnt.h>
 
 /** @file
  *
diff --git a/src/core/resolv.c b/src/core/resolv.c
index 6f01f93..9c96b9f 100644
--- a/src/core/resolv.c
+++ b/src/core/resolv.c
@@ -22,11 +22,11 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <gpxe/in.h>
-#include <gpxe/xfer.h>
-#include <gpxe/open.h>
-#include <gpxe/process.h>
-#include <gpxe/resolv.h>
+#include <ipxe/in.h>
+#include <ipxe/xfer.h>
+#include <ipxe/open.h>
+#include <ipxe/process.h>
+#include <ipxe/resolv.h>
 
 /** @file
  *
diff --git a/src/core/serial.c b/src/core/serial.c
index d35e89e..a5551b1 100644
--- a/src/core/serial.c
+++ b/src/core/serial.c
@@ -14,10 +14,10 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include "stddef.h"
-#include <gpxe/init.h>
-#include <gpxe/io.h>
+#include <ipxe/init.h>
+#include <ipxe/io.h>
 #include <unistd.h>
-#include <gpxe/serial.h>
+#include <ipxe/serial.h>
 #include "config/serial.h"
 
 /* Set default values if none specified */
diff --git a/src/core/serial_console.c b/src/core/serial_console.c
index 0300482..70cf265 100644
--- a/src/core/serial_console.c
+++ b/src/core/serial_console.c
@@ -1,5 +1,5 @@
-#include <gpxe/init.h>
-#include <gpxe/serial.h>
+#include <ipxe/init.h>
+#include <ipxe/serial.h>
 #include "console.h"
 
 /** @file
diff --git a/src/core/settings.c b/src/core/settings.c
index 7d83101..427b9ed 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -26,12 +26,12 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <byteswap.h>
 #include <errno.h>
 #include <assert.h>
-#include <gpxe/in.h>
-#include <gpxe/vsprintf.h>
-#include <gpxe/dhcp.h>
-#include <gpxe/uuid.h>
-#include <gpxe/uri.h>
-#include <gpxe/settings.h>
+#include <ipxe/in.h>
+#include <ipxe/vsprintf.h>
+#include <ipxe/dhcp.h>
+#include <ipxe/uuid.h>
+#include <ipxe/uri.h>
+#include <ipxe/settings.h>
 
 /** @file
  *
diff --git a/src/core/uri.c b/src/core/uri.c
index 6a1f2e5..57502f2 100644
--- a/src/core/uri.c
+++ b/src/core/uri.c
@@ -29,8 +29,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <libgen.h>
 #include <ctype.h>
-#include <gpxe/vsprintf.h>
-#include <gpxe/uri.h>
+#include <ipxe/vsprintf.h>
+#include <ipxe/uri.h>
 
 /**
  * Dump URI for debugging
@@ -356,9 +356,9 @@ char * resolve_path ( const char *base_path,
  * @v relative_uri	Relative URI
  * @ret resolved_uri	Resolved URI
  *
- * Takes a base URI (e.g. "http://etherboot.org/kernels/vmlinuz" and a
+ * Takes a base URI (e.g. "http://ipxe.org/kernels/vmlinuz" and a
  * relative URI (e.g. "../initrds/initrd.gz") and produces a new URI
- * (e.g. "http://etherboot.org/initrds/initrd.gz").
+ * (e.g. "http://ipxe.org/initrds/initrd.gz").
  */
 struct uri * resolve_uri ( struct uri *base_uri,
 			   struct uri *relative_uri ) {
diff --git a/src/core/uuid.c b/src/core/uuid.c
index 2b67d55..d98553f 100644
--- a/src/core/uuid.c
+++ b/src/core/uuid.c
@@ -21,7 +21,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdint.h>
 #include <stdio.h>
 #include <byteswap.h>
-#include <gpxe/uuid.h>
+#include <ipxe/uuid.h>
 
 /** @file
  *
diff --git a/src/core/vsprintf.c b/src/core/vsprintf.c
index 21ab242..3ed4bd3 100644
--- a/src/core/vsprintf.c
+++ b/src/core/vsprintf.c
@@ -23,7 +23,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdio.h>
 #include <console.h>
 #include <errno.h>
-#include <gpxe/vsprintf.h>
+#include <ipxe/vsprintf.h>
 
 /** @file */
 
diff --git a/src/core/xfer.c b/src/core/xfer.c
index 1ec6f9d..8dbfef6 100644
--- a/src/core/xfer.c
+++ b/src/core/xfer.c
@@ -21,7 +21,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include <gpxe/xfer.h>
+#include <ipxe/xfer.h>
 
 /** @file
  *
diff --git a/src/crypto/aes_wrap.c b/src/crypto/aes_wrap.c
index d7f94af..46ef016 100644
--- a/src/crypto/aes_wrap.c
+++ b/src/crypto/aes_wrap.c
@@ -20,8 +20,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdlib.h>
 #include <string.h>
-#include <gpxe/crypto.h>
-#include <gpxe/aes.h>
+#include <ipxe/crypto.h>
+#include <ipxe/aes.h>
 
 /**
  * Wrap a key or other data using AES Key Wrap (RFC 3394)
diff --git a/src/crypto/arc4.c b/src/crypto/arc4.c
index e58fba7..ab3325c 100644
--- a/src/crypto/arc4.c
+++ b/src/crypto/arc4.c
@@ -20,8 +20,8 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/crypto.h>
-#include <gpxe/arc4.h>
+#include <ipxe/crypto.h>
+#include <ipxe/arc4.h>
 
 #define SWAP( ary, i, j )	\
 	({ u8 temp = ary[i]; ary[i] = ary[j]; ary[j] = temp; })
diff --git a/src/crypto/asn1.c b/src/crypto/asn1.c
index 154a8a8..a54d31d 100644
--- a/src/crypto/asn1.c
+++ b/src/crypto/asn1.c
@@ -21,7 +21,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdint.h>
 #include <stddef.h>
 #include <errno.h>
-#include <gpxe/asn1.h>
+#include <ipxe/asn1.h>
 
 /** @file
  *
diff --git a/src/crypto/axtls_aes.c b/src/crypto/axtls_aes.c
index 8bd3758..b73a572 100644
--- a/src/crypto/axtls_aes.c
+++ b/src/crypto/axtls_aes.c
@@ -21,9 +21,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/crypto.h>
-#include <gpxe/cbc.h>
-#include <gpxe/aes.h>
+#include <ipxe/crypto.h>
+#include <ipxe/cbc.h>
+#include <ipxe/aes.h>
 #include "crypto/axtls/crypto.h"
 
 /** @file
diff --git a/src/crypto/axtls_sha1.c b/src/crypto/axtls_sha1.c
index 841e193..3eb8912 100644
--- a/src/crypto/axtls_sha1.c
+++ b/src/crypto/axtls_sha1.c
@@ -1,6 +1,6 @@
 #include "crypto/axtls/crypto.h"
-#include <gpxe/crypto.h>
-#include <gpxe/sha1.h>
+#include <ipxe/crypto.h>
+#include <ipxe/sha1.h>
 
 static void sha1_init ( void *ctx ) {
 	SHA1Init ( ctx );
diff --git a/src/crypto/cbc.c b/src/crypto/cbc.c
index 1710203..c00ebb0 100644
--- a/src/crypto/cbc.c
+++ b/src/crypto/cbc.c
@@ -20,8 +20,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <string.h>
 #include <assert.h>
-#include <gpxe/crypto.h>
-#include <gpxe/cbc.h>
+#include <ipxe/crypto.h>
+#include <ipxe/cbc.h>
 
 /** @file
  *
diff --git a/src/crypto/chap.c b/src/crypto/chap.c
index 8aa224c..492d221 100644
--- a/src/crypto/chap.c
+++ b/src/crypto/chap.c
@@ -23,8 +23,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
-#include <gpxe/crypto.h>
-#include <gpxe/chap.h>
+#include <ipxe/crypto.h>
+#include <ipxe/chap.h>
 
 /** @file
  *
diff --git a/src/crypto/crandom.c b/src/crypto/crandom.c
index 9828482..1886f9b 100644
--- a/src/crypto/crandom.c
+++ b/src/crypto/crandom.c
@@ -26,7 +26,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
  * uses random().
  */
 
-#include <gpxe/crypto.h>
+#include <ipxe/crypto.h>
 #include <stdlib.h>
 
 /**
diff --git a/src/crypto/crc32.c b/src/crypto/crc32.c
index 0cc314e..71ec1d6 100644
--- a/src/crypto/crc32.c
+++ b/src/crypto/crc32.c
@@ -20,7 +20,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/crc32.h>
+#include <ipxe/crc32.h>
 
 #define CRCPOLY		0xedb88320
 
diff --git a/src/crypto/crypto_null.c b/src/crypto/crypto_null.c
index 61efb34..c9c32ae 100644
--- a/src/crypto/crypto_null.c
+++ b/src/crypto/crypto_null.c
@@ -25,7 +25,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
  */
 
 #include <string.h>
-#include <gpxe/crypto.h>
+#include <ipxe/crypto.h>
 
 static void digest_null_init ( void *ctx __unused ) {
 	/* Do nothing */
diff --git a/src/crypto/hmac.c b/src/crypto/hmac.c
index d64730c..6b61dc4 100644
--- a/src/crypto/hmac.c
+++ b/src/crypto/hmac.c
@@ -26,8 +26,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <string.h>
 #include <assert.h>
-#include <gpxe/crypto.h>
-#include <gpxe/hmac.h>
+#include <ipxe/crypto.h>
+#include <ipxe/hmac.h>
 
 /**
  * Reduce HMAC key length
diff --git a/src/crypto/md5.c b/src/crypto/md5.c
index 8c60639..ef322ad 100644
--- a/src/crypto/md5.c
+++ b/src/crypto/md5.c
@@ -25,8 +25,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdint.h>
 #include <string.h>
 #include <byteswap.h>
-#include <gpxe/crypto.h>
-#include <gpxe/md5.h>
+#include <ipxe/crypto.h>
+#include <ipxe/md5.h>
 
 struct md5_step {
 	u32 ( * f ) ( u32 b, u32 c, u32 d );
diff --git a/src/crypto/sha1extra.c b/src/crypto/sha1extra.c
index c144a0f..74445e9 100644
--- a/src/crypto/sha1extra.c
+++ b/src/crypto/sha1extra.c
@@ -18,9 +18,9 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/crypto.h>
-#include <gpxe/sha1.h>
-#include <gpxe/hmac.h>
+#include <ipxe/crypto.h>
+#include <ipxe/sha1.h>
+#include <ipxe/hmac.h>
 #include <stdint.h>
 #include <byteswap.h>
 
diff --git a/src/crypto/x509.c b/src/crypto/x509.c
index 31ed412..49bc2b8 100644
--- a/src/crypto/x509.c
+++ b/src/crypto/x509.c
@@ -21,8 +21,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <gpxe/asn1.h>
-#include <gpxe/x509.h>
+#include <ipxe/asn1.h>
+#include <ipxe/x509.h>
 
 /** @file
  *
diff --git a/src/doc/pxe_extensions b/src/doc/pxe_extensions
index 8ff14a9..2411486 100644
--- a/src/doc/pxe_extensions
+++ b/src/doc/pxe_extensions
@@ -208,7 +208,7 @@ Output:		PXENV_EXIT_SUCCESS or PXENV_EXIT_FAILURE must be
 		structure must be set to one of the values represented
 		by the PXENV_STATUS_xxx constants.
 
-Description:	Execute a gPXE command.
+Description:	Execute a iPXE command.
 
 typedef struct s_PXENV_FILE_EXEC {
         PXENV_STATUS_t Status;
@@ -271,7 +271,7 @@ Returned from API service:
 
 Size:		Set to the number of bytes filled in (20).
 Magic:		Set to 0xe9c17b20.
-Provider:	Set to 0x45585067 ("gPXE").  Another implementation of this
+Provider:	Set to 0x45585067 ("iPXE").  Another implementation of this
 		API can use another value, e.g. to indicate a different
 		command set supported by FILE EXEC.
 APIMask:	Bitmask of supported API functions (one bit for each function
diff --git a/src/doxygen.cfg b/src/doxygen.cfg
index 0ee87ad..f53c027 100644
--- a/src/doxygen.cfg
+++ b/src/doxygen.cfg
@@ -25,7 +25,7 @@ DOXYFILE_ENCODING      = UTF-8
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = gPXE
+PROJECT_NAME           = iPXE
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. 
 # This could be handy for archiving the generated documentation or 
diff --git a/src/drivers/bitbash/bitbash.c b/src/drivers/bitbash/bitbash.c
index 3e558d5..ac91407 100644
--- a/src/drivers/bitbash/bitbash.c
+++ b/src/drivers/bitbash/bitbash.c
@@ -18,7 +18,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/bitbash.h>
+#include <ipxe/bitbash.h>
 
 /** @file
  *
diff --git a/src/drivers/bitbash/i2c_bit.c b/src/drivers/bitbash/i2c_bit.c
index 1319727..ccf82db 100644
--- a/src/drivers/bitbash/i2c_bit.c
+++ b/src/drivers/bitbash/i2c_bit.c
@@ -24,8 +24,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <assert.h>
 #include <unistd.h>
-#include <gpxe/bitbash.h>
-#include <gpxe/i2c.h>
+#include <ipxe/bitbash.h>
+#include <ipxe/i2c.h>
 
 /** @file
  *
diff --git a/src/drivers/bitbash/spi_bit.c b/src/drivers/bitbash/spi_bit.c
index 8e70393..f165e01 100644
--- a/src/drivers/bitbash/spi_bit.c
+++ b/src/drivers/bitbash/spi_bit.c
@@ -25,8 +25,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <errno.h>
 #include <assert.h>
 #include <unistd.h>
-#include <gpxe/bitbash.h>
-#include <gpxe/spi_bit.h>
+#include <ipxe/bitbash.h>
+#include <ipxe/spi_bit.h>
 
 /** @file
  *
diff --git a/src/drivers/block/ata.c b/src/drivers/block/ata.c
index dc851d7..c59e788 100644
--- a/src/drivers/block/ata.c
+++ b/src/drivers/block/ata.c
@@ -23,9 +23,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <assert.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/blockdev.h>
-#include <gpxe/process.h>
-#include <gpxe/ata.h>
+#include <ipxe/blockdev.h>
+#include <ipxe/process.h>
+#include <ipxe/ata.h>
 
 /** @file
  *
diff --git a/src/drivers/block/ramdisk.c b/src/drivers/block/ramdisk.c
index 4e6f1bc..55c0d2d 100644
--- a/src/drivers/block/ramdisk.c
+++ b/src/drivers/block/ramdisk.c
@@ -18,8 +18,8 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/blockdev.h>
-#include <gpxe/ramdisk.h>
+#include <ipxe/blockdev.h>
+#include <ipxe/ramdisk.h>
 
 /**
  * @file
diff --git a/src/drivers/block/scsi.c b/src/drivers/block/scsi.c
index a51b3af..94e283b 100644
--- a/src/drivers/block/scsi.c
+++ b/src/drivers/block/scsi.c
@@ -23,9 +23,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <byteswap.h>
 #include <errno.h>
-#include <gpxe/blockdev.h>
-#include <gpxe/process.h>
-#include <gpxe/scsi.h>
+#include <ipxe/blockdev.h>
+#include <ipxe/process.h>
+#include <ipxe/scsi.h>
 
 /** @file
  *
diff --git a/src/drivers/block/srp.c b/src/drivers/block/srp.c
index 1d0799a..d90401e 100644
--- a/src/drivers/block/srp.c
+++ b/src/drivers/block/srp.c
@@ -33,11 +33,11 @@ FILE_LICENCE ( BSD2 );
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <gpxe/scsi.h>
-#include <gpxe/xfer.h>
-#include <gpxe/features.h>
-#include <gpxe/ib_srp.h>
-#include <gpxe/srp.h>
+#include <ipxe/scsi.h>
+#include <ipxe/xfer.h>
+#include <ipxe/features.h>
+#include <ipxe/ib_srp.h>
+#include <ipxe/srp.h>
 
 /**
  * @file
diff --git a/src/drivers/bus/eisa.c b/src/drivers/bus/eisa.c
index b533364..22a6158 100644
--- a/src/drivers/bus/eisa.c
+++ b/src/drivers/bus/eisa.c
@@ -3,9 +3,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <unistd.h>
-#include <gpxe/eisa.h>
+#include <ipxe/eisa.h>
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
diff --git a/src/drivers/bus/isa.c b/src/drivers/bus/isa.c
index f458826..e40d382 100644
--- a/src/drivers/bus/isa.c
+++ b/src/drivers/bus/isa.c
@@ -3,8 +3,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
-#include <gpxe/io.h>
-#include <gpxe/isa.h>
+#include <ipxe/io.h>
+#include <ipxe/isa.h>
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
diff --git a/src/drivers/bus/isa_ids.c b/src/drivers/bus/isa_ids.c
index 7310158..e72b233 100644
--- a/src/drivers/bus/isa_ids.c
+++ b/src/drivers/bus/isa_ids.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <byteswap.h>
-#include <gpxe/isa_ids.h>
+#include <ipxe/isa_ids.h>
 
 /* 
  * EISA and ISAPnP IDs are actually mildly human readable, though in a
diff --git a/src/drivers/bus/isapnp.c b/src/drivers/bus/isapnp.c
index ccf6209..d8bfcd7 100644
--- a/src/drivers/bus/isapnp.c
+++ b/src/drivers/bus/isapnp.c
@@ -62,9 +62,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <unistd.h>
-#include <gpxe/isapnp.h>
+#include <ipxe/isapnp.h>
 
 /**
  * ISAPnP Read Port address.
diff --git a/src/drivers/bus/mca.c b/src/drivers/bus/mca.c
index 2815603..055b010 100644
--- a/src/drivers/bus/mca.c
+++ b/src/drivers/bus/mca.c
@@ -12,8 +12,8 @@ FILE_LICENCE ( BSD2 );
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
-#include <gpxe/io.h>
-#include <gpxe/mca.h>
+#include <ipxe/io.h>
+#include <ipxe/mca.h>
 
 static void mcabus_remove ( struct root_device *rootdev );
 
diff --git a/src/drivers/bus/pci.c b/src/drivers/bus/pci.c
index 8899e6e..17cee23 100644
--- a/src/drivers/bus/pci.c
+++ b/src/drivers/bus/pci.c
@@ -26,9 +26,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <gpxe/tables.h>
-#include <gpxe/device.h>
-#include <gpxe/pci.h>
+#include <ipxe/tables.h>
+#include <ipxe/device.h>
+#include <ipxe/pci.h>
 
 /** @file
  *
diff --git a/src/drivers/bus/pcibackup.c b/src/drivers/bus/pcibackup.c
index 8f9994e..6719c53 100644
--- a/src/drivers/bus/pcibackup.c
+++ b/src/drivers/bus/pcibackup.c
@@ -19,8 +19,8 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/pci.h>
-#include <gpxe/pcibackup.h>
+#include <ipxe/pci.h>
+#include <ipxe/pcibackup.h>
 
 /** @file
  *
diff --git a/src/drivers/bus/pciextra.c b/src/drivers/bus/pciextra.c
index 74c4099..c4417e0 100644
--- a/src/drivers/bus/pciextra.c
+++ b/src/drivers/bus/pciextra.c
@@ -1,7 +1,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/pci.h>
+#include <ipxe/pci.h>
 
 /**
  * Look for a PCI capability
diff --git a/src/drivers/bus/virtio-pci.c b/src/drivers/bus/virtio-pci.c
index 34acce2..fbef067 100644
--- a/src/drivers/bus/virtio-pci.c
+++ b/src/drivers/bus/virtio-pci.c
@@ -12,9 +12,9 @@
  */
 
 #include "etherboot.h"
-#include "gpxe/io.h"
-#include "gpxe/virtio-ring.h"
-#include "gpxe/virtio-pci.h"
+#include "ipxe/io.h"
+#include "ipxe/virtio-ring.h"
+#include "ipxe/virtio-pci.h"
 
 int vp_find_vq(unsigned int ioaddr, int queue_index,
                struct vring_virtqueue *vq)
diff --git a/src/drivers/bus/virtio-ring.c b/src/drivers/bus/virtio-ring.c
index 6415f62..00b1081 100644
--- a/src/drivers/bus/virtio-ring.c
+++ b/src/drivers/bus/virtio-ring.c
@@ -15,9 +15,9 @@
  */
 
 #include "etherboot.h"
-#include "gpxe/io.h"
-#include "gpxe/virtio-ring.h"
-#include "gpxe/virtio-pci.h"
+#include "ipxe/io.h"
+#include "ipxe/virtio-ring.h"
+#include "ipxe/virtio-pci.h"
 
 #define BUG() do { \
    printf("BUG: failure at %s:%d/%s()!\n", \
diff --git a/src/drivers/infiniband/arbel.c b/src/drivers/infiniband/arbel.c
index 5bf3574..5937c52 100644
--- a/src/drivers/infiniband/arbel.c
+++ b/src/drivers/infiniband/arbel.c
@@ -29,14 +29,14 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <unistd.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/io.h>
-#include <gpxe/pci.h>
-#include <gpxe/malloc.h>
-#include <gpxe/umalloc.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/infiniband.h>
-#include <gpxe/ib_smc.h>
+#include <ipxe/io.h>
+#include <ipxe/pci.h>
+#include <ipxe/malloc.h>
+#include <ipxe/umalloc.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/ib_smc.h>
 #include "arbel.h"
 
 /**
diff --git a/src/drivers/infiniband/arbel.h b/src/drivers/infiniband/arbel.h
index 87f5933..f748691 100644
--- a/src/drivers/infiniband/arbel.h
+++ b/src/drivers/infiniband/arbel.h
@@ -10,7 +10,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/uaccess.h>
+#include <ipxe/uaccess.h>
 #include "mlx_bitops.h"
 #include "MT25218_PRM.h"
 
@@ -232,7 +232,7 @@ union arbelprm_mad {
 } __attribute__ (( packed ));
 
 /*
- * gPXE-specific definitions
+ * iPXE-specific definitions
  *
  */
 
diff --git a/src/drivers/infiniband/hermon.c b/src/drivers/infiniband/hermon.c
index 777db0f..24fe9c4 100644
--- a/src/drivers/infiniband/hermon.c
+++ b/src/drivers/infiniband/hermon.c
@@ -27,15 +27,15 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <unistd.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/io.h>
-#include <gpxe/pci.h>
-#include <gpxe/pcibackup.h>
-#include <gpxe/malloc.h>
-#include <gpxe/umalloc.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/infiniband.h>
-#include <gpxe/ib_smc.h>
+#include <ipxe/io.h>
+#include <ipxe/pci.h>
+#include <ipxe/pcibackup.h>
+#include <ipxe/malloc.h>
+#include <ipxe/umalloc.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/ib_smc.h>
 #include "hermon.h"
 
 /**
diff --git a/src/drivers/infiniband/hermon.h b/src/drivers/infiniband/hermon.h
index c53f3da..d63ceac 100644
--- a/src/drivers/infiniband/hermon.h
+++ b/src/drivers/infiniband/hermon.h
@@ -10,8 +10,8 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/ib_packet.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/ib_packet.h>
 #include "mlx_bitops.h"
 #include "MT25408_PRM.h"
 
@@ -273,7 +273,7 @@ union hermonprm_mad {
 } __attribute__ (( packed ));
 
 /*
- * gPXE-specific definitions
+ * iPXE-specific definitions
  *
  */
 
diff --git a/src/drivers/infiniband/linda.c b/src/drivers/infiniband/linda.c
index b9a7ba5..83d473c 100644
--- a/src/drivers/infiniband/linda.c
+++ b/src/drivers/infiniband/linda.c
@@ -23,13 +23,13 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <errno.h>
 #include <unistd.h>
 #include <assert.h>
-#include <gpxe/io.h>
-#include <gpxe/pci.h>
-#include <gpxe/infiniband.h>
-#include <gpxe/i2c.h>
-#include <gpxe/bitbash.h>
-#include <gpxe/malloc.h>
-#include <gpxe/iobuf.h>
+#include <ipxe/io.h>
+#include <ipxe/pci.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/i2c.h>
+#include <ipxe/bitbash.h>
+#include <ipxe/malloc.h>
+#include <ipxe/iobuf.h>
 #include "linda.h"
 
 /**
diff --git a/src/drivers/infiniband/linda.h b/src/drivers/infiniband/linda.h
index 3068421..1450a6a 100644
--- a/src/drivers/infiniband/linda.h
+++ b/src/drivers/infiniband/linda.h
@@ -29,7 +29,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
  */
 
 #define BITOPS_LITTLE_ENDIAN
-#include <gpxe/bitops.h>
+#include <ipxe/bitops.h>
 #include "qib_7220_regs.h"
 
 struct ib_device;
diff --git a/src/drivers/net/3c509-eisa.c b/src/drivers/net/3c509-eisa.c
index d57c05b..bb13f48 100644
--- a/src/drivers/net/3c509-eisa.c
+++ b/src/drivers/net/3c509-eisa.c
@@ -4,8 +4,8 @@
  *
  */
 
-#include <gpxe/eisa.h>
-#include <gpxe/isa.h>
+#include <ipxe/eisa.h>
+#include <ipxe/isa.h>
 #include "console.h"
 #include "3c509.h"
 
diff --git a/src/drivers/net/3c509.c b/src/drivers/net/3c509.c
index 1c58f77..4326a83 100644
--- a/src/drivers/net/3c509.c
+++ b/src/drivers/net/3c509.c
@@ -10,10 +10,10 @@ FILE_LICENCE ( BSD2 );
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <unistd.h>
-#include <gpxe/device.h>
-#include <gpxe/isa.h>
+#include <ipxe/device.h>
+#include <ipxe/isa.h>
 #include "3c509.h"
 
 /*
diff --git a/src/drivers/net/3c515.c b/src/drivers/net/3c515.c
index eb9569f..2b86069 100644
--- a/src/drivers/net/3c515.c
+++ b/src/drivers/net/3c515.c
@@ -49,9 +49,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include "etherboot.h"
 /* to get the interface to the body of the program */
 #include "nic.h"
-#include <gpxe/isapnp.h>
-#include <gpxe/isa.h> /* for ISA_ROM */
-#include <gpxe/ethernet.h>
+#include <ipxe/isapnp.h>
+#include <ipxe/isa.h> /* for ISA_ROM */
+#include <ipxe/ethernet.h>
 
 static void t3c515_wait(unsigned int nticks)
 {
diff --git a/src/drivers/net/3c529.c b/src/drivers/net/3c529.c
index 4282464..d68f28e 100644
--- a/src/drivers/net/3c529.c
+++ b/src/drivers/net/3c529.c
@@ -6,8 +6,8 @@
 FILE_LICENCE ( BSD2 );
 
 #include "etherboot.h"
-#include <gpxe/mca.h>
-#include <gpxe/isa.h> /* for ISA_ROM */
+#include <ipxe/mca.h>
+#include <ipxe/isa.h> /* for ISA_ROM */
 #include "nic.h"
 #include "3c509.h"
 
diff --git a/src/drivers/net/3c595.c b/src/drivers/net/3c595.c
index 07c85d0..3178178 100644
--- a/src/drivers/net/3c595.c
+++ b/src/drivers/net/3c595.c
@@ -29,8 +29,8 @@ FILE_LICENCE ( BSD2 );
 
 #include "etherboot.h"
 #include "nic.h"
-#include <gpxe/pci.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/pci.h>
+#include <ipxe/ethernet.h>
 #include "3c595.h"
 
 static struct nic_operations t595_operations;
diff --git a/src/drivers/net/3c5x9.c b/src/drivers/net/3c5x9.c
index 87c9f29..4d9bc8d 100644
--- a/src/drivers/net/3c5x9.c
+++ b/src/drivers/net/3c5x9.c
@@ -26,10 +26,10 @@ FILE_LICENCE ( BSD2 );
 
 /* #define EDEBUG */
 
-#include <gpxe/ethernet.h>
+#include <ipxe/ethernet.h>
 #include "etherboot.h"
 #include "nic.h"
-#include <gpxe/isa.h>
+#include <ipxe/isa.h>
 #include "3c509.h"
 
 static enum { none, bnc, utp } connector = none;	/* for 3C509 */
diff --git a/src/drivers/net/3c90x.c b/src/drivers/net/3c90x.c
index 9c1879b..760d355 100644
--- a/src/drivers/net/3c90x.c
+++ b/src/drivers/net/3c90x.c
@@ -1,11 +1,11 @@
 /*
- * 3c90x.c -- This file implements a gPXE API 3c90x driver
+ * 3c90x.c -- This file implements a iPXE API 3c90x driver
  *
  * Originally written for etherboot by:
  *   Greg Beeley, Greg.Beeley@LightSys.org
  * Modified by Steve Smith,
  *   Steve.Smith@Juno.Com. Alignment bug fix Neil Newell (nn@icenoir.net).
- * Almost totally Rewritten to use gPXE API, implementation of tx/rx ring support
+ * Almost totally Rewritten to use iPXE API, implementation of tx/rx ring support
  *   by Thomas Miletich, thomas.miletich@gmail.com
  *   Thanks to Marty Connor and Stefan Hajnoczi for their help and feedback,
  *   and to Daniel Verkamp for his help with testing.
@@ -47,15 +47,15 @@ FILE_LICENCE ( BSD2 );
 #include <assert.h>
 #include <byteswap.h>
 #include <errno.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/io.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/malloc.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/pci.h>
-#include <gpxe/timer.h>
-#include <gpxe/nvs.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/io.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/malloc.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/pci.h>
+#include <ipxe/timer.h>
+#include <ipxe/nvs.h>
 
 #include "3c90x.h"
 
@@ -271,7 +271,7 @@ static int a3c90x_setup_tx_ring(struct INF_3C90X *p)
 
 /**
  * a3c90x_process_tx_packets - Checks for successfully sent packets,
- * reports them to gPXE with netdev_tx_complete();
+ * reports them to iPXE with netdev_tx_complete();
  *
  * @v netdev	Network device info
  */
@@ -513,7 +513,7 @@ static void a3c90x_free_rx_iobuf(struct INF_3C90X *p)
 
 /**
  * a3c90x_process_rx_packets - Checks for received packets,
- * reports them to gPXE with netdev_rx() or netdev_rx_err() if there was an
+ * reports them to iPXE with netdev_rx() or netdev_rx_err() if there was an
  * error while receiving the packet
  *
  * @v netdev	Network device info
@@ -608,7 +608,7 @@ static void a3c90x_free_resources(struct INF_3C90X *p)
 
 /**
  * a3c90x_remove - Routine to remove the card. Unregisters
- * the NIC from gPXE, disables RX/TX and resets the card.
+ * the NIC from iPXE, disables RX/TX and resets the card.
  *
  * @v pci	PCI device info
  */
diff --git a/src/drivers/net/3c90x.h b/src/drivers/net/3c90x.h
index acbb29d..0d36fba 100644
--- a/src/drivers/net/3c90x.h
+++ b/src/drivers/net/3c90x.h
@@ -3,7 +3,7 @@
  * by Greg Beeley, Greg.Beeley@LightSys.org.  Modified by Steve Smith,
  * Steve.Smith@Juno.Com. Alignment bug fix Neil Newell (nn@icenoir.net).
  *
- * Port from etherboot to gPXE API, implementation of tx/rx ring support
+ * Port from etherboot to iPXE API, implementation of tx/rx ring support
  * by Thomas Miletich, thomas.miletich@gmail.com
  * Thanks to Marty Connor and Stefan Hajnoczi for their help and feedback.
  *
diff --git a/src/drivers/net/amd8111e.c b/src/drivers/net/amd8111e.c
index 1b1fdc1..476d530 100644
--- a/src/drivers/net/amd8111e.c
+++ b/src/drivers/net/amd8111e.c
@@ -33,8 +33,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include "etherboot.h"
 #include "nic.h"
 #include "mii.h"
-#include <gpxe/pci.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/pci.h>
+#include <ipxe/ethernet.h>
 #include "string.h"
 #include "stdint.h"
 #include "amd8111e.h"
diff --git a/src/drivers/net/ath5k/ath5k.c b/src/drivers/net/ath5k/ath5k.c
index 37defce..8b2584f 100644
--- a/src/drivers/net/ath5k/ath5k.c
+++ b/src/drivers/net/ath5k/ath5k.c
@@ -5,7 +5,7 @@
  * Copyright (c) 2007 Jiri Slaby <jirislaby@gmail.com>
  * Copyright (c) 2007 Luis R. Rodriguez <mcgrof@winlab.rutgers.edu>
  *
- * Modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>
+ * Modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>
  * Original from Linux kernel 2.6.30.
  *
  * All rights reserved.
@@ -46,11 +46,11 @@
 FILE_LICENCE ( BSD3 );
 
 #include <stdlib.h>
-#include <gpxe/malloc.h>
-#include <gpxe/timer.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/pci.h>
-#include <gpxe/pci_io.h>
+#include <ipxe/malloc.h>
+#include <ipxe/timer.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/pci.h>
+#include <ipxe/pci_io.h>
 
 #include "base.h"
 #include "reg.h"
@@ -1239,7 +1239,7 @@ accept:
 		iob_put(iob, rs.rs_datalen);
 
 		/* The MAC header is padded to have 32-bit boundary if the
-		 * packet payload is non-zero. However, gPXE only
+		 * packet payload is non-zero. However, iPXE only
 		 * supports standard 802.11 packets with 24-byte
 		 * header, so no padding correction should be needed.
 		 */
@@ -1508,7 +1508,7 @@ ath5k_tx(struct net80211_device *dev, struct io_buffer *iob)
 
 	/*
 	 * The hardware expects the header padded to 4 byte boundaries.
-	 * gPXE only ever sends 24-byte headers, so no action necessary.
+	 * iPXE only ever sends 24-byte headers, so no action necessary.
 	 */
 
 	if (list_empty(&sc->txbuf)) {
diff --git a/src/drivers/net/ath5k/ath5k.h b/src/drivers/net/ath5k/ath5k.h
index e54433d..30e2024 100644
--- a/src/drivers/net/ath5k/ath5k.h
+++ b/src/drivers/net/ath5k/ath5k.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2007 Reyk Floeter <reyk@openbsd.org>
  * Copyright (c) 2006-2007 Nick Kossifidis <mickflemm@gmail.com>
  *
- * Modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>
+ * Modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>
  * Original from Linux kernel 2.6.30.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -25,9 +25,9 @@ FILE_LICENCE ( MIT );
 
 #include <stddef.h>
 #include <byteswap.h>
-#include <gpxe/io.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/net80211.h>
+#include <ipxe/io.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/net80211.h>
 #include <errno.h>
 
 /* Keep all ath5k files under one errfile ID */
diff --git a/src/drivers/net/ath5k/ath5k_attach.c b/src/drivers/net/ath5k/ath5k_attach.c
index 36dc243..302536d 100644
--- a/src/drivers/net/ath5k/ath5k_attach.c
+++ b/src/drivers/net/ath5k/ath5k_attach.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2008 Reyk Floeter <reyk@openbsd.org>
  * Copyright (c) 2006-2008 Nick Kossifidis <mickflemm@gmail.com>
  *
- * Modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>
+ * Modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>
  * Original from Linux kernel 2.6.30.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -25,7 +25,7 @@ FILE_LICENCE ( MIT );
 * Attach/Detach Functions and helpers *
 \*************************************/
 
-#include <gpxe/pci.h>
+#include <ipxe/pci.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include "ath5k.h"
diff --git a/src/drivers/net/ath5k/ath5k_caps.c b/src/drivers/net/ath5k/ath5k_caps.c
index 1d60d74..9c00d15 100644
--- a/src/drivers/net/ath5k/ath5k_caps.c
+++ b/src/drivers/net/ath5k/ath5k_caps.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Nick Kossifidis <mickflemm@gmail.com>
  * Copyright (c) 2007-2008 Jiri Slaby <jirislaby@gmail.com>
  *
- * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
+ * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/src/drivers/net/ath5k/ath5k_desc.c b/src/drivers/net/ath5k/ath5k_desc.c
index 76d0c1e..30fe1c7 100644
--- a/src/drivers/net/ath5k/ath5k_desc.c
+++ b/src/drivers/net/ath5k/ath5k_desc.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2008 Nick Kossifidis <mickflemm@gmail.com>
  * Copyright (c) 2007-2008 Pavel Roskin <proski@gnu.org>
  *
- * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
+ * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/src/drivers/net/ath5k/ath5k_dma.c b/src/drivers/net/ath5k/ath5k_dma.c
index 23c4cf9..fa1e0d0 100644
--- a/src/drivers/net/ath5k/ath5k_dma.c
+++ b/src/drivers/net/ath5k/ath5k_dma.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2008 Reyk Floeter <reyk@openbsd.org>
  * Copyright (c) 2006-2008 Nick Kossifidis <mickflemm@gmail.com>
  *
- * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
+ * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/src/drivers/net/ath5k/ath5k_eeprom.c b/src/drivers/net/ath5k/ath5k_eeprom.c
index 0f62c4c..983d206 100644
--- a/src/drivers/net/ath5k/ath5k_eeprom.c
+++ b/src/drivers/net/ath5k/ath5k_eeprom.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2006-2009 Nick Kossifidis <mickflemm@gmail.com>
  * Copyright (c) 2008-2009 Felix Fietkau <nbd@openwrt.org>
  *
- * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
+ * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/src/drivers/net/ath5k/ath5k_gpio.c b/src/drivers/net/ath5k/ath5k_gpio.c
index 0e8a3e6..2301ec7 100644
--- a/src/drivers/net/ath5k/ath5k_gpio.c
+++ b/src/drivers/net/ath5k/ath5k_gpio.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2008 Reyk Floeter <reyk@openbsd.org>
  * Copyright (c) 2006-2008 Nick Kossifidis <mickflemm@gmail.com>
  *
- * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
+ * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/src/drivers/net/ath5k/ath5k_initvals.c b/src/drivers/net/ath5k/ath5k_initvals.c
index 92011c8..8f3bd20 100644
--- a/src/drivers/net/ath5k/ath5k_initvals.c
+++ b/src/drivers/net/ath5k/ath5k_initvals.c
@@ -5,7 +5,7 @@
  * Copyright (c) 2006-2009 Nick Kossifidis <mickflemm@gmail.com>
  * Copyright (c) 2007-2008 Jiri Slaby <jirislaby@gmail.com>
  *
- * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
+ * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/src/drivers/net/ath5k/ath5k_pcu.c b/src/drivers/net/ath5k/ath5k_pcu.c
index d3e144c..c8165da 100644
--- a/src/drivers/net/ath5k/ath5k_pcu.c
+++ b/src/drivers/net/ath5k/ath5k_pcu.c
@@ -6,7 +6,7 @@
  * Copyright (c) 2007-2008 Pavel Roskin <proski@gnu.org>
  * Copyright (c) 2007-2008 Jiri Slaby <jirislaby@gmail.com>
  *
- * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
+ * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -43,7 +43,7 @@ FILE_LICENCE ( MIT );
  *
  * Initialize PCU for the various operating modes (AP/STA etc)
  *
- * For gPXE we always assume STA mode.
+ * For iPXE we always assume STA mode.
  */
 int ath5k_hw_set_opmode(struct ath5k_hw *ah)
 {
diff --git a/src/drivers/net/ath5k/ath5k_phy.c b/src/drivers/net/ath5k/ath5k_phy.c
index 8856fa3..dad7060 100644
--- a/src/drivers/net/ath5k/ath5k_phy.c
+++ b/src/drivers/net/ath5k/ath5k_phy.c
@@ -6,7 +6,7 @@
  * Copyright (c) 2007-2008 Jiri Slaby <jirislaby@gmail.com>
  * Copyright (c) 2008-2009 Felix Fietkau <nbd@openwrt.org>
  *
- * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
+ * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/src/drivers/net/ath5k/ath5k_qcu.c b/src/drivers/net/ath5k/ath5k_qcu.c
index cb25029..ffa8b4e 100644
--- a/src/drivers/net/ath5k/ath5k_qcu.c
+++ b/src/drivers/net/ath5k/ath5k_qcu.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2008 Reyk Floeter <reyk@openbsd.org>
  * Copyright (c) 2006-2008 Nick Kossifidis <mickflemm@gmail.com>
  *
- * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
+ * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/src/drivers/net/ath5k/ath5k_reset.c b/src/drivers/net/ath5k/ath5k_reset.c
index dc80093..e1eb713 100644
--- a/src/drivers/net/ath5k/ath5k_reset.c
+++ b/src/drivers/net/ath5k/ath5k_reset.c
@@ -5,7 +5,7 @@
  * Copyright (c) 2007-2008 Pavel Roskin <proski@gnu.org>
  * Copyright (c) 2007-2008 Jiri Slaby <jirislaby@gmail.com>
  *
- * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
+ * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -29,7 +29,7 @@ FILE_LICENCE ( MIT );
   Reset functions and helpers
 \*****************************/
 
-#include <gpxe/pci.h> 		/* To determine if a card is pci-e */
+#include <ipxe/pci.h> 		/* To determine if a card is pci-e */
 #include <unistd.h>
 
 #include "ath5k.h"
diff --git a/src/drivers/net/ath5k/ath5k_rfkill.c b/src/drivers/net/ath5k/ath5k_rfkill.c
index 9d0a2ff..752ef70 100644
--- a/src/drivers/net/ath5k/ath5k_rfkill.c
+++ b/src/drivers/net/ath5k/ath5k_rfkill.c
@@ -2,7 +2,7 @@
  * RFKILL support for ath5k
  *
  * Copyright (c) 2009 Tobias Doerffel <tobias.doerffel@gmail.com>
- * Lightly modified for gPXE, Sep 2008 by Joshua Oreman <oremanj@rwcr.net>
+ * Lightly modified for iPXE, Sep 2008 by Joshua Oreman <oremanj@rwcr.net>
  *
  * All rights reserved.
  *
diff --git a/src/drivers/net/ath5k/base.h b/src/drivers/net/ath5k/base.h
index 870b0ed..976a3f3 100644
--- a/src/drivers/net/ath5k/base.h
+++ b/src/drivers/net/ath5k/base.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting
  * All rights reserved.
  *
- * Modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>
+ * Modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>
  * Original from Linux kernel 2.6.30.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,7 @@
 FILE_LICENCE ( BSD3 );
 
 #include "ath5k.h"
-#include <gpxe/iobuf.h>
+#include <ipxe/iobuf.h>
 
 #define	ATH_RXBUF	16		/* number of RX buffers */
 #define	ATH_TXBUF	16		/* number of TX buffers */
diff --git a/src/drivers/net/atl1e.c b/src/drivers/net/atl1e.c
index 6c0b050..160ad91 100644
--- a/src/drivers/net/atl1e.c
+++ b/src/drivers/net/atl1e.c
@@ -4,7 +4,7 @@
  * Derived from Intel e1000 driver
  * Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
  *
- * Modified for gPXE, October 2009 by Joshua Oreman <oremanj@rwcr.net>.
+ * Modified for iPXE, October 2009 by Joshua Oreman <oremanj@rwcr.net>.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/src/drivers/net/atl1e.h b/src/drivers/net/atl1e.h
index 949c323..b09dbbc 100644
--- a/src/drivers/net/atl1e.h
+++ b/src/drivers/net/atl1e.h
@@ -5,7 +5,7 @@
  * Derived from Intel e1000 driver
  * Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
  *
- * Modified for gPXE, October 2009 by Joshua Oreman <oremanj@rwcr.net>
+ * Modified for iPXE, October 2009 by Joshua Oreman <oremanj@rwcr.net>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -31,14 +31,14 @@
 #include <unistd.h>
 #include <byteswap.h>
 #include <errno.h>
-#include <gpxe/malloc.h>
-#include <gpxe/pci.h>
-#include <gpxe/pci_io.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/io.h>
+#include <ipxe/malloc.h>
+#include <ipxe/pci.h>
+#include <ipxe/pci_io.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/io.h>
 
 #define ETH_FCS_LEN	4
 #define VLAN_HLEN	4
diff --git a/src/drivers/net/b44.c b/src/drivers/net/b44.c
index c48b314..29aa5fa 100644
--- a/src/drivers/net/b44.c
+++ b/src/drivers/net/b44.c
@@ -35,15 +35,15 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdio.h>
 #include <unistd.h>
 #include <byteswap.h>
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <mii.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/malloc.h>
-#include <gpxe/pci.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/memmap.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/malloc.h>
+#include <ipxe/pci.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/memmap.h>
 #include "b44.h"
 
 
@@ -628,7 +628,7 @@ static void b44_set_rx_mode(struct net_device *netdev)
 }
 
 
-/*** Implementation of gPXE driver callbacks ***/
+/*** Implementation of iPXE driver callbacks ***/
 
 /**
  * Probe device
diff --git a/src/drivers/net/bnx2.c b/src/drivers/net/bnx2.c
index c385dd8..a986bde 100644
--- a/src/drivers/net/bnx2.c
+++ b/src/drivers/net/bnx2.c
@@ -17,8 +17,8 @@ FILE_LICENCE ( GPL_ANY );
 #include "etherboot.h"
 #include "nic.h"
 #include <errno.h>
-#include <gpxe/pci.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/pci.h>
+#include <ipxe/ethernet.h>
 #include "string.h"
 #include <mii.h>
 #include "bnx2.h"
diff --git a/src/drivers/net/cs89x0.c b/src/drivers/net/cs89x0.c
index df2667d..448ff51 100644
--- a/src/drivers/net/cs89x0.c
+++ b/src/drivers/net/cs89x0.c
@@ -88,10 +88,10 @@ FILE_LICENCE ( GPL2_ONLY );
   */
 
 #include <errno.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/ethernet.h>
 #include "etherboot.h"
 #include "nic.h"
-#include <gpxe/isa.h>
+#include <ipxe/isa.h>
 #include "console.h"
 #include "cs89x0.h"
 
diff --git a/src/drivers/net/davicom.c b/src/drivers/net/davicom.c
index 07c5e1b..bfba49d 100644
--- a/src/drivers/net/davicom.c
+++ b/src/drivers/net/davicom.c
@@ -45,8 +45,8 @@ FILE_LICENCE ( GPL_ANY );
 
 #include "etherboot.h"
 #include "nic.h"
-#include <gpxe/pci.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/pci.h>
+#include <ipxe/ethernet.h>
 
 #undef DAVICOM_DEBUG
 #undef DAVICOM_DEBUG_WHERE
diff --git a/src/drivers/net/depca.c b/src/drivers/net/depca.c
index ea85cbe..6be3e10 100644
--- a/src/drivers/net/depca.c
+++ b/src/drivers/net/depca.c
@@ -239,9 +239,9 @@ FILE_LICENCE ( GPL_ANY );
 
 #include "etherboot.h"
 #include "nic.h"
-#include <gpxe/isa.h>
+#include <ipxe/isa.h>
 #include "console.h"
-#include <gpxe/ethernet.h>
+#include <ipxe/ethernet.h>
 
 /*
 ** I/O addresses. Note that the 2k buffer option is not supported in
diff --git a/src/drivers/net/dmfe.c b/src/drivers/net/dmfe.c
index fad1737..6975ee7 100644
--- a/src/drivers/net/dmfe.c
+++ b/src/drivers/net/dmfe.c
@@ -43,8 +43,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 /* to get the interface to the body of the program */
 #include "nic.h"
 /* to get the PCI support functions, if this is a PCI NIC */
-#include <gpxe/pci.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/pci.h>
+#include <ipxe/ethernet.h>
 
 /* #define EDEBUG 1 */
 #ifdef EDEBUG
diff --git a/src/drivers/net/e1000/e1000_api.h b/src/drivers/net/e1000/e1000_api.h
index d9f13bf..07be1ce 100644
--- a/src/drivers/net/e1000/e1000_api.h
+++ b/src/drivers/net/e1000/e1000_api.h
@@ -36,15 +36,15 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/pci.h>
-#include <gpxe/malloc.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
+#include <ipxe/pci.h>
+#include <ipxe/malloc.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
 
 #include "e1000_hw.h"
 
diff --git a/src/drivers/net/e1000/e1000_main.c b/src/drivers/net/e1000/e1000_main.c
index 3421ca1..fd2c78b 100644
--- a/src/drivers/net/e1000/e1000_main.c
+++ b/src/drivers/net/e1000/e1000_main.c
@@ -541,7 +541,7 @@ void e1000_reset ( struct e1000_adapter *adapter )
 	e1000_init_manageability ( adapter );
 }
 
-/** Functions that implement the gPXE driver API **/
+/** Functions that implement the iPXE driver API **/
 
 /**
  * e1000_close - Disables a network interface
diff --git a/src/drivers/net/e1000e/e1000e.h b/src/drivers/net/e1000e/e1000e.h
index c057350..6158413 100644
--- a/src/drivers/net/e1000e/e1000e.h
+++ b/src/drivers/net/e1000e/e1000e.h
@@ -38,15 +38,15 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/pci.h>
-#include <gpxe/malloc.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
+#include <ipxe/pci.h>
+#include <ipxe/malloc.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
 
 /* Begin OS Dependencies */
 
diff --git a/src/drivers/net/e1000e/e1000e_main.c b/src/drivers/net/e1000e/e1000e_main.c
index d3e919e..748f0cb 100644
--- a/src/drivers/net/e1000e/e1000e_main.c
+++ b/src/drivers/net/e1000e/e1000e_main.c
@@ -860,7 +860,7 @@ static void e1000e_process_rx_packets ( struct net_device *netdev )
 	}
 }
 
-/** Functions that implement the gPXE driver API **/
+/** Functions that implement the iPXE driver API **/
 
 /**
  * e1000_close - Disables a network interface
diff --git a/src/drivers/net/eepro.c b/src/drivers/net/eepro.c
index a248692..704d11a 100644
--- a/src/drivers/net/eepro.c
+++ b/src/drivers/net/eepro.c
@@ -36,8 +36,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include "etherboot.h"
 #include <errno.h>
 #include "nic.h"
-#include <gpxe/isa.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/isa.h>
+#include <ipxe/ethernet.h>
 
 /* Different 82595 chips */
 #define LAN595		0
diff --git a/src/drivers/net/eepro100.c b/src/drivers/net/eepro100.c
index 3ad45bf..add17a6 100644
--- a/src/drivers/net/eepro100.c
+++ b/src/drivers/net/eepro100.c
@@ -36,7 +36,7 @@
  *              Jul 25 1997  V1.00  REW     Tested by AW to work in a PROM
  *                                          Cleanup for publication
  *              Dez 11 2004  V1.10  Kiszka  Add RX ring buffer support
- *              Jun    2008  v2.0   mdeck   Updated to gPXE. Changed much.
+ *              Jun    2008  v2.0   mdeck   Updated to iPXE. Changed much.
  *
  * Cleanups and fixes by Thomas Miletich<thomas.miletich@gmail.com>
  *
@@ -60,12 +60,12 @@ FILE_LICENCE ( GPL2_OR_LATER );
  *
  * Initialization
  *
- * ifec_pci_probe() is called by gPXE during initialization. Typical NIC
+ * ifec_pci_probe() is called by iPXE during initialization. Typical NIC
  * initialization is performed.  EEPROM data is read.
  *
  * Network Boot
  *
- * ifec_net_open() is called by gPXE before attempting to network boot from the
+ * ifec_net_open() is called by iPXE before attempting to network boot from the
  * card.  Here, the Command Unit & Receive Unit are initialized.  The tx & rx
  * rings are setup.  The MAC address is programmed and the card is configured.
  *
@@ -104,16 +104,16 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <errno.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/malloc.h>
-#include <gpxe/pci.h>
-#include <gpxe/spi_bit.h>
-#include <gpxe/timer.h>
-#include <gpxe/nvs.h>
-#include <gpxe/threewire.h>
-#include <gpxe/netdevice.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/malloc.h>
+#include <ipxe/pci.h>
+#include <ipxe/spi_bit.h>
+#include <ipxe/timer.h>
+#include <ipxe/nvs.h>
+#include <ipxe/threewire.h>
+#include <ipxe/netdevice.h>
 #include "eepro100.h"
 
 /****************************** Global data **********************************/
@@ -155,7 +155,7 @@ static struct net_device_operations ifec_operations = {
 	.irq      = ifec_net_irq
 };
 
-/******************* gPXE PCI Device Driver API functions ********************/
+/******************* iPXE PCI Device Driver API functions ********************/
 
 /*
  * Initialize the PCI device.
@@ -164,8 +164,8 @@ static struct net_device_operations ifec_operations = {
  * @v id  		The PCI device + vendor id.
  * @ret rc		Returns zero if successfully initialized.
  *
- * This function is called very early on, while gPXE is initializing.
- * This is a gPXE PCI Device Driver API function.
+ * This function is called very early on, while iPXE is initializing.
+ * This is a iPXE PCI Device Driver API function.
  */
 static int ifec_pci_probe ( struct pci_device *pci,
                             const struct pci_device_id *id __unused )
@@ -245,14 +245,14 @@ static void ifec_pci_remove ( struct pci_device *pci )
 	netdev_put        ( netdev );
 }
 
-/****************** gPXE Network Device Driver API functions *****************/
+/****************** iPXE Network Device Driver API functions *****************/
 
 /*
  * Close a network device.
  *
  * @v netdev		Device to close.
  *
- * This is a gPXE Network Device Driver API function.
+ * This is a iPXE Network Device Driver API function.
  */
 static void ifec_net_close ( struct net_device *netdev )
 {
@@ -285,7 +285,7 @@ static void ifec_net_close ( struct net_device *netdev )
  * @v netdev		Device to control.
  * @v enable		Zero to mask off IRQ, non-zero to enable IRQ.
  *
- * This is a gPXE Network Driver API function.
+ * This is a iPXE Network Driver API function.
  */
 static void ifec_net_irq ( struct net_device *netdev, int enable )
 {
@@ -304,7 +304,7 @@ static void ifec_net_irq ( struct net_device *netdev, int enable )
  * @ret rc  		Non-zero if failed to open.
  *
  * This enables tx and rx on the device.
- * This is a gPXE Network Device Driver API function.
+ * This is a iPXE Network Device Driver API function.
  */
 static int ifec_net_open ( struct net_device *netdev )
 {
@@ -393,9 +393,9 @@ error:
  *
  * @v netdev		Device being polled.
  *
- * This is called periodically by gPXE to let the driver check the status of
+ * This is called periodically by iPXE to let the driver check the status of
  * transmitted packets and to allow the driver to check for received packets.
- * This is a gPXE Network Device Driver API function.
+ * This is a iPXE Network Device Driver API function.
  */
 static void ifec_net_poll ( struct net_device *netdev )
 {
@@ -431,7 +431,7 @@ static void ifec_net_poll ( struct net_device *netdev )
  * @v iobuf 		Data to transmit.
  * @ret rc  		Non-zero if failed to transmit.
  *
- * This is a gPXE Network Driver API function.
+ * This is a iPXE Network Driver API function.
  */
 static int ifec_net_transmit ( struct net_device *netdev,
                                struct io_buffer *iobuf )
@@ -993,7 +993,7 @@ static void ifec_tx_process ( struct net_device *netdev )
 	/* Check status of transmitted packets */
 	while ( ( status = tcb->status ) && tcb->iob ) {
 		if ( status & TCB_U ) {
-			/* report error to gPXE */
+			/* report error to iPXE */
 			DBG ( "ifec_tx_process : tx error!\n " );
 			netdev_tx_complete_err ( netdev, tcb->iob, -EINVAL );
 		} else {
diff --git a/src/drivers/net/epic100.c b/src/drivers/net/epic100.c
index aaa85f8..c8b6a6c 100644
--- a/src/drivers/net/epic100.c
+++ b/src/drivers/net/epic100.c
@@ -7,8 +7,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define LINUX_OUT_MACROS
 
 #include "etherboot.h"
-#include <gpxe/pci.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/pci.h>
+#include <ipxe/ethernet.h>
 #include "nic.h"
 #include "console.h"
 #include "epic100.h"
diff --git a/src/drivers/net/etherfabric.c b/src/drivers/net/etherfabric.c
index c4296b9..bcdd010 100644
--- a/src/drivers/net/etherfabric.c
+++ b/src/drivers/net/etherfabric.c
@@ -25,13 +25,13 @@ FILE_LICENCE ( GPL_ANY );
 #include <assert.h>
 #include <byteswap.h>
 #include <console.h>
-#include <gpxe/io.h>
-#include <gpxe/pci.h>
-#include <gpxe/malloc.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/timer.h>
+#include <ipxe/io.h>
+#include <ipxe/pci.h>
+#include <ipxe/malloc.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/timer.h>
 #include <mii.h>
 #include "etherfabric.h"
 #include "etherfabric_nic.h"
diff --git a/src/drivers/net/etherfabric_nic.h b/src/drivers/net/etherfabric_nic.h
index fe94d80..a767e12 100644
--- a/src/drivers/net/etherfabric_nic.h
+++ b/src/drivers/net/etherfabric_nic.h
@@ -20,11 +20,11 @@ FILE_LICENCE ( GPL_ANY );
 
 #ifndef EFAB_NIC_H
 #define  EFAB_NIC_H
-#include <gpxe/bitbash.h>
-#include <gpxe/i2c.h>
-#include <gpxe/spi.h>
-#include <gpxe/nvo.h>
-#include <gpxe/if_ether.h>
+#include <ipxe/bitbash.h>
+#include <ipxe/i2c.h>
+#include <ipxe/spi.h>
+#include <ipxe/nvo.h>
+#include <ipxe/if_ether.h>
 /**************************************************************************
  *
  * Constants and macros
diff --git a/src/drivers/net/forcedeth.c b/src/drivers/net/forcedeth.c
index 3d44d86..3056ce2 100644
--- a/src/drivers/net/forcedeth.c
+++ b/src/drivers/net/forcedeth.c
@@ -50,9 +50,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 /* to get the interface to the body of the program */
 #include "nic.h"
 /* to get the PCI support functions, if this is a PCI NIC */
-#include <gpxe/pci.h>
+#include <ipxe/pci.h>
 /* Include timer support functions */
-#include <gpxe/ethernet.h>
+#include <ipxe/ethernet.h>
 #include "mii.h"
 
 #define drv_version "v1.2"
diff --git a/src/drivers/net/igb/igb_api.h b/src/drivers/net/igb/igb_api.h
index 967d1ee..2d97fec 100644
--- a/src/drivers/net/igb/igb_api.h
+++ b/src/drivers/net/igb/igb_api.h
@@ -35,15 +35,15 @@ FILE_LICENCE ( GPL2_ONLY );
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/pci.h>
-#include <gpxe/malloc.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
+#include <ipxe/pci.h>
+#include <ipxe/malloc.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
 
 #include "igb_hw.h"
 
diff --git a/src/drivers/net/igb/igb_main.c b/src/drivers/net/igb/igb_main.c
index 43f016e..9e2b3bf 100644
--- a/src/drivers/net/igb/igb_main.c
+++ b/src/drivers/net/igb/igb_main.c
@@ -626,7 +626,7 @@ static void igb_process_rx_packets ( struct net_device *netdev )
 	}
 }
 
-/** Functions that implement the gPXE driver API **/
+/** Functions that implement the iPXE driver API **/
 
 /**
  * igb_close - Disables a network interface
diff --git a/src/drivers/net/ipoib.c b/src/drivers/net/ipoib.c
index 4b3741e..f9fab87 100644
--- a/src/drivers/net/ipoib.c
+++ b/src/drivers/net/ipoib.c
@@ -24,14 +24,14 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <byteswap.h>
 #include <errno.h>
-#include <gpxe/errortab.h>
-#include <gpxe/if_arp.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/infiniband.h>
-#include <gpxe/ib_pathrec.h>
-#include <gpxe/ib_mcast.h>
-#include <gpxe/ipoib.h>
+#include <ipxe/errortab.h>
+#include <ipxe/if_arp.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/ib_pathrec.h>
+#include <ipxe/ib_mcast.h>
+#include <ipxe/ipoib.h>
 
 /** @file
  *
diff --git a/src/drivers/net/legacy.c b/src/drivers/net/legacy.c
index 79b3580..246a37f 100644
--- a/src/drivers/net/legacy.c
+++ b/src/drivers/net/legacy.c
@@ -1,10 +1,10 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <errno.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/iobuf.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/iobuf.h>
 #include <nic.h>
 
 /*
diff --git a/src/drivers/net/mtd80x.c b/src/drivers/net/mtd80x.c
index 7cf59b0..4d17d7f 100644
--- a/src/drivers/net/mtd80x.c
+++ b/src/drivers/net/mtd80x.c
@@ -30,8 +30,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 /* to get the interface to the body of the program */
 #include "nic.h"
 /* to get the PCI support functions, if this is a PCI NIC */
-#include <gpxe/pci.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/pci.h>
+#include <ipxe/ethernet.h>
 #include <mii.h>
 
 /* Condensed operations for readability. */
diff --git a/src/drivers/net/mtnic.c b/src/drivers/net/mtnic.c
index d7ee8d2..d5dcc03 100644
--- a/src/drivers/net/mtnic.c
+++ b/src/drivers/net/mtnic.c
@@ -35,22 +35,22 @@ FILE_LICENCE ( GPL2_ONLY );
 
 #include <strings.h>
 #include <errno.h>
-#include <gpxe/malloc.h>
-#include <gpxe/umalloc.h>
+#include <ipxe/malloc.h>
+#include <ipxe/umalloc.h>
 #include <byteswap.h>
 #include <unistd.h>
-#include <gpxe/io.h>
-#include <gpxe/pci.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/iobuf.h>
+#include <ipxe/io.h>
+#include <ipxe/pci.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/iobuf.h>
 #include "mtnic.h"
 
 
 /*
 
 
-    mtnic.c - gPXE driver for Mellanox 10Gig ConnectX EN
+    mtnic.c - iPXE driver for Mellanox 10Gig ConnectX EN
 
 
 */
diff --git a/src/drivers/net/myri10ge.c b/src/drivers/net/myri10ge.c
index ac2e124..65df5e2 100644
--- a/src/drivers/net/myri10ge.c
+++ b/src/drivers/net/myri10ge.c
@@ -30,13 +30,13 @@ FILE_LICENCE ( GPL2_ONLY );
  *
  * Initialization
  *
- * myri10ge_pci_probe() is called by gPXE during initialization.
+ * myri10ge_pci_probe() is called by iPXE during initialization.
  * Minimal NIC initialization is performed to minimize resources
  * consumed when the driver is resident but unused.
  *
  * Network Boot
  *
- * myri10ge_net_open() is called by gPXE before attempting to network
+ * myri10ge_net_open() is called by iPXE before attempting to network
  * boot from the card.  Packet buffers are allocated and the NIC
  * interface is initialized.
  *
@@ -70,13 +70,13 @@ FILE_LICENCE ( GPL2_ONLY );
 
 #include <byteswap.h>
 #include <errno.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/malloc.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/pci.h>
-#include <gpxe/timer.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/malloc.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/pci.h>
+#include <ipxe/timer.h>
 
 #include "myri10ge_mcp.h"
 
@@ -484,7 +484,7 @@ static int mac_address_from_string_specs ( struct pci_device *pci,
 }
 
 /****************************************************************
- * gPXE PCI Device Driver API functions
+ * iPXE PCI Device Driver API functions
  ****************************************************************/
 
 /*
@@ -494,8 +494,8 @@ static int mac_address_from_string_specs ( struct pci_device *pci,
  * @v id  		The PCI device + vendor id.
  * @ret rc		Returns zero if successfully initialized.
  *
- * This function is called very early on, while gPXE is initializing.
- * This is a gPXE PCI Device Driver API function.
+ * This function is called very early on, while iPXE is initializing.
+ * This is a iPXE PCI Device Driver API function.
  */
 static int myri10ge_pci_probe ( struct pci_device *pci,
 				const struct pci_device_id *id __unused )
@@ -586,7 +586,7 @@ static void myri10ge_pci_remove ( struct pci_device *pci )
 }
 
 /****************************************************************
- * gPXE Network Device Driver Operations
+ * iPXE Network Device Driver Operations
  ****************************************************************/
 
 /*
@@ -594,7 +594,7 @@ static void myri10ge_pci_remove ( struct pci_device *pci )
  *
  * @v netdev		Device to close.
  *
- * This is a gPXE Network Device Driver API function.
+ * This is a iPXE Network Device Driver API function.
  */
 static void myri10ge_net_close ( struct net_device *netdev )
 {
@@ -638,7 +638,7 @@ static void myri10ge_net_close ( struct net_device *netdev )
  * @v netdev		Device to control.
  * @v enable		Zero to mask off IRQ, non-zero to enable IRQ.
  *
- * This is a gPXE Network Driver API function.
+ * This is a iPXE Network Driver API function.
  */
 static void myri10ge_net_irq ( struct net_device *netdev, int enable )
 {
@@ -666,7 +666,7 @@ static void myri10ge_net_irq ( struct net_device *netdev, int enable )
  * @ret rc  		Non-zero if failed to open.
  *
  * This enables tx and rx on the device.
- * This is a gPXE Network Device Driver API function.
+ * This is a iPXE Network Device Driver API function.
  */
 static int myri10ge_net_open ( struct net_device *netdev )
 {
@@ -759,7 +759,7 @@ static int myri10ge_net_open ( struct net_device *netdev )
 		     | netdev->ll_addr[5] );
 	TRY ( SET_ , MAC_ADDRESS , );
 
-	/* Enable multicast receives, because some gPXE clients don't work
+	/* Enable multicast receives, because some iPXE clients don't work
 	   without multicast. . */
 
 	TRY ( ENABLE_ , ALLMULTI , );
@@ -870,9 +870,9 @@ abort_with_nothing:
  *
  * @v netdev		Device being polled.
  *
- * This is called periodically by gPXE to let the driver check the status of
+ * This is called periodically by iPXE to let the driver check the status of
  * transmitted packets and to allow the driver to check for received packets.
- * This is a gPXE Network Device Driver API function.
+ * This is a iPXE Network Device Driver API function.
  */
 static void myri10ge_net_poll ( struct net_device *netdev )
 {
@@ -951,7 +951,7 @@ static void myri10ge_net_poll ( struct net_device *netdev )
  * @v iobuf 		Data to transmit.
  * @ret rc  		Non-zero if failed to transmit.
  *
- * This is a gPXE Network Driver API function.
+ * This is a iPXE Network Driver API function.
  */
 static int myri10ge_net_transmit ( struct net_device *netdev,
 				   struct io_buffer *iobuf )
diff --git a/src/drivers/net/natsemi.c b/src/drivers/net/natsemi.c
index db3f320..2b5375a 100644
--- a/src/drivers/net/natsemi.c
+++ b/src/drivers/net/natsemi.c
@@ -1,5 +1,5 @@
 /* 
-   natsemi.c - gPXE driver for the NatSemi DP8381x series. 
+   natsemi.c - iPXE driver for the NatSemi DP8381x series.
  
    Based on:
 
@@ -51,7 +51,7 @@ FILE_LICENCE ( GPL_ANY );
 /* Revision History */
 
 /*
-  02 Jul 2007  Udayan Kumar	 1.2 ported the driver from etherboot to gPXE API.
+  02 Jul 2007  Udayan Kumar	 1.2 ported the driver from etherboot to iPXE API.
 				     Fully rewritten,adapting the old driver.
 		      	      	     Added a circular buffer for transmit and receive.
 		                     transmit routine will not wait for transmission to finish.
@@ -64,18 +64,18 @@ FILE_LICENCE ( GPL_ANY );
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <errno.h>
 #include <byteswap.h>
 #include <unistd.h>
-#include <gpxe/pci.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/spi_bit.h>
-#include <gpxe/threewire.h>
-#include <gpxe/nvo.h>
+#include <ipxe/pci.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/spi_bit.h>
+#include <ipxe/threewire.h>
+#include <ipxe/nvo.h>
 #include "natsemi.h"
 
 /*  Function Prototypes: */
diff --git a/src/drivers/net/ne2k_isa.c b/src/drivers/net/ne2k_isa.c
index 603d1ed..a923fd3 100644
--- a/src/drivers/net/ne2k_isa.c
+++ b/src/drivers/net/ne2k_isa.c
@@ -24,8 +24,8 @@ FILE_LICENCE ( BSD2 );
 #include "ns8390.h"
 #include "etherboot.h"
 #include "nic.h"
-#include <gpxe/ethernet.h>
-#include <gpxe/isa.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/isa.h>
 #include <errno.h>
 
 #define ASIC_PIO NE_DATA
diff --git a/src/drivers/net/ns83820.c b/src/drivers/net/ns83820.c
index c5f2153..c8dc23f 100644
--- a/src/drivers/net/ns83820.c
+++ b/src/drivers/net/ns83820.c
@@ -42,7 +42,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 /* to get the interface to the body of the program */
 #include "nic.h"
 /* to get the PCI support functions, if this is a PCI NIC */
-#include <gpxe/pci.h>
+#include <ipxe/pci.h>
 
 #if ARCH == ia64		/* Support 64-bit addressing */
 #define USE_64BIT_ADDR
diff --git a/src/drivers/net/ns8390.c b/src/drivers/net/ns8390.c
index 97f1141..a30f936 100644
--- a/src/drivers/net/ns8390.c
+++ b/src/drivers/net/ns8390.c
@@ -41,11 +41,11 @@ FILE_LICENCE ( BSD2 );
 #include "etherboot.h"
 #include "nic.h"
 #include "ns8390.h"
-#include <gpxe/ethernet.h>
+#include <ipxe/ethernet.h>
 #ifdef	INCLUDE_NS8390
-#include <gpxe/pci.h>
+#include <ipxe/pci.h>
 #else
-#include <gpxe/isa.h>
+#include <ipxe/isa.h>
 #endif
 
 static unsigned char	eth_vendor, eth_flags;
diff --git a/src/drivers/net/pcnet32.c b/src/drivers/net/pcnet32.c
index 223bc1e..b7b4c02 100644
--- a/src/drivers/net/pcnet32.c
+++ b/src/drivers/net/pcnet32.c
@@ -43,8 +43,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include "etherboot.h"
 #include "nic.h"
-#include <gpxe/pci.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/pci.h>
+#include <ipxe/ethernet.h>
 #include "mii.h"
 
 /* void hex_dump(const char *data, const unsigned int len); */
diff --git a/src/drivers/net/phantom/phantom.c b/src/drivers/net/phantom/phantom.c
index 41cad18..665bbb0 100644
--- a/src/drivers/net/phantom/phantom.c
+++ b/src/drivers/net/phantom/phantom.c
@@ -26,15 +26,15 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <errno.h>
 #include <assert.h>
 #include <byteswap.h>
-#include <gpxe/pci.h>
-#include <gpxe/io.h>
-#include <gpxe/malloc.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/spi.h>
-#include <gpxe/settings.h>
+#include <ipxe/pci.h>
+#include <ipxe/io.h>
+#include <ipxe/malloc.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/spi.h>
+#include <ipxe/settings.h>
 #include "phantom.h"
 
 /**
@@ -1075,7 +1075,7 @@ static void phantom_poll_link_state ( struct net_device *netdev ) {
 	       phantom, xg_state_p3, phantom->link_state );
 	phantom->link_state = xg_state_p3;
 
-	/* Indicate link state to gPXE */
+	/* Indicate link state to iPXE */
 	link = UNM_NIC_REG_XG_STATE_P3_LINK ( phantom->port,
 					      phantom->link_state );
 	switch ( link ) {
@@ -1659,7 +1659,7 @@ static int phantom_clp_fetch ( struct phantom_nic *phantom, unsigned int port,
 
 /** A Phantom CLP setting */
 struct phantom_clp_setting {
-	/** gPXE setting */
+	/** iPXE setting */
 	struct setting *setting;
 	/** Setting number */
 	unsigned int clp_setting;
@@ -1673,7 +1673,7 @@ static struct phantom_clp_setting clp_settings[] = {
 /**
  * Find Phantom CLP setting
  *
- * @v setting		gPXE setting
+ * @v setting		iPXE setting
  * @v clp_setting	Setting number, or 0 if not found
  */
 static unsigned int
@@ -1716,7 +1716,7 @@ static int phantom_store_setting ( struct settings *settings,
 	unsigned int clp_setting;
 	int rc;
 
-	/* Find Phantom setting equivalent to gPXE setting */
+	/* Find Phantom setting equivalent to iPXE setting */
 	clp_setting = phantom_clp_setting ( phantom, setting );
 	if ( ! clp_setting )
 		return -ENOTSUP;
@@ -1750,7 +1750,7 @@ static int phantom_fetch_setting ( struct settings *settings,
 	int read_len;
 	int rc;
 
-	/* Find Phantom setting equivalent to gPXE setting */
+	/* Find Phantom setting equivalent to iPXE setting */
 	clp_setting = phantom_clp_setting ( phantom, setting );
 	if ( ! clp_setting )
 		return -ENOTSUP;
@@ -1985,7 +1985,7 @@ static void phantom_get_macaddr ( struct phantom_nic *phantom,
  * one per port.  To allow individual ports to be selectively
  * enabled/disabled for PXE boot (as required), we must therefore
  * leave the expansion ROM always enabled, and place the per-port
- * enable/disable logic within the gPXE driver.
+ * enable/disable logic within the iPXE driver.
  */
 static int phantom_check_boot_enable ( struct phantom_nic *phantom ) {
 	unsigned long boot_enable;
diff --git a/src/drivers/net/pnic.c b/src/drivers/net/pnic.c
index cbc6790..ced1397 100644
--- a/src/drivers/net/pnic.c
+++ b/src/drivers/net/pnic.c
@@ -16,13 +16,13 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
 #include <stdio.h>
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <errno.h>
-#include <gpxe/pci.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
+#include <ipxe/pci.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
 
 #include "pnic_api.h"
 
diff --git a/src/drivers/net/prism2.c b/src/drivers/net/prism2.c
index 4c66592..d216014 100644
--- a/src/drivers/net/prism2.c
+++ b/src/drivers/net/prism2.c
@@ -17,8 +17,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <etherboot.h>
 #include <nic.h>
-#include <gpxe/pci.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/pci.h>
+#include <ipxe/ethernet.h>
 
 /*
  * Hard-coded SSID
diff --git a/src/drivers/net/prism2_pci.c b/src/drivers/net/prism2_pci.c
index b7c1e6b..72549ba 100644
--- a/src/drivers/net/prism2_pci.c
+++ b/src/drivers/net/prism2_pci.c
@@ -16,7 +16,7 @@ $Id$
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/pci.h>
+#include <ipxe/pci.h>
 #include <nic.h>
 
 #define WLAN_HOSTIF WLAN_PCI
diff --git a/src/drivers/net/prism2_plx.c b/src/drivers/net/prism2_plx.c
index 9fb5be2..2098f7f 100644
--- a/src/drivers/net/prism2_plx.c
+++ b/src/drivers/net/prism2_plx.c
@@ -16,7 +16,7 @@ $Id$
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/pci.h>
+#include <ipxe/pci.h>
 #include <nic.h>
 
 #define WLAN_HOSTIF WLAN_PLX
diff --git a/src/drivers/net/r8169.c b/src/drivers/net/r8169.c
index b468782..b0d9d7f 100644
--- a/src/drivers/net/r8169.c
+++ b/src/drivers/net/r8169.c
@@ -33,14 +33,14 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <assert.h>
 #include <byteswap.h>
 #include <errno.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/io.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/malloc.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/pci.h>
-#include <gpxe/timer.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/io.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/malloc.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/pci.h>
+#include <ipxe/timer.h>
 #include <mii.h>
 
 #include "r8169.h"
@@ -1577,7 +1577,7 @@ static void rtl_hw_start_8101(struct net_device *dev)
 	//        RTL_W16(IntrMask, tp->intr_event);
 }
 
-/*** gPXE API Support Routines ***/
+/*** iPXE API Support Routines ***/
 
 /**
  * setup_tx_resources - allocate tx resources (descriptors)
@@ -1818,7 +1818,7 @@ rtl8169_free_rx_resources ( struct rtl8169_private *tp )
 }
 
 /**
-    FIXME: Because gPXE's pci_device_id structure does not contain a
+    FIXME: Because iPXE's pci_device_id structure does not contain a
     field to contain arbitrary data, we need the following table to
     associate PCI IDs with nic variants, because a lot of driver
     routines depend on knowing which kind of variant they are dealing
@@ -1881,7 +1881,7 @@ static void rtl8169_irq_disable ( struct rtl8169_private *tp )
 	rtl8169_irq_mask_and_ack ( ioaddr );
 }
 
-/*** gPXE Core API Routines ***/
+/*** iPXE Core API Routines ***/
 
 /**
  * open - Called when a network interface is made active
@@ -2103,7 +2103,7 @@ rtl8169_probe ( struct pci_device *pdev, const struct pci_device_id *ent )
 	struct rtl8169_private *tp;
 	void *ioaddr;
 
-	/** FIXME: This lookup is necessary because gPXE does not have a "data"
+	/** FIXME: This lookup is necessary because iPXE does not have a "data"
 	    element in the structure pci_device_id which can pass an arbitrary
 	    piece of data to the driver.  It might be useful to add it. Then we
 	    could just use ent->data instead of having to look up cfg_index.
diff --git a/src/drivers/net/r8169.h b/src/drivers/net/r8169.h
index 89679b1..174ebb9 100644
--- a/src/drivers/net/r8169.h
+++ b/src/drivers/net/r8169.h
@@ -32,7 +32,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
 /** FIXME: include/linux/pci_regs.h has these PCI regs, maybe
-	   we need such a file in gPXE?
+	   we need such a file in iPXE?
 **/
 #define  PCI_EXP_DEVCTL	        8	/* Device Control */
 #define  PCI_EXP_DEVCTL_READRQ	0x7000	/* Max_Read_Request_Size */
diff --git a/src/drivers/net/rtl8139.c b/src/drivers/net/rtl8139.c
index 754ce60..208db09 100644
--- a/src/drivers/net/rtl8139.c
+++ b/src/drivers/net/rtl8139.c
@@ -72,18 +72,18 @@ FILE_LICENCE ( GPL_ANY );
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <errno.h>
 #include <unistd.h>
 #include <byteswap.h>
-#include <gpxe/pci.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/spi_bit.h>
-#include <gpxe/threewire.h>
-#include <gpxe/nvo.h>
+#include <ipxe/pci.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/spi_bit.h>
+#include <ipxe/threewire.h>
+#include <ipxe/nvo.h>
 
 #define TX_RING_SIZE 4
 
diff --git a/src/drivers/net/rtl818x/rtl8180.c b/src/drivers/net/rtl818x/rtl8180.c
index 472ea20..8851d1b 100644
--- a/src/drivers/net/rtl818x/rtl8180.c
+++ b/src/drivers/net/rtl818x/rtl8180.c
@@ -2,7 +2,7 @@
 
 FILE_LICENCE(GPL2_OR_LATER);
 
-#include <gpxe/pci.h>
+#include <ipxe/pci.h>
 
 REQUIRE_OBJECT(rtl818x);
 REQUIRE_OBJECT(rtl8180_grf5101);
diff --git a/src/drivers/net/rtl818x/rtl8180_grf5101.c b/src/drivers/net/rtl818x/rtl8180_grf5101.c
index 036a4f8..2b99503 100644
--- a/src/drivers/net/rtl818x/rtl8180_grf5101.c
+++ b/src/drivers/net/rtl818x/rtl8180_grf5101.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2007 Andrea Merello <andreamrl@tiscali.it>
  *
- * Modified slightly for gPXE, June 2009 by Joshua Oreman.
+ * Modified slightly for iPXE, June 2009 by Joshua Oreman.
  *
  * Code from the BSD driver and the rtl8181 project have been
  * very useful to understand certain things
@@ -21,8 +21,8 @@
  */
 
 #include <unistd.h>
-#include <gpxe/pci.h>
-#include <gpxe/net80211.h>
+#include <ipxe/pci.h>
+#include <ipxe/net80211.h>
 
 #include "rtl818x.h"
 
diff --git a/src/drivers/net/rtl818x/rtl8180_max2820.c b/src/drivers/net/rtl818x/rtl8180_max2820.c
index 7c9495f..ab380fc 100644
--- a/src/drivers/net/rtl818x/rtl8180_max2820.c
+++ b/src/drivers/net/rtl818x/rtl8180_max2820.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2007 Andrea Merello <andreamrl@tiscali.it>
  *
- * Modified slightly for gPXE, June 2009 by Joshua Oreman.
+ * Modified slightly for iPXE, June 2009 by Joshua Oreman.
  *
  * Code from the BSD driver and the rtl8181 project have been
  * very useful to understand certain things
@@ -21,8 +21,8 @@
  */
 
 #include <unistd.h>
-#include <gpxe/pci.h>
-#include <gpxe/net80211.h>
+#include <ipxe/pci.h>
+#include <ipxe/net80211.h>
 
 #include "rtl818x.h"
 
diff --git a/src/drivers/net/rtl818x/rtl8180_sa2400.c b/src/drivers/net/rtl818x/rtl8180_sa2400.c
index bcfd397..9bd62be 100644
--- a/src/drivers/net/rtl818x/rtl8180_sa2400.c
+++ b/src/drivers/net/rtl818x/rtl8180_sa2400.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2007 Andrea Merello <andreamrl@tiscali.it>
  *
- * Modified slightly for gPXE, June 2009 by Joshua Oreman.
+ * Modified slightly for iPXE, June 2009 by Joshua Oreman.
  *
  * Code from the BSD driver and the rtl8181 project have been
  * very useful to understand certain things
@@ -21,8 +21,8 @@
  */
 
 #include <unistd.h>
-#include <gpxe/pci.h>
-#include <gpxe/net80211.h>
+#include <ipxe/pci.h>
+#include <ipxe/net80211.h>
 
 #include "rtl818x.h"
 
diff --git a/src/drivers/net/rtl818x/rtl8185.c b/src/drivers/net/rtl818x/rtl8185.c
index bfa5ab5..fd27e5c 100644
--- a/src/drivers/net/rtl818x/rtl8185.c
+++ b/src/drivers/net/rtl818x/rtl8185.c
@@ -2,7 +2,7 @@
 
 FILE_LICENCE(GPL2_OR_LATER);
 
-#include <gpxe/pci.h>
+#include <ipxe/pci.h>
 
 REQUIRE_OBJECT(rtl818x);
 REQUIRE_OBJECT(rtl8185_rtl8225);
diff --git a/src/drivers/net/rtl818x/rtl8185_rtl8225.c b/src/drivers/net/rtl818x/rtl8185_rtl8225.c
index b3fc186..50cc84a 100644
--- a/src/drivers/net/rtl818x/rtl8185_rtl8225.c
+++ b/src/drivers/net/rtl818x/rtl8185_rtl8225.c
@@ -4,7 +4,7 @@
  * Copyright 2007 Michael Wu <flamingice@sourmilk.net>
  * Copyright 2007 Andrea Merello <andreamrl@tiscali.it>
  *
- * Modified slightly for gPXE, June 2009 by Joshua Oreman
+ * Modified slightly for iPXE, June 2009 by Joshua Oreman
  *
  * Based on the r8180 driver, which is:
  * Copyright 2005 Andrea Merello <andreamrl@tiscali.it>, et al.
@@ -17,8 +17,8 @@
  */
 
 #include <unistd.h>
-#include <gpxe/pci.h>
-#include <gpxe/net80211.h>
+#include <ipxe/pci.h>
+#include <ipxe/net80211.h>
 
 #include "rtl818x.h"
 
diff --git a/src/drivers/net/rtl818x/rtl818x.c b/src/drivers/net/rtl818x/rtl818x.c
index 7c7ca48..f9a46a2 100644
--- a/src/drivers/net/rtl818x/rtl818x.c
+++ b/src/drivers/net/rtl818x/rtl818x.c
@@ -5,7 +5,7 @@
  * Copyright 2007 Michael Wu <flamingice@sourmilk.net>
  * Copyright 2007 Andrea Merello <andreamrl@tiscali.it>
  *
- * Modified for gPXE, June 2009, by Joshua Oreman <oremanj@rwcr.net>
+ * Modified for iPXE, June 2009, by Joshua Oreman <oremanj@rwcr.net>
  *
  * Based on the r8180 driver, which is:
  * Copyright 2004-2005 Andrea Merello <andreamrl@tiscali.it>, et al.
@@ -24,12 +24,12 @@ FILE_LICENCE(GPL2_ONLY);
 #include <stdio.h>
 #include <unistd.h>
 #include <byteswap.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/malloc.h>
-#include <gpxe/pci.h>
-#include <gpxe/net80211.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/threewire.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/malloc.h>
+#include <ipxe/pci.h>
+#include <ipxe/net80211.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/threewire.h>
 
 #include "rtl818x.h"
 
diff --git a/src/drivers/net/rtl818x/rtl818x.h b/src/drivers/net/rtl818x/rtl818x.h
index 15821fa..4e57d0b 100644
--- a/src/drivers/net/rtl818x/rtl818x.h
+++ b/src/drivers/net/rtl818x/rtl818x.h
@@ -4,7 +4,7 @@
  * Copyright 2007 Michael Wu <flamingice@sourmilk.net>
  * Copyright 2007 Andrea Merello <andreamrl@tiscali.it>
  *
- * Modified for gPXE, June 2009, by Joshua Oreman <oremanj@rwcr.net>
+ * Modified for iPXE, June 2009, by Joshua Oreman <oremanj@rwcr.net>
  *
  * Based on the r8187 driver, which is:
  * Copyright 2005 Andrea Merello <andreamrl@tiscali.it>, et al.
@@ -17,8 +17,8 @@
 #ifndef RTL818X_H
 #define RTL818X_H
 
-#include <gpxe/spi_bit.h>
-#include <gpxe/tables.h>
+#include <ipxe/spi_bit.h>
+#include <ipxe/tables.h>
 
 FILE_LICENCE(GPL2_ONLY);
 
diff --git a/src/drivers/net/sis190.c b/src/drivers/net/sis190.c
index 5d0145a..ab81928 100644
--- a/src/drivers/net/sis190.c
+++ b/src/drivers/net/sis190.c
@@ -5,7 +5,7 @@
    Copyright (c) 2003, 2004 Jeff Garzik <jgarzik@pobox.com>
    Copyright (c) 2003, 2004, 2005 Francois Romieu <romieu@fr.zoreil.com>
 
-   Modified for gPXE 2009 by Thomas Miletich <thomas.miletich@gmail.com>
+   Modified for iPXE 2009 by Thomas Miletich <thomas.miletich@gmail.com>
 
    Based on r8169.c, tg3.c, 8139cp.c, skge.c, epic100.c and SiS 190/191
    genuine driver.
diff --git a/src/drivers/net/sis190.h b/src/drivers/net/sis190.h
index c6dac5b..fc6cb4b 100644
--- a/src/drivers/net/sis190.h
+++ b/src/drivers/net/sis190.h
@@ -13,14 +13,14 @@ FILE_LICENCE ( GPL_ANY );
 #include <byteswap.h>
 #include <errno.h>
 #include <mii.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/io.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/malloc.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/pci.h>
-#include <gpxe/timer.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/io.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/malloc.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/pci.h>
+#include <ipxe/timer.h>
 
 #define PCI_VENDOR_ID_SI	0x1039
 
diff --git a/src/drivers/net/sis900.c b/src/drivers/net/sis900.c
index da14a09..630cc2c 100644
--- a/src/drivers/net/sis900.c
+++ b/src/drivers/net/sis900.c
@@ -46,7 +46,7 @@ FILE_LICENCE ( GPL_ANY );
 /* Includes */
 
 #include "etherboot.h"
-#include <gpxe/pci.h>
+#include <ipxe/pci.h>
 #include "nic.h"
 
 #include "sis900.h"
diff --git a/src/drivers/net/skge.c b/src/drivers/net/skge.c
index afe8273..0508428 100755
--- a/src/drivers/net/skge.c
+++ b/src/drivers/net/skge.c
@@ -1,5 +1,5 @@
 /*
- * gPXE driver for Marvell Yukon chipset and SysKonnect Gigabit
+ * iPXE driver for Marvell Yukon chipset and SysKonnect Gigabit
  * Ethernet adapters. Derived from Linux skge driver (v1.13), which was
  * based on earlier sk98lin, e100 and FreeBSD if_sk drivers.
  *
@@ -9,7 +9,7 @@
  *
  * Copyright (C) 2004, 2005 Stephen Hemminger <shemminger@osdl.org>
  *
- * Modified for gPXE, July 2008 by Michael Decker <mrd999@gmail.com>
+ * Modified for iPXE, July 2008 by Michael Decker <mrd999@gmail.com>
  * Tested and Modified in December 2009 by
  *    Thomas Miletich <thomas.miletich@gmail.com>
  *
@@ -33,12 +33,12 @@ FILE_LICENCE ( GPL2_ONLY );
 #include <errno.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/malloc.h>
-#include <gpxe/pci.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/malloc.h>
+#include <ipxe/pci.h>
 
 #include "skge.h"
 
@@ -1724,7 +1724,7 @@ static int skge_up(struct net_device *dev)
 
 	assert(!(skge->dma & 7));
 
-	/* FIXME: find out whether 64 bit gPXE will be loaded > 4GB */
+	/* FIXME: find out whether 64 bit iPXE will be loaded > 4GB */
 	if ((u64)skge->dma >> 32 != ((u64) skge->dma + RING_SIZE) >> 32) {
 		DBG(PFX "pci_alloc_consistent region crosses 4G boundary\n");
 		err = -EINVAL;
@@ -2450,7 +2450,7 @@ static void skge_remove(struct pci_device *pdev)
  * @v netdev		Device to control.
  * @v enable		Zero to mask off IRQ, non-zero to enable IRQ.
  *
- * This is a gPXE Network Driver API function.
+ * This is a iPXE Network Driver API function.
  */
 static void skge_net_irq ( struct net_device *dev, int enable ) {
 	struct skge_port *skge = netdev_priv(dev);
diff --git a/src/drivers/net/skge.h b/src/drivers/net/skge.h
index 6b08daf..9408824 100755
--- a/src/drivers/net/skge.h
+++ b/src/drivers/net/skge.h
@@ -35,7 +35,7 @@ FILE_LICENCE ( GPL2_ONLY );
 
 #define SKGE_EEPROM_MAGIC	0x9933aabb
 
-/* Added for gPXE ------------------ */
+/* Added for iPXE ------------------ */
 
 /* from ethtool.h */
 #define AUTONEG_DISABLE	0x00
diff --git a/src/drivers/net/sky2.c b/src/drivers/net/sky2.c
index 00940af..059c7f0 100644
--- a/src/drivers/net/sky2.c
+++ b/src/drivers/net/sky2.c
@@ -1,5 +1,5 @@
 /*
- * gPXE driver for Marvell Yukon 2 chipset. Derived from Linux sky2 driver
+ * iPXE driver for Marvell Yukon 2 chipset. Derived from Linux sky2 driver
  * (v1.22), which was based on earlier sk98lin and skge drivers.
  *
  * This driver intentionally does not support all the features
@@ -8,7 +8,7 @@
  *
  * Copyright (C) 2005 Stephen Hemminger <shemminger@osdl.org>
  *
- * Modified for gPXE, April 2009 by Joshua Oreman
+ * Modified for iPXE, April 2009 by Joshua Oreman
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,11 +30,11 @@ FILE_LICENCE ( GPL2_ONLY );
 #include <errno.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/malloc.h>
-#include <gpxe/pci.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/malloc.h>
+#include <ipxe/pci.h>
 #include <byteswap.h>
 #include <mii.h>
 
@@ -1016,7 +1016,7 @@ static struct io_buffer *sky2_rx_alloc(struct sky2_port *sky2)
 	 * Cards with a RAM buffer hang in the rx FIFO if the
 	 * receive buffer isn't aligned to (Linux module comments say
 	 * 64 bytes, Linux module code says 8 bytes). Since io_buffers
-	 * are always 2kb-aligned under gPXE, just leave it be
+	 * are always 2kb-aligned under iPXE, just leave it be
 	 * without ETH_DATA_ALIGN in those cases.
 	 *
 	 * XXX This causes unaligned access to the IP header,
diff --git a/src/drivers/net/sky2.h b/src/drivers/net/sky2.h
index 7963fbe..3e86b1d 100644
--- a/src/drivers/net/sky2.h
+++ b/src/drivers/net/sky2.h
@@ -6,7 +6,7 @@
 
 FILE_LICENCE ( GPL2_ONLY );
 
-/* Added for gPXE ------------------ */
+/* Added for iPXE ------------------ */
 
 /* These were defined in Linux ethtool.h. Their values are arbitrary;
    they aid only in bookkeeping for the driver. */
diff --git a/src/drivers/net/smc9000.c b/src/drivers/net/smc9000.c
index cfbf104..aa29360 100644
--- a/src/drivers/net/smc9000.c
+++ b/src/drivers/net/smc9000.c
@@ -38,11 +38,11 @@ FILE_LICENCE ( GPL_ANY );
 #define PRINTK2(args...)
 #endif
 
-#include <gpxe/ethernet.h>
+#include <ipxe/ethernet.h>
 #include <errno.h>
 #include "etherboot.h"
 #include "nic.h"
-#include <gpxe/isa.h>
+#include <ipxe/isa.h>
 #include "smc9000.h"
 
 # define _outb outb
diff --git a/src/drivers/net/sundance.c b/src/drivers/net/sundance.c
index c446ac0..2ee6089 100644
--- a/src/drivers/net/sundance.c
+++ b/src/drivers/net/sundance.c
@@ -47,7 +47,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 /* to get the interface to the body of the program */
 #include "nic.h"
 /* to get the PCI support functions, if this is a PCI NIC */
-#include <gpxe/pci.h>
+#include <ipxe/pci.h>
 #include "mii.h"
 
 #define drv_version "v1.12"
diff --git a/src/drivers/net/tg3.c b/src/drivers/net/tg3.c
index 20027b2..4ff72ac 100644
--- a/src/drivers/net/tg3.c
+++ b/src/drivers/net/tg3.c
@@ -17,8 +17,8 @@ FILE_LICENCE ( GPL2_ONLY );
 #include "etherboot.h"
 #include "nic.h"
 #include <errno.h>
-#include <gpxe/pci.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/pci.h>
+#include <ipxe/ethernet.h>
 #include "string.h"
 #include <mii.h>
 #include "tg3.h"
diff --git a/src/drivers/net/tlan.c b/src/drivers/net/tlan.c
index e5f04fa..c775620 100644
--- a/src/drivers/net/tlan.c
+++ b/src/drivers/net/tlan.c
@@ -42,8 +42,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include "etherboot.h"
 #include "nic.h"
-#include <gpxe/pci.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/pci.h>
+#include <ipxe/ethernet.h>
 #include <mii.h>
 #include "tlan.h"
 
diff --git a/src/drivers/net/tulip.c b/src/drivers/net/tulip.c
index af30ec6..a53ac71 100644
--- a/src/drivers/net/tulip.c
+++ b/src/drivers/net/tulip.c
@@ -111,8 +111,8 @@ FILE_LICENCE ( GPL_ANY );
 #include "etherboot.h"
 #include "nic.h"
 
-#include <gpxe/ethernet.h>
-#include <gpxe/pci.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/pci.h>
 
 /* User settable parameters */
 
diff --git a/src/drivers/net/via-rhine.c b/src/drivers/net/via-rhine.c
index 60e6230..439a4a5 100644
--- a/src/drivers/net/via-rhine.c
+++ b/src/drivers/net/via-rhine.c
@@ -48,8 +48,8 @@ static const char *version = "rhine.c v1.0.2 2004-10-29\n";
 
 #include "etherboot.h"
 #include "nic.h"
-#include <gpxe/pci.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/pci.h>
+#include <ipxe/ethernet.h>
 
 /* define all ioaddr */
 
diff --git a/src/drivers/net/via-velocity.c b/src/drivers/net/via-velocity.c
index 19625aa..5b10b6e 100644
--- a/src/drivers/net/via-velocity.c
+++ b/src/drivers/net/via-velocity.c
@@ -40,8 +40,8 @@
 
 #include "etherboot.h"
 #include "nic.h"
-#include <gpxe/pci.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/pci.h>
+#include <ipxe/ethernet.h>
 
 #include "via-velocity.h"
 
diff --git a/src/drivers/net/virtio-net.c b/src/drivers/net/virtio-net.c
index 49fcc1c..aedfa5f 100644
--- a/src/drivers/net/virtio-net.c
+++ b/src/drivers/net/virtio-net.c
@@ -21,8 +21,8 @@
 
 #include "etherboot.h"
 #include "nic.h"
-#include "gpxe/virtio-ring.h"
-#include "gpxe/virtio-pci.h"
+#include "ipxe/virtio-ring.h"
+#include "ipxe/virtio-pci.h"
 #include "virtio-net.h"
 
 #define BUG() do { \
diff --git a/src/drivers/net/vxge/vxge.c b/src/drivers/net/vxge/vxge.c
index a24932e..bf20ec4 100644
--- a/src/drivers/net/vxge/vxge.c
+++ b/src/drivers/net/vxge/vxge.c
@@ -7,7 +7,7 @@
 
 FILE_LICENCE(GPL2_OR_LATER);
 
-#include <gpxe/pci.h>
+#include <ipxe/pci.h>
 
 REQUIRE_OBJECT(vxge_main);
 
diff --git a/src/drivers/net/vxge/vxge_config.c b/src/drivers/net/vxge/vxge_config.c
index 2cbe453..76dbfd6 100644
--- a/src/drivers/net/vxge/vxge_config.c
+++ b/src/drivers/net/vxge/vxge_config.c
@@ -1,5 +1,5 @@
 /*
- * vxge-config.c: gPXE driver for Neterion Inc's X3100 Series 10GbE PCIe I/O
+ * vxge-config.c: iPXE driver for Neterion Inc's X3100 Series 10GbE PCIe I/O
  *              Virtualized Server Adapter.
  *
  * Copyright(c) 2002-2010 Neterion Inc.
@@ -16,8 +16,8 @@ FILE_LICENCE(GPL2_ONLY);
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <gpxe/malloc.h>
-#include <gpxe/iobuf.h>
+#include <ipxe/malloc.h>
+#include <ipxe/iobuf.h>
 #include <byteswap.h>
 
 #include "vxge_traffic.h"
diff --git a/src/drivers/net/vxge/vxge_config.h b/src/drivers/net/vxge/vxge_config.h
index 64f1e8c..3313123 100644
--- a/src/drivers/net/vxge/vxge_config.h
+++ b/src/drivers/net/vxge/vxge_config.h
@@ -1,5 +1,5 @@
 /*
- * vxge-config.h: gPXE driver for Neterion Inc's X3100 Series 10GbE
+ * vxge-config.h: iPXE driver for Neterion Inc's X3100 Series 10GbE
  *              PCIe I/O Virtualized Server Adapter.
  *
  * Copyright(c) 2002-2010 Neterion Inc.
@@ -18,8 +18,8 @@ FILE_LICENCE(GPL2_ONLY);
 #define VXGE_CONFIG_H
 
 #include <stdint.h>
-#include <gpxe/list.h>
-#include <gpxe/pci.h>
+#include <ipxe/list.h>
+#include <ipxe/pci.h>
 
 #ifndef VXGE_CACHE_LINE_SIZE
 #define VXGE_CACHE_LINE_SIZE 4096
@@ -314,7 +314,7 @@ struct __vxge_hw_non_offload_db_wrapper {
  * @vp_id: Virtual path id
  * @tx_intr_num: Interrupt Number associated with the TX
  * @txdl: Start pointer of the txdl list of this fifo.
- *        gPxe does not support tx fragmentation, so we need
+ *        iPXE does not support tx fragmentation, so we need
  *        only one txd in a list
  * @depth: total number of lists in this fifo
  * @hw_offset: txd index from where adapter owns the txd list
diff --git a/src/drivers/net/vxge/vxge_main.c b/src/drivers/net/vxge/vxge_main.c
index 8f5ba47..42855f8 100644
--- a/src/drivers/net/vxge/vxge_main.c
+++ b/src/drivers/net/vxge/vxge_main.c
@@ -1,5 +1,5 @@
 /*
- * vxge-main.c: gPXE driver for Neterion Inc's X3100 Series 10GbE
+ * vxge-main.c: iPXE driver for Neterion Inc's X3100 Series 10GbE
  *              PCIe I/O Virtualized Server Adapter.
  *
  * Copyright(c) 2002-2010 Neterion Inc.
@@ -17,16 +17,16 @@ FILE_LICENCE(GPL2_ONLY);
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/pci.h>
-#include <gpxe/malloc.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/timer.h>
+#include <ipxe/pci.h>
+#include <ipxe/malloc.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/timer.h>
 #include <nic.h>
 
 #include "vxge_main.h"
@@ -165,7 +165,7 @@ int vxge_open_vpaths(struct vxgedev *vdev)
 	return VXGE_HW_OK;
 }
 
-/** Functions that implement the gPXE driver API **/
+/** Functions that implement the iPXE driver API **/
 
 /**
  * vxge_xmit
diff --git a/src/drivers/net/vxge/vxge_main.h b/src/drivers/net/vxge/vxge_main.h
index a384b49..fc08ac6 100644
--- a/src/drivers/net/vxge/vxge_main.h
+++ b/src/drivers/net/vxge/vxge_main.h
@@ -1,5 +1,5 @@
 /*
- * vxge-main.h: gPXE driver for Neterion Inc's X3100 Series 10GbE
+ * vxge-main.h: iPXE driver for Neterion Inc's X3100 Series 10GbE
  *              PCIe I/O Virtualized Server Adapter.
  *
  * Copyright(c) 2002-2010 Neterion Inc.
diff --git a/src/drivers/net/vxge/vxge_reg.h b/src/drivers/net/vxge/vxge_reg.h
index 5397cbe..a76f24e 100644
--- a/src/drivers/net/vxge/vxge_reg.h
+++ b/src/drivers/net/vxge/vxge_reg.h
@@ -1,5 +1,5 @@
 /*
- * vxge-reg.h: gPXE driver for Neterion Inc's X3100 Series 10GbE
+ * vxge-reg.h: iPXE driver for Neterion Inc's X3100 Series 10GbE
  *              PCIe I/O Virtualized Server Adapter.
  *
  * Copyright(c) 2002-2010 Neterion Inc.
diff --git a/src/drivers/net/vxge/vxge_traffic.c b/src/drivers/net/vxge/vxge_traffic.c
index 425e289..3bc093c 100644
--- a/src/drivers/net/vxge/vxge_traffic.c
+++ b/src/drivers/net/vxge/vxge_traffic.c
@@ -1,5 +1,5 @@
 /*
- * vxge-traffic.c: gPXE driver for Neterion Inc's X3100 Series 10GbE
+ * vxge-traffic.c: iPXE driver for Neterion Inc's X3100 Series 10GbE
  *              PCIe I/O Virtualized Server Adapter.
  *
  * Copyright(c) 2002-2010 Neterion Inc.
@@ -14,7 +14,7 @@
 
 FILE_LICENCE(GPL2_ONLY);
 
-#include <gpxe/netdevice.h>
+#include <ipxe/netdevice.h>
 #include <errno.h>
 
 #include "vxge_traffic.h"
diff --git a/src/drivers/net/vxge/vxge_traffic.h b/src/drivers/net/vxge/vxge_traffic.h
index 84428f5..ed72be1 100644
--- a/src/drivers/net/vxge/vxge_traffic.h
+++ b/src/drivers/net/vxge/vxge_traffic.h
@@ -1,5 +1,5 @@
 /*
- * vxge-traffic.h: gPXE driver for Neterion Inc's X3100 Series 10GbE
+ * vxge-traffic.h: iPXE driver for Neterion Inc's X3100 Series 10GbE
  *              PCIe I/O Virtualized Server Adapter.
  *
  * Copyright(c) 2002-2010 Neterion Inc.
@@ -18,8 +18,8 @@ FILE_LICENCE(GPL2_ONLY);
 #define VXGE_TRAFFIC_H
 
 #include <stdint.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/iobuf.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/iobuf.h>
 
 #include "vxge_reg.h"
 #include "vxge_version.h"
diff --git a/src/drivers/net/vxge/vxge_version.h b/src/drivers/net/vxge/vxge_version.h
index 55ad3bf..f1a0209 100644
--- a/src/drivers/net/vxge/vxge_version.h
+++ b/src/drivers/net/vxge/vxge_version.h
@@ -1,5 +1,5 @@
 /*
- * vxge-version.h: gPXE driver for Neterion Inc's X3100 Series 10GbE
+ * vxge-version.h: iPXE driver for Neterion Inc's X3100 Series 10GbE
  *              PCIe I/O Virtualized Server Adapter.
  *
  * Copyright(c) 2002-2010 Neterion Inc.
@@ -18,7 +18,7 @@ FILE_LICENCE(GPL2_ONLY);
 
 #define VXGE_VERSION_H
 
-/* gpxe vxge driver version fields.
+/* ipxe vxge driver version fields.
  * Note: Each field must be a nibble size
  */
 #define VXGE_VERSION_MAJOR	3
diff --git a/src/drivers/net/w89c840.c b/src/drivers/net/w89c840.c
index fa6188a..c9d22a1 100644
--- a/src/drivers/net/w89c840.c
+++ b/src/drivers/net/w89c840.c
@@ -81,8 +81,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include "etherboot.h"
 #include "nic.h"
-#include <gpxe/pci.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/pci.h>
+#include <ipxe/ethernet.h>
 
 static const char *w89c840_version = "driver Version 0.94 - December 12, 2003";
 
diff --git a/src/drivers/nvs/nvs.c b/src/drivers/nvs/nvs.c
index 7252808..efa49ac 100644
--- a/src/drivers/nvs/nvs.c
+++ b/src/drivers/nvs/nvs.c
@@ -22,7 +22,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
-#include <gpxe/nvs.h>
+#include <ipxe/nvs.h>
 
 /** @file
  *
diff --git a/src/drivers/nvs/spi.c b/src/drivers/nvs/spi.c
index 793080a..e12aeff 100644
--- a/src/drivers/nvs/spi.c
+++ b/src/drivers/nvs/spi.c
@@ -21,7 +21,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stddef.h>
 #include <errno.h>
 #include <unistd.h>
-#include <gpxe/spi.h>
+#include <ipxe/spi.h>
 
 /** @file
  *
diff --git a/src/drivers/nvs/threewire.c b/src/drivers/nvs/threewire.c
index 8e52138..047091f 100644
--- a/src/drivers/nvs/threewire.c
+++ b/src/drivers/nvs/threewire.c
@@ -22,7 +22,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <assert.h>
 #include <unistd.h>
-#include <gpxe/threewire.h>
+#include <ipxe/threewire.h>
 
 /** @file
  *
diff --git a/src/hci/commands/autoboot_cmd.c b/src/hci/commands/autoboot_cmd.c
index 95b172d..51ba6f1 100644
--- a/src/hci/commands/autoboot_cmd.c
+++ b/src/hci/commands/autoboot_cmd.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <gpxe/command.h>
+#include <ipxe/command.h>
 #include <usr/autoboot.h>
 
 FILE_LICENCE ( GPL2_OR_LATER );
diff --git a/src/hci/commands/config_cmd.c b/src/hci/commands/config_cmd.c
index a9e1f16..53b10f9 100644
--- a/src/hci/commands/config_cmd.c
+++ b/src/hci/commands/config_cmd.c
@@ -1,8 +1,8 @@
 #include <string.h>
 #include <stdio.h>
-#include <gpxe/command.h>
-#include <gpxe/settings.h>
-#include <gpxe/settings_ui.h>
+#include <ipxe/command.h>
+#include <ipxe/settings.h>
+#include <ipxe/settings_ui.h>
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
diff --git a/src/hci/commands/dhcp_cmd.c b/src/hci/commands/dhcp_cmd.c
index 96aac8d..82869d6 100644
--- a/src/hci/commands/dhcp_cmd.c
+++ b/src/hci/commands/dhcp_cmd.c
@@ -27,9 +27,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <assert.h>
 #include <getopt.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/in.h>
-#include <gpxe/command.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/in.h>
+#include <ipxe/command.h>
 #include <usr/dhcpmgmt.h>
 
 /** @file
diff --git a/src/hci/commands/digest_cmd.c b/src/hci/commands/digest_cmd.c
index bc6e551..e28e6c3 100644
--- a/src/hci/commands/digest_cmd.c
+++ b/src/hci/commands/digest_cmd.c
@@ -19,12 +19,12 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <gpxe/command.h>
-#include <gpxe/image.h>
-#include <gpxe/crypto.h>
+#include <ipxe/command.h>
+#include <ipxe/image.h>
+#include <ipxe/crypto.h>
 
-#include <gpxe/md5.h>
-#include <gpxe/sha1.h>
+#include <ipxe/md5.h>
+#include <ipxe/sha1.h>
 
 /**
  * "digest" command syntax message
diff --git a/src/hci/commands/gdbstub_cmd.c b/src/hci/commands/gdbstub_cmd.c
index 7416752..4ad5972 100644
--- a/src/hci/commands/gdbstub_cmd.c
+++ b/src/hci/commands/gdbstub_cmd.c
@@ -18,8 +18,8 @@
 
 #include <stdio.h>
 #include <getopt.h>
-#include <gpxe/command.h>
-#include <gpxe/gdbstub.h>
+#include <ipxe/command.h>
+#include <ipxe/gdbstub.h>
 
 /** @file
  *
diff --git a/src/hci/commands/ifmgmt_cmd.c b/src/hci/commands/ifmgmt_cmd.c
index ad069f1..ae80cde 100644
--- a/src/hci/commands/ifmgmt_cmd.c
+++ b/src/hci/commands/ifmgmt_cmd.c
@@ -20,8 +20,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdio.h>
 #include <getopt.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/command.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/command.h>
 #include <usr/ifmgmt.h>
 #include <hci/ifmgmt_cmd.h>
 
diff --git a/src/hci/commands/image_cmd.c b/src/hci/commands/image_cmd.c
index 33994b5..74d0ff5 100644
--- a/src/hci/commands/image_cmd.c
+++ b/src/hci/commands/image_cmd.c
@@ -24,8 +24,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <errno.h>
 #include <libgen.h>
 #include <getopt.h>
-#include <gpxe/image.h>
-#include <gpxe/command.h>
+#include <ipxe/image.h>
+#include <ipxe/command.h>
 #include <usr/imgmgmt.h>
 
 /** @file
diff --git a/src/hci/commands/iwmgmt_cmd.c b/src/hci/commands/iwmgmt_cmd.c
index 006c9f1..8c00a20 100644
--- a/src/hci/commands/iwmgmt_cmd.c
+++ b/src/hci/commands/iwmgmt_cmd.c
@@ -18,9 +18,9 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/netdevice.h>
-#include <gpxe/net80211.h>
-#include <gpxe/command.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/net80211.h>
+#include <ipxe/command.h>
 #include <usr/iwmgmt.h>
 #include <hci/ifmgmt_cmd.h>
 
diff --git a/src/hci/commands/login_cmd.c b/src/hci/commands/login_cmd.c
index 0da2497..be84765 100644
--- a/src/hci/commands/login_cmd.c
+++ b/src/hci/commands/login_cmd.c
@@ -1,7 +1,7 @@
 #include <string.h>
 #include <stdio.h>
-#include <gpxe/command.h>
-#include <gpxe/login_ui.h>
+#include <ipxe/command.h>
+#include <ipxe/login_ui.h>
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
diff --git a/src/hci/commands/nvo_cmd.c b/src/hci/commands/nvo_cmd.c
index 5eb2f06..331c3e4 100644
--- a/src/hci/commands/nvo_cmd.c
+++ b/src/hci/commands/nvo_cmd.c
@@ -4,8 +4,8 @@
 #include <string.h>
 #include <errno.h>
 #include <getopt.h>
-#include <gpxe/settings.h>
-#include <gpxe/command.h>
+#include <ipxe/settings.h>
+#include <ipxe/command.h>
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
diff --git a/src/hci/commands/route_cmd.c b/src/hci/commands/route_cmd.c
index 4372e34..0573497 100644
--- a/src/hci/commands/route_cmd.c
+++ b/src/hci/commands/route_cmd.c
@@ -20,7 +20,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdio.h>
 #include <getopt.h>
-#include <gpxe/command.h>
+#include <ipxe/command.h>
 #include <usr/route.h>
 
 /** @file
diff --git a/src/hci/commands/sanboot_cmd.c b/src/hci/commands/sanboot_cmd.c
index 783b747..ec7f5ac 100644
--- a/src/hci/commands/sanboot_cmd.c
+++ b/src/hci/commands/sanboot_cmd.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <getopt.h>
-#include <gpxe/command.h>
+#include <ipxe/command.h>
 #include <usr/autoboot.h>
 
 FILE_LICENCE ( GPL2_OR_LATER );
diff --git a/src/hci/commands/time_cmd.c b/src/hci/commands/time_cmd.c
index 947410e..5e2612a 100644
--- a/src/hci/commands/time_cmd.c
+++ b/src/hci/commands/time_cmd.c
@@ -23,9 +23,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <gpxe/command.h>
-#include <gpxe/nap.h>
-#include <gpxe/timer.h>
+#include <ipxe/command.h>
+#include <ipxe/nap.h>
+#include <ipxe/timer.h>
 
 static int time_exec ( int argc, char **argv ) {
 	unsigned long start;
diff --git a/src/hci/editstring.c b/src/hci/editstring.c
index 648f338..9207e58 100644
--- a/src/hci/editstring.c
+++ b/src/hci/editstring.c
@@ -20,8 +20,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <assert.h>
 #include <string.h>
-#include <gpxe/keys.h>
-#include <gpxe/editstring.h>
+#include <ipxe/keys.h>
+#include <ipxe/editstring.h>
 
 /** @file
  *
diff --git a/src/hci/mucurses/print.c b/src/hci/mucurses/print.c
index 1608c0a..9c68258 100644
--- a/src/hci/mucurses/print.c
+++ b/src/hci/mucurses/print.c
@@ -1,7 +1,7 @@
 #include <curses.h>
 #include <stdio.h>
 #include <stddef.h>
-#include <gpxe/vsprintf.h>
+#include <ipxe/vsprintf.h>
 #include "mucurses.h"
 
 /** @file
diff --git a/src/hci/mucurses/widgets/editbox.c b/src/hci/mucurses/widgets/editbox.c
index ee7d609..40e22d6 100644
--- a/src/hci/mucurses/widgets/editbox.c
+++ b/src/hci/mucurses/widgets/editbox.c
@@ -20,7 +20,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <string.h>
 #include <assert.h>
-#include <gpxe/editbox.h>
+#include <ipxe/editbox.h>
 
 /** @file
  *
diff --git a/src/hci/readline.c b/src/hci/readline.c
index e5699d5..ee252a1 100644
--- a/src/hci/readline.c
+++ b/src/hci/readline.c
@@ -22,8 +22,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <stdlib.h>
 #include <console.h>
-#include <gpxe/keys.h>
-#include <gpxe/editstring.h>
+#include <ipxe/keys.h>
+#include <ipxe/editstring.h>
 #include <readline/readline.h>
 
 /** @file
diff --git a/src/hci/shell.c b/src/hci/shell.c
index 5bedbdc..3fc2572 100644
--- a/src/hci/shell.c
+++ b/src/hci/shell.c
@@ -22,8 +22,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdlib.h>
 #include <stdio.h>
 #include <readline/readline.h>
-#include <gpxe/command.h>
-#include <gpxe/shell.h>
+#include <ipxe/command.h>
+#include <ipxe/shell.h>
 
 /** @file
  *
@@ -32,7 +32,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
  */
 
 /** The shell prompt string */
-static const char shell_prompt[] = "gPXE> ";
+static const char shell_prompt[] = "iPXE> ";
 
 /** Flag set in order to exit shell */
 static int exit_flag = 0;
diff --git a/src/hci/shell_banner.c b/src/hci/shell_banner.c
index dbe3767..8d2a5d0 100644
--- a/src/hci/shell_banner.c
+++ b/src/hci/shell_banner.c
@@ -22,8 +22,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <console.h>
 #include <unistd.h>
 #include <config/general.h>
-#include <gpxe/keys.h>
-#include <gpxe/shell_banner.h>
+#include <ipxe/keys.h>
+#include <ipxe/shell_banner.h>
 
 /** @file
  *
@@ -45,7 +45,7 @@ int shell_banner ( void ) {
 		return enter_shell;
 	}
 
-	printf ( "\nPress Ctrl-B for the gPXE command line..." );
+	printf ( "\nPress Ctrl-B for the iPXE command line..." );
 
 	/* Wait for key */
 	for ( wait_count = 0 ; wait_count < BANNER_TIMEOUT ; wait_count++ ) {
diff --git a/src/hci/strerror.c b/src/hci/strerror.c
index 94547dd..1b75f98 100644
--- a/src/hci/strerror.c
+++ b/src/hci/strerror.c
@@ -1,7 +1,7 @@
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
-#include <gpxe/errortab.h>
+#include <ipxe/errortab.h>
 
 /** @file
  *
@@ -52,7 +52,7 @@ static struct errortab * find_closest_error ( int errno ) {
 	if ( ( errortab = find_error ( errno ) ) != NULL )
 		return errortab;
 
-	/* Second, try masking off the gPXE-specific bit and seeing if
+	/* Second, try masking off the iPXE-specific bit and seeing if
 	 * we have an entry for the generic POSIX error message.
 	 */
 	if ( ( errortab = find_error ( errno & 0x7f0000ff ) ) != NULL )
diff --git a/src/hci/tui/login_ui.c b/src/hci/tui/login_ui.c
index b80bf27..bcfd09c 100644
--- a/src/hci/tui/login_ui.c
+++ b/src/hci/tui/login_ui.c
@@ -28,10 +28,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <errno.h>
 #include <curses.h>
 #include <console.h>
-#include <gpxe/settings.h>
-#include <gpxe/editbox.h>
-#include <gpxe/keys.h>
-#include <gpxe/login_ui.h>
+#include <ipxe/settings.h>
+#include <ipxe/editbox.h>
+#include <ipxe/keys.h>
+#include <ipxe/login_ui.h>
 
 /* Colour pairs */
 #define CPAIR_NORMAL		1
diff --git a/src/hci/tui/settings_ui.c b/src/hci/tui/settings_ui.c
index 74ce6af..be5357a 100644
--- a/src/hci/tui/settings_ui.c
+++ b/src/hci/tui/settings_ui.c
@@ -24,10 +24,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <curses.h>
 #include <console.h>
-#include <gpxe/settings.h>
-#include <gpxe/editbox.h>
-#include <gpxe/keys.h>
-#include <gpxe/settings_ui.h>
+#include <ipxe/settings.h>
+#include <ipxe/editbox.h>
+#include <ipxe/keys.h>
+#include <ipxe/settings_ui.h>
 
 /** @file
  *
@@ -301,7 +301,7 @@ static void alert ( const char *fmt, ... ) {
  */
 static void draw_title_row ( void ) {
 	attron ( A_BOLD );
-	msg ( TITLE_ROW, "gPXE option configuration console" );
+	msg ( TITLE_ROW, "iPXE option configuration console" );
 	attroff ( A_BOLD );
 }
 
diff --git a/src/hci/wireless_errors.c b/src/hci/wireless_errors.c
index 46006f9..0909c01 100644
--- a/src/hci/wireless_errors.c
+++ b/src/hci/wireless_errors.c
@@ -19,7 +19,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <errno.h>
-#include <gpxe/errortab.h>
+#include <ipxe/errortab.h>
 
 /* Record errors as though they come from the 802.11 stack */
 #undef ERRFILE
@@ -32,7 +32,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
  * strerror.
  */
 struct errortab wireless_errors[] __errortab = {
-	/* gPXE 802.11 stack errors */
+	/* iPXE 802.11 stack errors */
 	{ EINVAL | EUNIQ_01, "Packet too short" },
 	{ EINVAL | EUNIQ_02, "Packet 802.11 version not supported" },
 	{ EINVAL | EUNIQ_03, "Packet not a data packet" },
diff --git a/src/image/efi_image.c b/src/image/efi_image.c
index 60d150a..6eb943b 100644
--- a/src/image/efi_image.c
+++ b/src/image/efi_image.c
@@ -19,9 +19,9 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <errno.h>
-#include <gpxe/efi/efi.h>
-#include <gpxe/image.h>
-#include <gpxe/features.h>
+#include <ipxe/efi/efi.h>
+#include <ipxe/image.h>
+#include <ipxe/features.h>
 
 FEATURE ( FEATURE_IMAGE, "EFI", DHCP_EB_FEATURE_EFI, 1 );
 
diff --git a/src/image/elf.c b/src/image/elf.c
index a0ec065..740fd3a 100644
--- a/src/image/elf.c
+++ b/src/image/elf.c
@@ -30,10 +30,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <errno.h>
 #include <elf.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/segment.h>
-#include <gpxe/image.h>
-#include <gpxe/elf.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/segment.h>
+#include <ipxe/image.h>
+#include <ipxe/elf.h>
 
 typedef Elf32_Ehdr	Elf_Ehdr;
 typedef Elf32_Phdr	Elf_Phdr;
diff --git a/src/image/embedded.c b/src/image/embedded.c
index 58a14ea..b3ed8cc 100644
--- a/src/image/embedded.c
+++ b/src/image/embedded.c
@@ -2,16 +2,16 @@
  *
  * Embedded image support
  *
- * Embedded images are images built into the gPXE binary and do not require
+ * Embedded images are images built into the iPXE binary and do not require
  * fetching over the network.
  */
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <string.h>
-#include <gpxe/image.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/init.h>
+#include <ipxe/image.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/init.h>
 
 /**
  * Free embedded image
diff --git a/src/image/script.c b/src/image/script.c
index 0835ecb..61f5a99 100644
--- a/src/image/script.c
+++ b/src/image/script.c
@@ -21,7 +21,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 /**
  * @file
  *
- * gPXE scripts
+ * iPXE scripts
  *
  */
 
@@ -29,7 +29,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
-#include <gpxe/image.h>
+#include <ipxe/image.h>
 
 struct image_type script_image_type __image_type ( PROBE_NORMAL );
 
@@ -91,7 +91,7 @@ static int script_exec ( struct image *image ) {
  * @ret rc		Return status code
  */
 static int script_load ( struct image *image ) {
-	static const char magic[] = "#!gpxe";
+	static const char magic[] = "#!ipxe";
 	char test[ sizeof ( magic ) - 1 /* NUL */ + 1 /* terminating space */];
 
 	/* Sanity check */
diff --git a/src/image/segment.c b/src/image/segment.c
index e247453..9099c8f 100644
--- a/src/image/segment.c
+++ b/src/image/segment.c
@@ -26,10 +26,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
  */
 
 #include <errno.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/memmap.h>
-#include <gpxe/errortab.h>
-#include <gpxe/segment.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/memmap.h>
+#include <ipxe/errortab.h>
+#include <ipxe/segment.h>
 
 /**
  * Prepare segment for loading
diff --git a/src/include/assert.h b/src/include/assert.h
index cc784bc..40a00a2 100644
--- a/src/include/assert.h
+++ b/src/include/assert.h
@@ -54,7 +54,7 @@ assert_printf ( const char *fmt, ... ) asm ( "printf" );
  * If the condition is not true, the link will fail with an unresolved
  * symbol (error_symbol).
  *
- * This macro is gPXE-specific.  Do not use this macro in code
+ * This macro is iPXE-specific.  Do not use this macro in code
  * intended to be portable.
  *
  */
diff --git a/src/include/compiler.h b/src/include/compiler.h
index ea81fc8..a9067c9 100644
--- a/src/include/compiler.h
+++ b/src/include/compiler.h
@@ -538,7 +538,7 @@ int __debug_disable;
  * @defgroup licences Licence declarations
  *
  * For reasons that are partly historical, various different files
- * within the gPXE codebase have differing licences.
+ * within the iPXE codebase have differing licences.
  *
  * @{
  */
diff --git a/src/include/console.h b/src/include/console.h
index 62fedf5..da26c36 100644
--- a/src/include/console.h
+++ b/src/include/console.h
@@ -1,7 +1,7 @@
 #ifndef CONSOLE_H
 #define CONSOLE_H
 
-#include <gpxe/tables.h>
+#include <ipxe/tables.h>
 
 /** @file
  *
diff --git a/src/include/curses.h b/src/include/curses.h
index e2c5af2..2069779 100644
--- a/src/include/curses.h
+++ b/src/include/curses.h
@@ -194,9 +194,9 @@ extern unsigned short _LINES;
 #define COLORS		COLOURS
 
 /*
- * KEY code constants are define in gpxe/keys.h
+ * KEY code constants are define in ipxe/keys.h
  */
-#include <gpxe/keys.h>
+#include <ipxe/keys.h>
 
 //extern int addch ( const chtype * );
 //extern int addchnstr ( const chtype *, int );
diff --git a/src/include/errno.h b/src/include/errno.h
index 56095ec..0757fad 100644
--- a/src/include/errno.h
+++ b/src/include/errno.h
@@ -7,7 +7,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
  *
  * Error codes
  *
- * Return status codes as used within gPXE are designed to allow for
+ * Return status codes as used within iPXE are designed to allow for
  * maximum visibility into the source of an error even in an end-user
  * build with no debugging.  They are constructed as follows:
  *
@@ -72,7 +72,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
  */
 
 /* Get definitions for file identifiers */
-#include <gpxe/errfile.h>
+#include <ipxe/errfile.h>
 
 /* If we do not have a valid file identifier, generate a compiler
  * warning upon usage of any error codes.  (Don't just use a #warning,
@@ -85,7 +85,7 @@ extern char missing_errfile_declaration[] __attribute__ (( deprecated ));
 #define ERRFILE ( 0 * ( ( int ) missing_errfile_declaration ) )
 #endif
 
-/** Derive PXENV_STATUS code from gPXE error number */
+/** Derive PXENV_STATUS code from iPXE error number */
 #define PXENV_STATUS( rc ) ( (-(rc)) & 0x00ff )
 
 /**
diff --git a/src/include/etherboot.h b/src/include/etherboot.h
index ad44e8a..3241294 100644
--- a/src/include/etherboot.h
+++ b/src/include/etherboot.h
@@ -15,9 +15,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <unistd.h>
 #include <strings.h>
 #include <console.h>
-#include <gpxe/timer.h>
-#include <gpxe/if_arp.h>
-#include <gpxe/if_ether.h>
+#include <ipxe/timer.h>
+#include <ipxe/if_arp.h>
+#include <ipxe/if_ether.h>
 
 typedef unsigned long Address;
 
diff --git a/src/include/gpxe/acpi.h b/src/include/ipxe/acpi.h
index 12edda9..eabbec3 100644
--- a/src/include/gpxe/acpi.h
+++ b/src/include/ipxe/acpi.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ACPI_H
-#define _GPXE_ACPI_H
+#ifndef _IPXE_ACPI_H
+#define _IPXE_ACPI_H
 
 /** @file
  *
@@ -40,4 +40,4 @@ struct acpi_description_header {
 
 extern void acpi_fix_checksum ( struct acpi_description_header *acpi );
 
-#endif /* _GPXE_ACPI_H */
+#endif /* _IPXE_ACPI_H */
diff --git a/src/include/gpxe/aes.h b/src/include/ipxe/aes.h
index fc1694b..5d645b2 100644
--- a/src/include/gpxe/aes.h
+++ b/src/include/ipxe/aes.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_AES_H
-#define _GPXE_AES_H
+#ifndef _IPXE_AES_H
+#define _IPXE_AES_H
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
@@ -27,4 +27,4 @@ extern struct cipher_algorithm aes_cbc_algorithm;
 int aes_wrap ( const void *kek, const void *src, void *dest, int nblk );
 int aes_unwrap ( const void *kek, const void *src, void *dest, int nblk );
 
-#endif /* _GPXE_AES_H */
+#endif /* _IPXE_AES_H */
diff --git a/src/include/gpxe/ansiesc.h b/src/include/ipxe/ansiesc.h
index 85f7a9f..35438e4 100644
--- a/src/include/gpxe/ansiesc.h
+++ b/src/include/ipxe/ansiesc.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ANSIESC_H
-#define _GPXE_ANSIESC_H
+#ifndef _IPXE_ANSIESC_H
+#define _IPXE_ANSIESC_H
 
 /** @file
  *
@@ -117,4 +117,4 @@ struct ansiesc_context {
 
 extern int ansiesc_process ( struct ansiesc_context *ctx, int c );
 
-#endif /* _GPXE_ANSIESC_H */
+#endif /* _IPXE_ANSIESC_H */
diff --git a/src/include/gpxe/aoe.h b/src/include/ipxe/aoe.h
index 6b42fd5..d2a1285 100644
--- a/src/include/gpxe/aoe.h
+++ b/src/include/ipxe/aoe.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_AOE_H
-#define _GPXE_AOE_H
+#ifndef _IPXE_AOE_H
+#define _IPXE_AOE_H
 
 /** @file
  *
@@ -10,10 +10,10 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/list.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/retry.h>
-#include <gpxe/ata.h>
+#include <ipxe/list.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/retry.h>
+#include <ipxe/ata.h>
 
 /** An AoE config command */
 struct aoecfg {
@@ -147,4 +147,4 @@ extern void aoe_detach ( struct ata_device *ata );
 extern int aoe_attach ( struct ata_device *ata, struct net_device *netdev,
 			const char *root_path );
 
-#endif /* _GPXE_AOE_H */
+#endif /* _IPXE_AOE_H */
diff --git a/src/include/gpxe/api.h b/src/include/ipxe/api.h
index ff2ba59..838b893 100644
--- a/src/include/gpxe/api.h
+++ b/src/include/ipxe/api.h
@@ -1,11 +1,11 @@
-#ifndef _GPXE_API_H
-#define _GPXE_API_H
+#ifndef _IPXE_API_H
+#define _IPXE_API_H
 
 /** @file
  *
- * gPXE internal APIs
+ * iPXE internal APIs
  *
- * There are various formally-defined APIs internal to gPXE, with
+ * There are various formally-defined APIs internal to iPXE, with
  * several differing implementations specific to particular execution
  * environments (e.g. PC BIOS, EFI, LinuxBIOS).
  *
@@ -81,4 +81,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 /** @} */
 
-#endif /* _GPXE_API_H */
+#endif /* _IPXE_API_H */
diff --git a/src/include/gpxe/arc4.h b/src/include/ipxe/arc4.h
index 9917628..9da972b 100644
--- a/src/include/gpxe/arc4.h
+++ b/src/include/ipxe/arc4.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ARC4_H
-#define _GPXE_ARC4_H
+#ifndef _IPXE_ARC4_H
+#define _IPXE_ARC4_H
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
@@ -19,4 +19,4 @@ extern struct cipher_algorithm arc4_algorithm;
 void arc4_skip ( const void *key, size_t keylen, size_t skip,
 		 const void *src, void *dst, size_t msglen );
 
-#endif /* _GPXE_ARC4_H */
+#endif /* _IPXE_ARC4_H */
diff --git a/src/include/gpxe/arp.h b/src/include/ipxe/arp.h
index 0623d35..373a95d 100644
--- a/src/include/gpxe/arp.h
+++ b/src/include/ipxe/arp.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ARP_H
-#define _GPXE_ARP_H
+#ifndef _IPXE_ARP_H
+#define _IPXE_ARP_H
 
 /** @file
  *
@@ -9,7 +9,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/tables.h>
+#include <ipxe/tables.h>
 
 struct net_device;
 struct net_protocol;
@@ -43,4 +43,4 @@ extern int arp_resolve ( struct net_device *netdev,
 			 const void *source_net_addr,
 			 void *dest_ll_addr );
 
-#endif /* _GPXE_ARP_H */
+#endif /* _IPXE_ARP_H */
diff --git a/src/include/gpxe/asn1.h b/src/include/ipxe/asn1.h
index 477c209..85e480e 100644
--- a/src/include/gpxe/asn1.h
+++ b/src/include/ipxe/asn1.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ASN1_H
-#define _GPXE_ASN1_H
+#ifndef _IPXE_ASN1_H
+#define _IPXE_ASN1_H
 
 /** @file
  *
@@ -31,4 +31,4 @@ struct asn1_cursor {
 extern int asn1_enter ( struct asn1_cursor *cursor, unsigned int type );
 extern int asn1_skip ( struct asn1_cursor *cursor, unsigned int type );
 
-#endif /* _GPXE_ASN1_H */
+#endif /* _IPXE_ASN1_H */
diff --git a/src/include/gpxe/ata.h b/src/include/ipxe/ata.h
index 3c56584..043e370 100644
--- a/src/include/gpxe/ata.h
+++ b/src/include/ipxe/ata.h
@@ -1,10 +1,10 @@
-#ifndef _GPXE_ATA_H
-#define _GPXE_ATA_H
+#ifndef _IPXE_ATA_H
+#define _IPXE_ATA_H
 
 #include <stdint.h>
-#include <gpxe/blockdev.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/refcnt.h>
+#include <ipxe/blockdev.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/refcnt.h>
 
 /** @file
  *
@@ -206,4 +206,4 @@ struct ata_device {
 
 extern int init_atadev ( struct ata_device *ata );
 
-#endif /* _GPXE_ATA_H */
+#endif /* _IPXE_ATA_H */
diff --git a/src/include/gpxe/base64.h b/src/include/ipxe/base64.h
index e38bef0..1295941 100644
--- a/src/include/gpxe/base64.h
+++ b/src/include/ipxe/base64.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_BASE64_H
-#define _GPXE_BASE64_H
+#ifndef _IPXE_BASE64_H
+#define _IPXE_BASE64_H
 
 /** @file
  *
@@ -23,4 +23,4 @@ static inline size_t base64_encoded_len ( size_t raw_len ) {
 
 extern void base64_encode ( const char *raw, char *encoded );
 
-#endif /* _GPXE_BASE64_H */
+#endif /* _IPXE_BASE64_H */
diff --git a/src/include/gpxe/bitbash.h b/src/include/ipxe/bitbash.h
index f2ba9f7..62b54b1 100644
--- a/src/include/gpxe/bitbash.h
+++ b/src/include/ipxe/bitbash.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_BITBASH_H
-#define _GPXE_BITBASH_H
+#ifndef _IPXE_BITBASH_H
+#define _IPXE_BITBASH_H
 
 /** @file
  *
@@ -49,4 +49,4 @@ extern void write_bit ( struct bit_basher *basher, unsigned int bit_id,
 			unsigned long data );
 extern int read_bit ( struct bit_basher *basher, unsigned int bit_id );
 
-#endif /* _GPXE_BITBASH_H */
+#endif /* _IPXE_BITBASH_H */
diff --git a/src/include/gpxe/bitmap.h b/src/include/ipxe/bitmap.h
index d6911a5..38d1f22 100644
--- a/src/include/gpxe/bitmap.h
+++ b/src/include/ipxe/bitmap.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_BITMAP_H
-#define _GPXE_BITMAP_H
+#ifndef _IPXE_BITMAP_H
+#define _IPXE_BITMAP_H
 
 /** @file
  *
@@ -82,4 +82,4 @@ static inline int bitmap_full ( struct bitmap *bitmap ) {
 	return ( bitmap->first_gap == bitmap->length );
 }
 
-#endif /* _GPXE_BITMAP_H */
+#endif /* _IPXE_BITMAP_H */
diff --git a/src/include/gpxe/bitops.h b/src/include/ipxe/bitops.h
index 8db3431..0599168 100644
--- a/src/include/gpxe/bitops.h
+++ b/src/include/ipxe/bitops.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_BITOPS_H
-#define _GPXE_BITOPS_H
+#ifndef _IPXE_BITOPS_H
+#define _IPXE_BITOPS_H
 
 /*
  * Copyright (C) 2008 Michael Brown <mbrown@fensystems.co.uk>.
@@ -227,4 +227,4 @@ typedef unsigned char pseudo_bit_t;
 		*__ptr |= cpu_to_BIT64 ( __value << __shift );		      \
 	} while ( 0 )
 
-#endif /* _GPXE_BITOPS_H */
+#endif /* _IPXE_BITOPS_H */
diff --git a/src/include/gpxe/blockdev.h b/src/include/ipxe/blockdev.h
index cf28524..5c1ab13 100644
--- a/src/include/gpxe/blockdev.h
+++ b/src/include/ipxe/blockdev.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_BLOCKDEV_H
-#define _GPXE_BLOCKDEV_H
+#ifndef _IPXE_BLOCKDEV_H
+#define _IPXE_BLOCKDEV_H
 
 /**
  * @file
@@ -10,7 +10,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/uaccess.h>
+#include <ipxe/uaccess.h>
 
 struct block_device;
 
@@ -50,4 +50,4 @@ struct block_device {
 	uint64_t blocks;
 };
 
-#endif /* _GPXE_BLOCKDEV_H */
+#endif /* _IPXE_BLOCKDEV_H */
diff --git a/src/include/gpxe/cbc.h b/src/include/ipxe/cbc.h
index 1262f1d..fae3765 100644
--- a/src/include/gpxe/cbc.h
+++ b/src/include/ipxe/cbc.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_CBC_H
-#define _GPXE_CBC_H
+#ifndef _IPXE_CBC_H
+#define _IPXE_CBC_H
 
 /** @file
  *
@@ -9,7 +9,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/crypto.h>
+#include <ipxe/crypto.h>
 
 /**
  * Set key
@@ -97,4 +97,4 @@ struct cipher_algorithm _cbc_cipher = {					\
 	.decrypt	= _cbc_name ## _decrypt,			\
 };
 
-#endif /* _GPXE_CBC_H */
+#endif /* _IPXE_CBC_H */
diff --git a/src/include/gpxe/chap.h b/src/include/ipxe/chap.h
index e86ede3..fce48f3 100644
--- a/src/include/gpxe/chap.h
+++ b/src/include/ipxe/chap.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_CHAP_H
-#define _GPXE_CHAP_H
+#ifndef _IPXE_CHAP_H
+#define _IPXE_CHAP_H
 
 /** @file
  *
@@ -10,7 +10,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/md5.h>
+#include <ipxe/md5.h>
 
 struct digest_algorithm;
 
@@ -50,4 +50,4 @@ static inline void chap_set_identifier ( struct chap_response *chap,
 	chap_update ( chap, &ident_byte, sizeof ( ident_byte ) );
 }
 
-#endif /* _GPXE_CHAP_H */
+#endif /* _IPXE_CHAP_H */
diff --git a/src/include/gpxe/command.h b/src/include/ipxe/command.h
index 51ca6d6..a7d0ae4 100644
--- a/src/include/gpxe/command.h
+++ b/src/include/ipxe/command.h
@@ -1,9 +1,9 @@
-#ifndef _GPXE_COMMAND_H
-#define _GPXE_COMMAND_H
+#ifndef _IPXE_COMMAND_H
+#define _IPXE_COMMAND_H
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/tables.h>
+#include <ipxe/tables.h>
 
 /** A command-line command */
 struct command {
@@ -23,4 +23,4 @@ struct command {
 
 #define __command __table_entry ( COMMANDS, 01 )
 
-#endif /* _GPXE_COMMAND_H */
+#endif /* _IPXE_COMMAND_H */
diff --git a/src/include/gpxe/cpio.h b/src/include/ipxe/cpio.h
index f462cec..2772328 100644
--- a/src/include/gpxe/cpio.h
+++ b/src/include/ipxe/cpio.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_CPIO_H
-#define _GPXE_CPIO_H
+#ifndef _IPXE_CPIO_H
+#define _IPXE_CPIO_H
 
 /** @file
  *
@@ -50,4 +50,4 @@ struct cpio_header {
 
 extern void cpio_set_field ( char *field, unsigned long value );
 
-#endif /* _GPXE_CPIO_H */
+#endif /* _IPXE_CPIO_H */
diff --git a/src/include/gpxe/crc32.h b/src/include/ipxe/crc32.h
index d1c7437..38ac1b3 100644
--- a/src/include/gpxe/crc32.h
+++ b/src/include/ipxe/crc32.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_CRC32_H
-#define _GPXE_CRC32_H
+#ifndef _IPXE_CRC32_H
+#define _IPXE_CRC32_H
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
diff --git a/src/include/gpxe/crypto.h b/src/include/ipxe/crypto.h
index ecda5f6..9383c07 100644
--- a/src/include/gpxe/crypto.h
+++ b/src/include/ipxe/crypto.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_CRYPTO_H
-#define _GPXE_CRYPTO_H
+#ifndef _IPXE_CRYPTO_H
+#define _IPXE_CRYPTO_H
 
 /** @file
  *
@@ -153,4 +153,4 @@ extern struct pubkey_algorithm pubkey_null;
 
 void get_random_bytes ( void *buf, size_t len );
 
-#endif /* _GPXE_CRYPTO_H */
+#endif /* _IPXE_CRYPTO_H */
diff --git a/src/include/gpxe/device.h b/src/include/ipxe/device.h
index 1db3ff9..8567530 100644
--- a/src/include/gpxe/device.h
+++ b/src/include/ipxe/device.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_DEVICE_H
-#define _GPXE_DEVICE_H
+#ifndef _IPXE_DEVICE_H
+#define _IPXE_DEVICE_H
 
 /**
  * @file
@@ -10,8 +10,8 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/list.h>
-#include <gpxe/tables.h>
+#include <ipxe/list.h>
+#include <ipxe/tables.h>
 
 /** A hardware device description */
 struct device_description {
@@ -110,4 +110,4 @@ struct root_driver {
 /** Declare a root device */
 #define __root_device __table_entry ( ROOT_DEVICES, 01 )
 
-#endif /* _GPXE_DEVICE_H */
+#endif /* _IPXE_DEVICE_H */
diff --git a/src/include/gpxe/dhcp.h b/src/include/ipxe/dhcp.h
index ebfe8ed..bbfa293 100644
--- a/src/include/gpxe/dhcp.h
+++ b/src/include/ipxe/dhcp.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_DHCP_H
-#define _GPXE_DHCP_H
+#ifndef _IPXE_DHCP_H
+#define _IPXE_DHCP_H
 
 /** @file
  *
@@ -10,13 +10,13 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/in.h>
-#include <gpxe/list.h>
-#include <gpxe/refcnt.h>
-#include <gpxe/tables.h>
-#include <gpxe/uuid.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/uaccess.h>
+#include <ipxe/in.h>
+#include <ipxe/list.h>
+#include <ipxe/refcnt.h>
+#include <ipxe/tables.h>
+#include <ipxe/uuid.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/uaccess.h>
 
 struct job_interface;
 struct dhcp_options;
@@ -291,7 +291,7 @@ struct dhcp_client_uuid {
 
 /** Keep SAN drive registered
  *
- * If set to a non-zero value, gPXE will not detach any SAN drive
+ * If set to a non-zero value, iPXE will not detach any SAN drive
  * after failing to boot from it.  (This option is required in order
  * to perform a Windows Server 2008 installation direct to an iSCSI
  * target.)
@@ -305,7 +305,7 @@ struct dhcp_client_uuid {
 
 /** Skip PXE DHCP protocol extensions such as ProxyDHCP
  *
- * If set to a non-zero value, gPXE will not wait for ProxyDHCP offers
+ * If set to a non-zero value, iPXE will not wait for ProxyDHCP offers
  * and will ignore any PXE-specific DHCP options that it receives.
  */
 #define DHCP_EB_NO_PXEDHCP DHCP_ENCAP_OPT ( DHCP_EB_ENCAP, 0xb0 )
@@ -386,7 +386,7 @@ struct dhcp_netdev_desc {
  */
 #define DHCP_EB_REVERSE_PASSWORD DHCP_ENCAP_OPT ( DHCP_EB_ENCAP, 0xc1 )
 
-/** gPXE version number */
+/** iPXE version number */
 #define DHCP_EB_VERSION DHCP_ENCAP_OPT ( DHCP_EB_ENCAP, 0xeb )
 
 /** iSCSI primary target IQN */
@@ -634,4 +634,4 @@ __weak_decl ( void, get_cached_dhcpack, ( void ), (), );
 
 extern void store_cached_dhcpack ( userptr_t data, size_t len );
 
-#endif /* _GPXE_DHCP_H */
+#endif /* _IPXE_DHCP_H */
diff --git a/src/include/gpxe/dhcpopts.h b/src/include/ipxe/dhcpopts.h
index 3d90f41..fea99d5 100644
--- a/src/include/gpxe/dhcpopts.h
+++ b/src/include/ipxe/dhcpopts.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_DHCPOPTS_H
-#define _GPXE_DHCPOPTS_H
+#ifndef _IPXE_DHCPOPTS_H
+#define _IPXE_DHCPOPTS_H
 
 /** @file
  *
@@ -31,4 +31,4 @@ extern int dhcpopt_fetch ( struct dhcp_options *options, unsigned int tag,
 extern void dhcpopt_init ( struct dhcp_options *options,
 			   void *data, size_t max_len );
 
-#endif /* _GPXE_DHCPOPTS_H */
+#endif /* _IPXE_DHCPOPTS_H */
diff --git a/src/include/gpxe/dhcppkt.h b/src/include/ipxe/dhcppkt.h
index 6007cca..5709cc7 100644
--- a/src/include/gpxe/dhcppkt.h
+++ b/src/include/ipxe/dhcppkt.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_DHCPPKT_H
-#define _GPXE_DHCPPKT_H
+#ifndef _IPXE_DHCPPKT_H
+#define _IPXE_DHCPPKT_H
 
 /** @file
  *
@@ -9,9 +9,9 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/dhcp.h>
-#include <gpxe/dhcpopts.h>
-#include <gpxe/refcnt.h>
+#include <ipxe/dhcp.h>
+#include <ipxe/dhcpopts.h>
+#include <ipxe/refcnt.h>
 
 /**
  * A DHCP packet
@@ -61,4 +61,4 @@ extern int dhcppkt_fetch ( struct dhcp_packet *dhcppkt, unsigned int tag,
 extern void dhcppkt_init ( struct dhcp_packet *dhcppkt, 
 			   struct dhcphdr *data, size_t len );
 
-#endif /* _GPXE_DHCPPKT_H */
+#endif /* _IPXE_DHCPPKT_H */
diff --git a/src/include/gpxe/dns.h b/src/include/ipxe/dns.h
index 9e5e874..1c42760 100644
--- a/src/include/gpxe/dns.h
+++ b/src/include/ipxe/dns.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_DNS_H
-#define _GPXE_DNS_H
+#ifndef _IPXE_DNS_H
+#define _IPXE_DNS_H
 
 /** @file
  *
@@ -10,7 +10,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/in.h>
+#include <ipxe/in.h>
 
 /*
  * Constants
@@ -89,4 +89,4 @@ union dns_rr_info {
 	struct dns_rr_info_cname cname;
 };
 
-#endif /* _GPXE_DNS_H */
+#endif /* _IPXE_DNS_H */
diff --git a/src/include/gpxe/downloader.h b/src/include/ipxe/downloader.h
index 7f21e07..023bf94 100644
--- a/src/include/gpxe/downloader.h
+++ b/src/include/ipxe/downloader.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_DOWNLOADER_H
-#define _GPXE_DOWNLOADER_H
+#ifndef _IPXE_DOWNLOADER_H
+#define _IPXE_DOWNLOADER_H
 
 /** @file
  *
@@ -16,4 +16,4 @@ extern int create_downloader ( struct job_interface *job, struct image *image,
 			       int ( * register_image ) ( struct image *image ),
 			       int type, ... );
 
-#endif /* _GPXE_DOWNLOADER_H */
+#endif /* _IPXE_DOWNLOADER_H */
diff --git a/src/include/gpxe/eapol.h b/src/include/ipxe/eapol.h
index c9855d0..43d891c 100644
--- a/src/include/gpxe/eapol.h
+++ b/src/include/ipxe/eapol.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef _GPXE_EAPOL_H
-#define _GPXE_EAPOL_H
+#ifndef _IPXE_EAPOL_H
+#define _IPXE_EAPOL_H
 
 /** @file
  *
@@ -26,7 +26,7 @@
  * them are elsewhere.
  */
 
-#include <gpxe/tables.h>
+#include <ipxe/tables.h>
 #include <stdint.h>
 
 FILE_LICENCE ( GPL2_OR_LATER );
@@ -109,4 +109,4 @@ struct eapol_handler
 extern struct net_protocol eapol_protocol __net_protocol;
 
 
-#endif /* _GPXE_EAPOL_H */
+#endif /* _IPXE_EAPOL_H */
diff --git a/src/include/gpxe/editbox.h b/src/include/ipxe/editbox.h
index b7cc411..9122dbb 100644
--- a/src/include/gpxe/editbox.h
+++ b/src/include/ipxe/editbox.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_EDITBOX_H
-#define _GPXE_EDITBOX_H
+#ifndef _IPXE_EDITBOX_H
+#define _IPXE_EDITBOX_H
 
 /** @file
  *
@@ -10,7 +10,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <curses.h>
-#include <gpxe/editstring.h>
+#include <ipxe/editstring.h>
 
 /** An editable text box widget */
 struct edit_box {
@@ -58,4 +58,4 @@ static inline int edit_editbox ( struct edit_box *box, int key ) {
 	return edit_string ( &box->string, key );
 }
 
-#endif /* _GPXE_EDITBOX_H */
+#endif /* _IPXE_EDITBOX_H */
diff --git a/src/include/gpxe/editstring.h b/src/include/ipxe/editstring.h
index 48c1baa..5c1a18b 100644
--- a/src/include/gpxe/editstring.h
+++ b/src/include/ipxe/editstring.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_EDITSTRING_H
-#define _GPXE_EDITSTRING_H
+#ifndef _IPXE_EDITSTRING_H
+#define _IPXE_EDITSTRING_H
 
 /** @file
  *
@@ -30,4 +30,4 @@ struct edit_string {
 
 extern int edit_string ( struct edit_string *string, int key ) __nonnull;
 
-#endif /* _GPXE_EDITSTRING_H */
+#endif /* _IPXE_EDITSTRING_H */
diff --git a/src/include/gpxe/efi/Base.h b/src/include/ipxe/efi/Base.h
index b2552d8..14fd9cb 100644
--- a/src/include/gpxe/efi/Base.h
+++ b/src/include/ipxe/efi/Base.h
@@ -24,7 +24,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //
 // Include processor specific binding
 //
-#include <gpxe/efi/ProcessorBind.h>
+#include <ipxe/efi/ProcessorBind.h>
 
 typedef struct {
   UINT32  Data1;
diff --git a/src/include/gpxe/efi/Guid/PcAnsi.h b/src/include/ipxe/efi/Guid/PcAnsi.h
index 1dab310..1dab310 100644
--- a/src/include/gpxe/efi/Guid/PcAnsi.h
+++ b/src/include/ipxe/efi/Guid/PcAnsi.h
diff --git a/src/include/gpxe/efi/Guid/SmBios.h b/src/include/ipxe/efi/Guid/SmBios.h
index c6c7f77..c6c7f77 100644
--- a/src/include/gpxe/efi/Guid/SmBios.h
+++ b/src/include/ipxe/efi/Guid/SmBios.h
diff --git a/src/include/gpxe/efi/Ia32/ProcessorBind.h b/src/include/ipxe/efi/Ia32/ProcessorBind.h
index 5a3a918..5a3a918 100644
--- a/src/include/gpxe/efi/Ia32/ProcessorBind.h
+++ b/src/include/ipxe/efi/Ia32/ProcessorBind.h
diff --git a/src/include/gpxe/efi/IndustryStandard/Pci22.h b/src/include/ipxe/efi/IndustryStandard/Pci22.h
index 5b96a56..5b96a56 100644
--- a/src/include/gpxe/efi/IndustryStandard/Pci22.h
+++ b/src/include/ipxe/efi/IndustryStandard/Pci22.h
diff --git a/src/include/gpxe/efi/IndustryStandard/PeImage.h b/src/include/ipxe/efi/IndustryStandard/PeImage.h
index 73b3a5a..73b3a5a 100644
--- a/src/include/gpxe/efi/IndustryStandard/PeImage.h
+++ b/src/include/ipxe/efi/IndustryStandard/PeImage.h
diff --git a/src/include/gpxe/efi/LICENCE b/src/include/ipxe/efi/LICENCE
index 6aa2b2f..6c28e6f 100644
--- a/src/include/gpxe/efi/LICENCE
+++ b/src/include/ipxe/efi/LICENCE
@@ -37,4 +37,4 @@ following licence:
 
 This licence applies only to files that are part of the EFI
 Development Kit.  Other files may contain their own licence terms, or
-may fall under the standard gPXE GPL licence.
+may fall under the standard iPXE GPL licence.
diff --git a/src/include/gpxe/efi/Pi/PiBootMode.h b/src/include/ipxe/efi/Pi/PiBootMode.h
index bebca22..a33bdf4 100644
--- a/src/include/gpxe/efi/Pi/PiBootMode.h
+++ b/src/include/ipxe/efi/Pi/PiBootMode.h
@@ -18,7 +18,7 @@
 #ifndef __PI_BOOT_MODE_H__
 #define __PI_BOOT_MODE_H__
 
-#include <gpxe/efi/ProcessorBind.h>
+#include <ipxe/efi/ProcessorBind.h>
 
 ///
 /// EFI boot mode
diff --git a/src/include/gpxe/efi/Pi/PiDependency.h b/src/include/ipxe/efi/Pi/PiDependency.h
index 73f6027..73f6027 100644
--- a/src/include/gpxe/efi/Pi/PiDependency.h
+++ b/src/include/ipxe/efi/Pi/PiDependency.h
diff --git a/src/include/gpxe/efi/Pi/PiDxeCis.h b/src/include/ipxe/efi/Pi/PiDxeCis.h
index a924888..514295a 100644
--- a/src/include/gpxe/efi/Pi/PiDxeCis.h
+++ b/src/include/ipxe/efi/Pi/PiDxeCis.h
@@ -18,7 +18,7 @@
 #ifndef __PI_DXECIS_H__
 #define __PI_DXECIS_H__
 
-#include <gpxe/efi/Pi/PiMultiPhase.h>
+#include <ipxe/efi/Pi/PiMultiPhase.h>
 
 ///
 /// Global Coherencey Domain types - Memory type
diff --git a/src/include/gpxe/efi/Pi/PiFirmwareFile.h b/src/include/ipxe/efi/Pi/PiFirmwareFile.h
index be6f8bd..973a2b5 100644
--- a/src/include/gpxe/efi/Pi/PiFirmwareFile.h
+++ b/src/include/ipxe/efi/Pi/PiFirmwareFile.h
@@ -19,7 +19,7 @@
 #ifndef __PI_FIRMWARE_FILE_H__
 #define __PI_FIRMWARE_FILE_H__
 
-#include <gpxe/efi/ProcessorBind.h>
+#include <ipxe/efi/ProcessorBind.h>
 
 #pragma pack(1)
 ///
diff --git a/src/include/gpxe/efi/Pi/PiFirmwareVolume.h b/src/include/ipxe/efi/Pi/PiFirmwareVolume.h
index 277b704..5f530e6 100644
--- a/src/include/gpxe/efi/Pi/PiFirmwareVolume.h
+++ b/src/include/ipxe/efi/Pi/PiFirmwareVolume.h
@@ -18,7 +18,7 @@
 #ifndef __PI_FIRMWAREVOLUME_H__
 #define __PI_FIRMWAREVOLUME_H__
 
-#include <gpxe/efi/ProcessorBind.h>
+#include <ipxe/efi/ProcessorBind.h>
 
 ///
 /// EFI_FV_FILE_ATTRIBUTES
diff --git a/src/include/gpxe/efi/Pi/PiHob.h b/src/include/ipxe/efi/Pi/PiHob.h
index 0c8df1f..26dc45c 100644
--- a/src/include/gpxe/efi/Pi/PiHob.h
+++ b/src/include/ipxe/efi/Pi/PiHob.h
@@ -18,10 +18,10 @@
 #ifndef __PI_HOB_H__
 #define __PI_HOB_H__
 
-#include <gpxe/efi/ProcessorBind.h>
-#include <gpxe/efi/Pi/PiBootMode.h>
-#include <gpxe/efi/Uefi/UefiBaseType.h>
-#include <gpxe/efi/Uefi/UefiMultiPhase.h>
+#include <ipxe/efi/ProcessorBind.h>
+#include <ipxe/efi/Pi/PiBootMode.h>
+#include <ipxe/efi/Uefi/UefiBaseType.h>
+#include <ipxe/efi/Uefi/UefiMultiPhase.h>
 
 //
 // HobType of EFI_HOB_GENERIC_HEADER.
diff --git a/src/include/gpxe/efi/Pi/PiMultiPhase.h b/src/include/ipxe/efi/Pi/PiMultiPhase.h
index 3ab6421..9644024 100644
--- a/src/include/gpxe/efi/Pi/PiMultiPhase.h
+++ b/src/include/ipxe/efi/Pi/PiMultiPhase.h
@@ -18,14 +18,14 @@
 #ifndef __PI_MULTIPHASE_H__
 #define __PI_MULTIPHASE_H__
 
-#include <gpxe/efi/Uefi/UefiMultiPhase.h>
+#include <ipxe/efi/Uefi/UefiMultiPhase.h>
 
-#include <gpxe/efi/Pi/PiFirmwareVolume.h>
-#include <gpxe/efi/Pi/PiFirmwareFile.h>
-#include <gpxe/efi/Pi/PiBootMode.h>
+#include <ipxe/efi/Pi/PiFirmwareVolume.h>
+#include <ipxe/efi/Pi/PiFirmwareFile.h>
+#include <ipxe/efi/Pi/PiBootMode.h>
 
-#include <gpxe/efi/Pi/PiHob.h>
-#include <gpxe/efi/Pi/PiDependency.h>
+#include <ipxe/efi/Pi/PiHob.h>
+#include <ipxe/efi/Pi/PiDependency.h>
 
 
 #define EFI_NOT_AVAILABLE_YET   EFIERR (32)
diff --git a/src/include/gpxe/efi/PiDxe.h b/src/include/ipxe/efi/PiDxe.h
index c326302..b79a96e 100644
--- a/src/include/gpxe/efi/PiDxe.h
+++ b/src/include/ipxe/efi/PiDxe.h
@@ -16,10 +16,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef __PI_DXE_H__
 #define __PI_DXE_H__
 
-#include <gpxe/efi/Uefi/UefiBaseType.h>
-#include <gpxe/efi/Uefi/UefiSpec.h>
+#include <ipxe/efi/Uefi/UefiBaseType.h>
+#include <ipxe/efi/Uefi/UefiSpec.h>
 
-#include <gpxe/efi/Pi/PiDxeCis.h>
+#include <ipxe/efi/Pi/PiDxeCis.h>
 
 #endif
 
diff --git a/src/include/gpxe/efi/ProcessorBind.h b/src/include/ipxe/efi/ProcessorBind.h
index 3dbaf1b..bf39cd6 100644
--- a/src/include/gpxe/efi/ProcessorBind.h
+++ b/src/include/ipxe/efi/ProcessorBind.h
@@ -6,9 +6,9 @@
  */
 
 #if __i386__
-#include <gpxe/efi/Ia32/ProcessorBind.h>
+#include <ipxe/efi/Ia32/ProcessorBind.h>
 #endif
 
 #if __x86_64__
-#include <gpxe/efi/X64/ProcessorBind.h>
+#include <ipxe/efi/X64/ProcessorBind.h>
 #endif
diff --git a/src/include/gpxe/efi/Protocol/ComponentName2.h b/src/include/ipxe/efi/Protocol/ComponentName2.h
index 0f01014..0f01014 100644
--- a/src/include/gpxe/efi/Protocol/ComponentName2.h
+++ b/src/include/ipxe/efi/Protocol/ComponentName2.h
diff --git a/src/include/gpxe/efi/Protocol/Cpu.h b/src/include/ipxe/efi/Protocol/Cpu.h
index da3d0fd..b06c0df 100644
--- a/src/include/gpxe/efi/Protocol/Cpu.h
+++ b/src/include/ipxe/efi/Protocol/Cpu.h
@@ -17,7 +17,7 @@
 #ifndef __ARCH_PROTOCOL_CPU_H__
 #define __ARCH_PROTOCOL_CPU_H__
 
-#include <gpxe/efi/Protocol/DebugSupport.h>
+#include <ipxe/efi/Protocol/DebugSupport.h>
 
 #define EFI_CPU_ARCH_PROTOCOL_GUID \
   { 0x26baccb1, 0x6f42, 0x11d4, {0xbc, 0xe7, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 } }
diff --git a/src/include/gpxe/efi/Protocol/CpuIo.h b/src/include/ipxe/efi/Protocol/CpuIo.h
index 8d35c6c..e3d9610 100644
--- a/src/include/gpxe/efi/Protocol/CpuIo.h
+++ b/src/include/ipxe/efi/Protocol/CpuIo.h
@@ -22,7 +22,7 @@
 #ifndef _CPUIO_H_
 #define _CPUIO_H_
 
-#include <gpxe/efi/PiDxe.h>
+#include <ipxe/efi/PiDxe.h>
 
 #define EFI_CPU_IO_PROTOCOL_GUID \
   { \
diff --git a/src/include/gpxe/efi/Protocol/DebugSupport.h b/src/include/ipxe/efi/Protocol/DebugSupport.h
index c8db249..370614d 100644
--- a/src/include/gpxe/efi/Protocol/DebugSupport.h
+++ b/src/include/ipxe/efi/Protocol/DebugSupport.h
@@ -19,8 +19,8 @@
 #ifndef __DEBUG_SUPPORT_H__
 #define __DEBUG_SUPPORT_H__
 
-#include <gpxe/efi/ProcessorBind.h>
-#include <gpxe/efi/IndustryStandard/PeImage.h>
+#include <ipxe/efi/ProcessorBind.h>
+#include <ipxe/efi/IndustryStandard/PeImage.h>
 
 typedef struct _EFI_DEBUG_SUPPORT_PROTOCOL EFI_DEBUG_SUPPORT_PROTOCOL;
 
diff --git a/src/include/gpxe/efi/Protocol/DevicePath.h b/src/include/ipxe/efi/Protocol/DevicePath.h
index e847668..4d31008 100644
--- a/src/include/gpxe/efi/Protocol/DevicePath.h
+++ b/src/include/ipxe/efi/Protocol/DevicePath.h
@@ -19,7 +19,7 @@
 #ifndef __EFI_DEVICE_PATH_PROTOCOL_H__
 #define __EFI_DEVICE_PATH_PROTOCOL_H__
 
-#include <gpxe/efi/Guid/PcAnsi.h>
+#include <ipxe/efi/Guid/PcAnsi.h>
 
 ///
 /// Device Path protocol
diff --git a/src/include/gpxe/efi/Protocol/DriverBinding.h b/src/include/ipxe/efi/Protocol/DriverBinding.h
index 510cb7c..2ee7845 100644
--- a/src/include/gpxe/efi/Protocol/DriverBinding.h
+++ b/src/include/ipxe/efi/Protocol/DriverBinding.h
@@ -18,7 +18,7 @@
 #ifndef __EFI_DRIVER_BINDING_H__
 #define __EFI_DRIVER_BINDING_H__
 
-#include <gpxe/efi/Protocol/DevicePath.h>
+#include <ipxe/efi/Protocol/DevicePath.h>
 ///
 /// Global ID for the ControllerHandle Driver Protocol
 ///
diff --git a/src/include/gpxe/efi/Protocol/NetworkInterfaceIdentifier.h b/src/include/ipxe/efi/Protocol/NetworkInterfaceIdentifier.h
index e99ec38..e99ec38 100644
--- a/src/include/gpxe/efi/Protocol/NetworkInterfaceIdentifier.h
+++ b/src/include/ipxe/efi/Protocol/NetworkInterfaceIdentifier.h
diff --git a/src/include/gpxe/efi/Protocol/PciIo.h b/src/include/ipxe/efi/Protocol/PciIo.h
index 5aea5b4..5aea5b4 100644
--- a/src/include/gpxe/efi/Protocol/PciIo.h
+++ b/src/include/ipxe/efi/Protocol/PciIo.h
diff --git a/src/include/gpxe/efi/Protocol/PciRootBridgeIo.h b/src/include/ipxe/efi/Protocol/PciRootBridgeIo.h
index a1150f0..a1150f0 100644
--- a/src/include/gpxe/efi/Protocol/PciRootBridgeIo.h
+++ b/src/include/ipxe/efi/Protocol/PciRootBridgeIo.h
diff --git a/src/include/gpxe/efi/Protocol/SimpleNetwork.h b/src/include/ipxe/efi/Protocol/SimpleNetwork.h
index d3d2afc..d3d2afc 100644
--- a/src/include/gpxe/efi/Protocol/SimpleNetwork.h
+++ b/src/include/ipxe/efi/Protocol/SimpleNetwork.h
diff --git a/src/include/gpxe/efi/Protocol/SimpleTextIn.h b/src/include/ipxe/efi/Protocol/SimpleTextIn.h
index f14f62d..787d8f1 100644
--- a/src/include/gpxe/efi/Protocol/SimpleTextIn.h
+++ b/src/include/ipxe/efi/Protocol/SimpleTextIn.h
@@ -18,7 +18,7 @@
 #ifndef __SIMPLE_TEXT_IN_PROTOCOL_H__
 #define __SIMPLE_TEXT_IN_PROTOCOL_H__
 
-#include <gpxe/efi/ProcessorBind.h>
+#include <ipxe/efi/ProcessorBind.h>
 
 #define EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID \
   { \
diff --git a/src/include/gpxe/efi/Protocol/SimpleTextOut.h b/src/include/ipxe/efi/Protocol/SimpleTextOut.h
index 426ce81..426ce81 100644
--- a/src/include/gpxe/efi/Protocol/SimpleTextOut.h
+++ b/src/include/ipxe/efi/Protocol/SimpleTextOut.h
diff --git a/src/include/gpxe/efi/Uefi.h b/src/include/ipxe/efi/Uefi.h
index 58ddb11..1e62d2a 100644
--- a/src/include/gpxe/efi/Uefi.h
+++ b/src/include/ipxe/efi/Uefi.h
@@ -20,8 +20,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef __PI_UEFI_H__
 #define __PI_UEFI_H__
 
-#include <gpxe/efi/Uefi/UefiBaseType.h>
-#include <gpxe/efi/Uefi/UefiSpec.h>
+#include <ipxe/efi/Uefi/UefiBaseType.h>
+#include <ipxe/efi/Uefi/UefiSpec.h>
 
 #endif
 
diff --git a/src/include/gpxe/efi/Uefi/UefiBaseType.h b/src/include/ipxe/efi/Uefi/UefiBaseType.h
index 475ac01..e7d964d 100644
--- a/src/include/gpxe/efi/Uefi/UefiBaseType.h
+++ b/src/include/ipxe/efi/Uefi/UefiBaseType.h
@@ -15,7 +15,7 @@
 #ifndef __UEFI_BASETYPE_H__
 #define __UEFI_BASETYPE_H__
 
-#include <gpxe/efi/Base.h>
+#include <ipxe/efi/Base.h>
 
 //
 // Basical data type definitions introduced in UEFI.
diff --git a/src/include/gpxe/efi/Uefi/UefiGpt.h b/src/include/ipxe/efi/Uefi/UefiGpt.h
index 92c3035..92c3035 100644
--- a/src/include/gpxe/efi/Uefi/UefiGpt.h
+++ b/src/include/ipxe/efi/Uefi/UefiGpt.h
diff --git a/src/include/gpxe/efi/Uefi/UefiInternalFormRepresentation.h b/src/include/ipxe/efi/Uefi/UefiInternalFormRepresentation.h
index c675517..c675517 100644
--- a/src/include/gpxe/efi/Uefi/UefiInternalFormRepresentation.h
+++ b/src/include/ipxe/efi/Uefi/UefiInternalFormRepresentation.h
diff --git a/src/include/gpxe/efi/Uefi/UefiMultiPhase.h b/src/include/ipxe/efi/Uefi/UefiMultiPhase.h
index 2d1af5e..24cf48e 100644
--- a/src/include/gpxe/efi/Uefi/UefiMultiPhase.h
+++ b/src/include/ipxe/efi/Uefi/UefiMultiPhase.h
@@ -15,7 +15,7 @@
 #ifndef __UEFI_MULTIPHASE_H__
 #define __UEFI_MULTIPHASE_H__
 
-#include <gpxe/efi/ProcessorBind.h>
+#include <ipxe/efi/ProcessorBind.h>
 
 ///
 /// Enumeration of memory types introduced in UEFI.
diff --git a/src/include/gpxe/efi/Uefi/UefiPxe.h b/src/include/ipxe/efi/Uefi/UefiPxe.h
index bb8ab41..bb8ab41 100644
--- a/src/include/gpxe/efi/Uefi/UefiPxe.h
+++ b/src/include/ipxe/efi/Uefi/UefiPxe.h
diff --git a/src/include/gpxe/efi/Uefi/UefiSpec.h b/src/include/ipxe/efi/Uefi/UefiSpec.h
index 03e7b6c..4d34b19 100644
--- a/src/include/gpxe/efi/Uefi/UefiSpec.h
+++ b/src/include/ipxe/efi/Uefi/UefiSpec.h
@@ -19,11 +19,11 @@
 #ifndef __UEFI_SPEC_H__
 #define __UEFI_SPEC_H__
 
-#include <gpxe/efi/Uefi/UefiMultiPhase.h>
+#include <ipxe/efi/Uefi/UefiMultiPhase.h>
 
-#include <gpxe/efi/Protocol/DevicePath.h>
-#include <gpxe/efi/Protocol/SimpleTextIn.h>
-#include <gpxe/efi/Protocol/SimpleTextOut.h>
+#include <ipxe/efi/Protocol/DevicePath.h>
+#include <ipxe/efi/Protocol/SimpleTextIn.h>
+#include <ipxe/efi/Protocol/SimpleTextOut.h>
 
 ///
 /// Enumeration of memory allocation.
@@ -1909,8 +1909,8 @@ typedef struct {
   #error Unknown Processor Type
 #endif
 
-#include <gpxe/efi/Uefi/UefiPxe.h>
-#include <gpxe/efi/Uefi/UefiGpt.h>
-#include <gpxe/efi/Uefi/UefiInternalFormRepresentation.h>
+#include <ipxe/efi/Uefi/UefiPxe.h>
+#include <ipxe/efi/Uefi/UefiGpt.h>
+#include <ipxe/efi/Uefi/UefiInternalFormRepresentation.h>
 
 #endif
diff --git a/src/include/gpxe/efi/X64/ProcessorBind.h b/src/include/ipxe/efi/X64/ProcessorBind.h
index fe6c413..fe6c413 100644
--- a/src/include/gpxe/efi/X64/ProcessorBind.h
+++ b/src/include/ipxe/efi/X64/ProcessorBind.h
diff --git a/src/include/gpxe/efi/efi.h b/src/include/ipxe/efi/efi.h
index f4459b7..4acbc24 100644
--- a/src/include/gpxe/efi/efi.h
+++ b/src/include/ipxe/efi/efi.h
@@ -6,7 +6,7 @@
  * EFI API
  *
  * The intention is to include near-verbatim copies of the EFI headers
- * required by gPXE.  This is achieved using the import.pl script in
+ * required by iPXE.  This is achieved using the import.pl script in
  * this directory.  Run the import script to update the local copies
  * of the headers:
  *
@@ -16,7 +16,7 @@
  * EFI Development Kit.
  *
  * Note that import.pl will modify any #include lines in each imported
- * header to reflect its new location within the gPXE tree.  It will
+ * header to reflect its new location within the iPXE tree.  It will
  * also tidy up the file by removing carriage return characters and
  * trailing whitespace.
  *
@@ -37,23 +37,23 @@
 #endif
 
 /* Include the top-level EFI header files */
-#include <gpxe/efi/Uefi.h>
-#include <gpxe/efi/PiDxe.h>
+#include <ipxe/efi/Uefi.h>
+#include <ipxe/efi/PiDxe.h>
 
 /* Reset any trailing #pragma pack directives */
 #pragma pack(1)
 #pragma pack()
 
-#include <gpxe/tables.h>
-#include <gpxe/uuid.h>
+#include <ipxe/tables.h>
+#include <ipxe/uuid.h>
 
-/** An EFI protocol used by gPXE */
+/** An EFI protocol used by iPXE */
 struct efi_protocol {
 	/** GUID */
 	union {
 		/** EFI protocol GUID */
 		EFI_GUID guid;
-		/** UUID structure understood by gPXE */
+		/** UUID structure understood by iPXE */
 		union uuid uuid;
 	} u;
 	/** Variable containing pointer to protocol structure */
@@ -63,10 +63,10 @@ struct efi_protocol {
 /** EFI protocol table */
 #define EFI_PROTOCOLS __table ( struct efi_protocol, "efi_protocols" )
 
-/** Declare an EFI protocol used by gPXE */
+/** Declare an EFI protocol used by iPXE */
 #define __efi_protocol __table_entry ( EFI_PROTOCOLS, 01 )
 
-/** Declare an EFI protocol to be required by gPXE
+/** Declare an EFI protocol to be required by iPXE
  *
  * @v _protocol		EFI protocol name
  * @v _ptr		Pointer to protocol instance
@@ -79,13 +79,13 @@ struct efi_protocol {
 				(_ptr) : (_ptr) ) ),			     \
 	}
 
-/** An EFI configuration table used by gPXE */
+/** An EFI configuration table used by iPXE */
 struct efi_config_table {
 	/** GUID */
 	union {
 		/** EFI configuration table GUID */
 		EFI_GUID guid;
-		/** UUID structure understood by gPXE */
+		/** UUID structure understood by iPXE */
 		union uuid uuid;
 	} u;
 	/** Variable containing pointer to configuration table */
@@ -98,10 +98,10 @@ struct efi_config_table {
 #define EFI_CONFIG_TABLES \
 	__table ( struct efi_config_table, "efi_config_tables" )
 
-/** Declare an EFI configuration table used by gPXE */
+/** Declare an EFI configuration table used by iPXE */
 #define __efi_config_table __table_entry ( EFI_CONFIG_TABLES, 01 )
 
-/** Declare an EFI configuration table to be used by gPXE
+/** Declare an EFI configuration table to be used by iPXE
  *
  * @v _table		EFI configuration table name
  * @v _ptr		Pointer to configuration table
@@ -114,9 +114,9 @@ struct efi_config_table {
 		.required = (_required),				     \
 	}
 
-/** Convert a gPXE status code to an EFI status code
+/** Convert a iPXE status code to an EFI status code
  *
- * FIXME: actually perform some kind of conversion.  gPXE error codes
+ * FIXME: actually perform some kind of conversion.  iPXE error codes
  * will be detected as EFI error codes; both have the top bit set, and
  * the success return code is zero for both.  Anything that just
  * reports a numerical error will be OK, anything attempting to
@@ -125,7 +125,7 @@ struct efi_config_table {
  */
 #define RC_TO_EFIRC( rc ) (rc)
 
-/** Convert an EFI status code to a gPXE status code
+/** Convert an EFI status code to a iPXE status code
  *
  * FIXME: as above
  */
diff --git a/src/include/gpxe/efi/efi_io.h b/src/include/ipxe/efi/efi_io.h
index 7ad5ffe..2ed96e1 100644
--- a/src/include/gpxe/efi/efi_io.h
+++ b/src/include/ipxe/efi/efi_io.h
@@ -1,9 +1,9 @@
-#ifndef _GPXE_EFI_IO_H
-#define _GPXE_EFI_IO_H
+#ifndef _IPXE_EFI_IO_H
+#define _IPXE_EFI_IO_H
 
 /** @file
  *
- * gPXE I/O API for EFI
+ * iPXE I/O API for EFI
  *
  * EFI runs with flat physical addressing, so the various mappings
  * between virtual addresses, I/O addresses and bus addresses are all
@@ -177,4 +177,4 @@ IOAPI_INLINE ( efi, mb ) ( void ) {
 	 */
 }
 
-#endif /* _GPXE_EFI_IO_H */
+#endif /* _IPXE_EFI_IO_H */
diff --git a/src/include/gpxe/efi/efi_pci.h b/src/include/ipxe/efi/efi_pci.h
index 59c0eb1..b280d80 100644
--- a/src/include/gpxe/efi/efi_pci.h
+++ b/src/include/ipxe/efi/efi_pci.h
@@ -1,9 +1,9 @@
-#ifndef _GPXE_EFI_PCI_H
-#define _GPXE_EFI_PCI_H
+#ifndef _IPXE_EFI_PCI_H
+#define _IPXE_EFI_PCI_H
 
 /** @file
  *
- * gPXE PCI I/O API for EFI
+ * iPXE PCI I/O API for EFI
  *
  */
 
@@ -145,4 +145,4 @@ PCIAPI_INLINE ( efi, pci_write_config_dword ) ( struct pci_device *pci,
 			      value );
 }
 
-#endif /* _GPXE_EFI_PCI_H */
+#endif /* _IPXE_EFI_PCI_H */
diff --git a/src/include/gpxe/efi/efi_smbios.h b/src/include/ipxe/efi/efi_smbios.h
index 01631e5..7642e5b 100644
--- a/src/include/gpxe/efi/efi_smbios.h
+++ b/src/include/ipxe/efi/efi_smbios.h
@@ -1,9 +1,9 @@
-#ifndef _GPXE_EFI_SMBIOS_H
-#define _GPXE_EFI_SMBIOS_H
+#ifndef _IPXE_EFI_SMBIOS_H
+#define _IPXE_EFI_SMBIOS_H
 
 /** @file
  *
- * gPXE SMBIOS API for EFI
+ * iPXE SMBIOS API for EFI
  *
  */
 
@@ -15,4 +15,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define SMBIOS_PREFIX_efi __efi_
 #endif
 
-#endif /* _GPXE_EFI_SMBIOS_H */
+#endif /* _IPXE_EFI_SMBIOS_H */
diff --git a/src/include/gpxe/efi/efi_timer.h b/src/include/ipxe/efi/efi_timer.h
index e0531d5..b10543d 100644
--- a/src/include/gpxe/efi/efi_timer.h
+++ b/src/include/ipxe/efi/efi_timer.h
@@ -1,9 +1,9 @@
-#ifndef _GPXE_EFI_TIMER_H
-#define _GPXE_EFI_TIMER_H
+#ifndef _IPXE_EFI_TIMER_H
+#define _IPXE_EFI_TIMER_H
 
 /** @file
  *
- * gPXE timer API for EFI
+ * iPXE timer API for EFI
  *
  */
 
@@ -15,4 +15,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define TIMER_PREFIX_efi __efi_
 #endif
 
-#endif /* _GPXE_EFI_TIMER_H */
+#endif /* _IPXE_EFI_TIMER_H */
diff --git a/src/include/gpxe/efi/efi_uaccess.h b/src/include/ipxe/efi/efi_uaccess.h
index a6b61c5..dc226a3 100644
--- a/src/include/gpxe/efi/efi_uaccess.h
+++ b/src/include/ipxe/efi/efi_uaccess.h
@@ -1,9 +1,9 @@
-#ifndef _GPXE_EFI_UACCESS_H
-#define _GPXE_EFI_UACCESS_H
+#ifndef _IPXE_EFI_UACCESS_H
+#define _IPXE_EFI_UACCESS_H
 
 /** @file
  *
- * gPXE user access API for EFI
+ * iPXE user access API for EFI
  *
  * EFI runs with flat physical addressing, so the various mappings
  * between virtual addresses, I/O addresses and bus addresses are all
@@ -87,4 +87,4 @@ UACCESS_INLINE ( efi, memchr_user ) ( userptr_t buffer, off_t offset,
 	return trivial_memchr_user ( buffer, offset, c, len );
 }
 
-#endif /* _GPXE_EFI_UACCESS_H */
+#endif /* _IPXE_EFI_UACCESS_H */
diff --git a/src/include/gpxe/efi/efi_umalloc.h b/src/include/ipxe/efi/efi_umalloc.h
index 0388dd1..911e69a 100644
--- a/src/include/gpxe/efi/efi_umalloc.h
+++ b/src/include/ipxe/efi/efi_umalloc.h
@@ -1,9 +1,9 @@
-#ifndef _GPXE_EFI_UMALLOC_H
-#define _GPXE_EFI_UMALLOC_H
+#ifndef _IPXE_EFI_UMALLOC_H
+#define _IPXE_EFI_UMALLOC_H
 
 /** @file
  *
- * gPXE user memory allocation API for EFI
+ * iPXE user memory allocation API for EFI
  *
  */
 
@@ -15,4 +15,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define UMALLOC_PREFIX_efi __efi_
 #endif
 
-#endif /* _GPXE_EFI_UMALLOC_H */
+#endif /* _IPXE_EFI_UMALLOC_H */
diff --git a/src/include/gpxe/efi/import.pl b/src/include/ipxe/efi/import.pl
index 1699394..4ea5175 100755
--- a/src/include/gpxe/efi/import.pl
+++ b/src/include/ipxe/efi/import.pl
@@ -8,7 +8,7 @@ use strict;
 use warnings;
 
 sub try_import_file {
-  my $gpxedir = shift;
+  my $ipxedir = shift;
   my $edkdirs = shift;
   my $filename = shift;
 
@@ -16,7 +16,7 @@ sub try_import_file {
   return unless $filename =~ /\.h$/;
   print "$filename...";
 
-  my $outfile = catfile ( $gpxedir, $filename );
+  my $outfile = catfile ( $ipxedir, $filename );
   foreach my $edkdir ( @$edkdirs ) {
     my $infile = catfile ( $edkdir, $filename );
     if ( -e $infile ) {
@@ -33,7 +33,7 @@ sub try_import_file {
 	s/\s*$//g;
 	chomp;
 	# Update include lines, and record included files
-	if ( s/^\#include\s+[<\"](\S+)[>\"]/\#include <gpxe\/efi\/$1>/ ) {
+	if ( s/^\#include\s+[<\"](\S+)[>\"]/\#include <ipxe\/efi\/$1>/ ) {
 	  push @dependencies, $1;
 	}
 	print $outfh "$_\n";
@@ -42,9 +42,9 @@ sub try_import_file {
       close $infh;
       # Recurse to handle any included files that we don't already have
       foreach my $dependency ( @dependencies ) {
-	if ( ! -e catfile ( $gpxedir, $dependency ) ) {
+	if ( ! -e catfile ( $ipxedir, $dependency ) ) {
 	  print "...following dependency on $dependency\n";
-	  try_import_file ( $gpxedir, $edkdirs, $dependency );
+	  try_import_file ( $ipxedir, $edkdirs, $dependency );
 	}
       }
       return;
@@ -61,15 +61,15 @@ die "Directory \"$edktop\" does not appear to contain the EFI EDK2\n"
 my $edkdirs = [ catfile ( $edktop, "MdePkg/Include" ),
 		catfile ( $edktop, "IntelFrameworkPkg/Include" ) ];
 
-# Identify gPXE EFI includes directory
-my $gpxedir = $FindBin::Bin;
-die "Directory \"$gpxedir\" does not appear to contain the gPXE EFI includes\n"
-    unless -e catfile ( $gpxedir, "../../../include/gpxe/efi" );
+# Identify iPXE EFI includes directory
+my $ipxedir = $FindBin::Bin;
+die "Directory \"$ipxedir\" does not appear to contain the iPXE EFI includes\n"
+    unless -e catfile ( $ipxedir, "../../../include/ipxe/efi" );
 
-print "Importing EFI headers into $gpxedir\nfrom ";
+print "Importing EFI headers into $ipxedir\nfrom ";
 print join ( "\n and ", @$edkdirs )."\n";
 
 # Import headers
 find ( { wanted => sub {
-  try_import_file ( $gpxedir, $edkdirs, abs2rel ( $_, $gpxedir ) );
-}, no_chdir => 1 }, $gpxedir );
+  try_import_file ( $ipxedir, $edkdirs, abs2rel ( $_, $ipxedir ) );
+}, no_chdir => 1 }, $ipxedir );
diff --git a/src/include/gpxe/eisa.h b/src/include/ipxe/eisa.h
index f76e4b9..1588f81 100644
--- a/src/include/gpxe/eisa.h
+++ b/src/include/ipxe/eisa.h
@@ -4,9 +4,9 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/isa_ids.h>
-#include <gpxe/device.h>
-#include <gpxe/tables.h>
+#include <ipxe/isa_ids.h>
+#include <ipxe/device.h>
+#include <ipxe/tables.h>
 
 /*
  * EISA constants
diff --git a/src/include/gpxe/elf.h b/src/include/ipxe/elf.h
index da9d2fc..23160a9 100644
--- a/src/include/gpxe/elf.h
+++ b/src/include/ipxe/elf.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ELF_H
-#define _GPXE_ELF_H
+#ifndef _IPXE_ELF_H
+#define _IPXE_ELF_H
 
 /**
  * @file
@@ -14,4 +14,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 extern int elf_load ( struct image *image );
 
-#endif /* _GPXE_ELF_H */
+#endif /* _IPXE_ELF_H */
diff --git a/src/include/gpxe/errfile.h b/src/include/ipxe/errfile.h
index f2be7c0..736ce46 100644
--- a/src/include/gpxe/errfile.h
+++ b/src/include/ipxe/errfile.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ERRFILE_H
-#define _GPXE_ERRFILE_H
+#ifndef _IPXE_ERRFILE_H
+#define _IPXE_ERRFILE_H
 
 /** @file
  *
@@ -208,4 +208,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 /** @} */
 
-#endif /* _GPXE_ERRFILE_H */
+#endif /* _IPXE_ERRFILE_H */
diff --git a/src/include/gpxe/errortab.h b/src/include/ipxe/errortab.h
index 35765d4..945cde3 100644
--- a/src/include/gpxe/errortab.h
+++ b/src/include/ipxe/errortab.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ERRORTAB_H
-#define _GPXE_ERRORTAB_H
+#ifndef _IPXE_ERRORTAB_H
+#define _IPXE_ERRORTAB_H
 
 /** @file
  *
@@ -9,7 +9,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/tables.h>
+#include <ipxe/tables.h>
 
 struct errortab {
 	int errno;
@@ -20,4 +20,4 @@ struct errortab {
 
 #define __errortab __table_entry ( ERRORTAB, 01 )
 
-#endif /* _GPXE_ERRORTAB_H */
+#endif /* _IPXE_ERRORTAB_H */
diff --git a/src/include/gpxe/ethernet.h b/src/include/ipxe/ethernet.h
index 4dfc24d..5799092 100644
--- a/src/include/gpxe/ethernet.h
+++ b/src/include/ipxe/ethernet.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ETHERNET_H
-#define _GPXE_ETHERNET_H
+#ifndef _IPXE_ETHERNET_H
+#define _IPXE_ETHERNET_H
 
 /** @file
  *
@@ -18,4 +18,4 @@ extern int eth_mc_hash ( unsigned int af, const void *net_addr,
 extern int eth_eth_addr ( const void *ll_addr, void *eth_addr );
 extern struct net_device * alloc_etherdev ( size_t priv_size );
 
-#endif /* _GPXE_ETHERNET_H */
+#endif /* _IPXE_ETHERNET_H */
diff --git a/src/include/gpxe/fakedhcp.h b/src/include/ipxe/fakedhcp.h
index c603bdc..ea06b06 100644
--- a/src/include/gpxe/fakedhcp.h
+++ b/src/include/ipxe/fakedhcp.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_FAKEDHCP_H
-#define _GPXE_FAKEDHCP_H
+#ifndef _IPXE_FAKEDHCP_H
+#define _IPXE_FAKEDHCP_H
 
 /** @file
  *
@@ -20,4 +20,4 @@ extern int create_fakedhcpack ( struct net_device *netdev,
 extern int create_fakepxebsack ( struct net_device *netdev,
 				 void *data, size_t max_len );
 
-#endif /* _GPXE_FAKEDHCP_H */
+#endif /* _IPXE_FAKEDHCP_H */
diff --git a/src/include/gpxe/features.h b/src/include/ipxe/features.h
index 3443186..b5033a6 100644
--- a/src/include/gpxe/features.h
+++ b/src/include/ipxe/features.h
@@ -1,9 +1,9 @@
-#ifndef _GPXE_FEATURES_H
-#define _GPXE_FEATURES_H
+#ifndef _IPXE_FEATURES_H
+#define _IPXE_FEATURES_H
 
 #include <stdint.h>
-#include <gpxe/tables.h>
-#include <gpxe/dhcp.h>
+#include <ipxe/tables.h>
+#include <ipxe/dhcp.h>
 
 /** @file
  *
@@ -100,4 +100,4 @@ struct feature {
 #define FEATURE_VERSION( ... )						    \
 	DHCP_FEATURE ( DHCP_ENCAPSULATED ( DHCP_EB_VERSION ), __VA_ARGS__ )
 
-#endif /* _GPXE_FEATURES_H */
+#endif /* _IPXE_FEATURES_H */
diff --git a/src/include/gpxe/filter.h b/src/include/ipxe/filter.h
index 1f59fcc..b23a98d 100644
--- a/src/include/gpxe/filter.h
+++ b/src/include/ipxe/filter.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_FILTER_H
-#define _GPXE_FILTER_H
+#ifndef _IPXE_FILTER_H
+#define _IPXE_FILTER_H
 
 /** @file
  *
@@ -10,7 +10,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stddef.h>
-#include <gpxe/xfer.h>
+#include <ipxe/xfer.h>
 
 /**
  * Half of a data transfer filter
@@ -72,4 +72,4 @@ static inline void filter_init ( struct xfer_filter_half *left,
 	right->other = left;
 }
 
-#endif /* _GPXE_FILTER_H */
+#endif /* _IPXE_FILTER_H */
diff --git a/src/include/gpxe/ftp.h b/src/include/ipxe/ftp.h
index 93194f6..cbab12d 100644
--- a/src/include/gpxe/ftp.h
+++ b/src/include/ipxe/ftp.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_FTP_H
-#define _GPXE_FTP_H
+#ifndef _IPXE_FTP_H
+#define _IPXE_FTP_H
 
 /** @file
  *
@@ -12,4 +12,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 /** FTP default port */
 #define FTP_PORT 21
 
-#endif /* _GPXE_FTP_H */
+#endif /* _IPXE_FTP_H */
diff --git a/src/include/gpxe/gdbserial.h b/src/include/ipxe/gdbserial.h
index 2613ab4..a3b5617 100644
--- a/src/include/gpxe/gdbserial.h
+++ b/src/include/ipxe/gdbserial.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_GDBSERIAL_H
-#define _GPXE_GDBSERIAL_H
+#ifndef _IPXE_GDBSERIAL_H
+#define _IPXE_GDBSERIAL_H
 
 /** @file
  *
@@ -18,4 +18,4 @@ struct gdb_transport;
  */
 struct gdb_transport *gdbserial_configure ( void );
 
-#endif /* _GPXE_GDBSERIAL_H */
+#endif /* _IPXE_GDBSERIAL_H */
diff --git a/src/include/gpxe/gdbstub.h b/src/include/ipxe/gdbstub.h
index 8f9b7c1..3196067 100644
--- a/src/include/gpxe/gdbstub.h
+++ b/src/include/ipxe/gdbstub.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_GDBSTUB_H
-#define _GPXE_GDBSTUB_H
+#ifndef _IPXE_GDBSTUB_H
+#define _IPXE_GDBSTUB_H
 
 /** @file
  *
@@ -10,7 +10,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/tables.h>
+#include <ipxe/tables.h>
 #include <gdbmach.h>
 
 /**
@@ -74,4 +74,4 @@ extern void gdbstub_start ( struct gdb_transport *trans );
  **/
 extern void gdbstub_handler ( int signo, gdbreg_t *regs );
 
-#endif /* _GPXE_GDBSTUB_H */
+#endif /* _IPXE_GDBSTUB_H */
diff --git a/src/include/gpxe/gdbudp.h b/src/include/ipxe/gdbudp.h
index 5f02faa..db7a451 100644
--- a/src/include/gpxe/gdbudp.h
+++ b/src/include/ipxe/gdbudp.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_GDBUDP_H
-#define _GPXE_GDBUDP_H
+#ifndef _IPXE_GDBUDP_H
+#define _IPXE_GDBUDP_H
 
 /** @file
  *
@@ -21,4 +21,4 @@ struct gdb_transport;
  */
 struct gdb_transport *gdbudp_configure ( const char *name, struct sockaddr_in *addr );
 
-#endif /* _GPXE_GDBUDP_H */
+#endif /* _IPXE_GDBUDP_H */
diff --git a/src/include/gpxe/hidemem.h b/src/include/ipxe/hidemem.h
index 01b3fc2..ddc9cd8 100644
--- a/src/include/gpxe/hidemem.h
+++ b/src/include/ipxe/hidemem.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_HIDEMEM_H
-#define _GPXE_HIDEMEM_H
+#ifndef _IPXE_HIDEMEM_H
+#define _IPXE_HIDEMEM_H
 
 /**
  * @file
@@ -14,4 +14,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 extern void hide_umalloc ( physaddr_t start, physaddr_t end );
 
-#endif /* _GPXE_HIDEMEM_H */
+#endif /* _IPXE_HIDEMEM_H */
diff --git a/src/include/gpxe/hmac.h b/src/include/ipxe/hmac.h
index cb001b9..d5ec086 100644
--- a/src/include/gpxe/hmac.h
+++ b/src/include/ipxe/hmac.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_HMAC_H
-#define _GPXE_HMAC_H
+#ifndef _IPXE_HMAC_H
+#define _IPXE_HMAC_H
 
 /** @file
  *
@@ -8,7 +8,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/crypto.h>
+#include <ipxe/crypto.h>
 
 /**
  * Update HMAC
@@ -29,4 +29,4 @@ extern void hmac_init ( struct digest_algorithm *digest, void *digest_ctx,
 extern void hmac_final ( struct digest_algorithm *digest, void *digest_ctx,
 			 void *key, size_t *key_len, void *hmac );
 
-#endif /* _GPXE_HMAC_H */
+#endif /* _IPXE_HMAC_H */
diff --git a/src/include/gpxe/http.h b/src/include/ipxe/http.h
index baa6d83..97014d1 100644
--- a/src/include/gpxe/http.h
+++ b/src/include/ipxe/http.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_HTTP_H
-#define _GPXE_HTTP_H
+#ifndef _IPXE_HTTP_H
+#define _IPXE_HTTP_H
 
 /** @file
  *
@@ -20,4 +20,4 @@ extern int http_open_filter ( struct xfer_interface *xfer, struct uri *uri,
 			      int ( * filter ) ( struct xfer_interface *,
 						 struct xfer_interface ** ) );
 
-#endif /* _GPXE_HTTP_H */
+#endif /* _IPXE_HTTP_H */
diff --git a/src/include/gpxe/i2c.h b/src/include/ipxe/i2c.h
index 87b89d4..c1f5a9b 100644
--- a/src/include/gpxe/i2c.h
+++ b/src/include/ipxe/i2c.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_I2C_H
-#define _GPXE_I2C_H
+#ifndef _IPXE_I2C_H
+#define _IPXE_I2C_H
 
 /** @file
  *
@@ -10,7 +10,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/bitbash.h>
+#include <ipxe/bitbash.h>
 
 /** An I2C device
  *
@@ -168,4 +168,4 @@ init_at24c11 ( struct i2c_device *i2cdev ) {
 	i2cdev->word_addr_len = 0;
 }
 
-#endif /* _GPXE_I2C_H */
+#endif /* _IPXE_I2C_H */
diff --git a/src/include/gpxe/ib_cm.h b/src/include/ipxe/ib_cm.h
index 670fffd..136e494 100644
--- a/src/include/gpxe/ib_cm.h
+++ b/src/include/ipxe/ib_cm.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IB_CM_H
-#define _GPXE_IB_CM_H
+#ifndef _IPXE_IB_CM_H
+#define _IPXE_IB_CM_H
 
 /** @file
  *
@@ -9,8 +9,8 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/infiniband.h>
-#include <gpxe/retry.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/retry.h>
 
 struct ib_mad_transaction;
 struct ib_connection;
@@ -69,4 +69,4 @@ extern void ib_destroy_conn ( struct ib_device *ibdev,
 			      struct ib_queue_pair *qp,
 			      struct ib_connection *conn );
 
-#endif /* _GPXE_IB_CM_H */
+#endif /* _IPXE_IB_CM_H */
diff --git a/src/include/gpxe/ib_cmrc.h b/src/include/ipxe/ib_cmrc.h
index efa741a..c02b15d 100644
--- a/src/include/gpxe/ib_cmrc.h
+++ b/src/include/ipxe/ib_cmrc.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IB_CMRC_H
-#define _GPXE_IB_CMRC_H
+#ifndef _IPXE_IB_CMRC_H
+#define _IPXE_IB_CMRC_H
 
 /** @file
  *
@@ -9,12 +9,12 @@
 
 FILE_LICENCE ( BSD2 );
 
-#include <gpxe/infiniband.h>
-#include <gpxe/xfer.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/xfer.h>
 
 extern int ib_cmrc_open ( struct xfer_interface *xfer,
 			  struct ib_device *ibdev,
 			  struct ib_gid *dgid,
 			  struct ib_gid_half *service_id );
 
-#endif /* _GPXE_IB_CMRC_H */
+#endif /* _IPXE_IB_CMRC_H */
diff --git a/src/include/gpxe/ib_mad.h b/src/include/ipxe/ib_mad.h
index 8b49718..94f171a 100644
--- a/src/include/gpxe/ib_mad.h
+++ b/src/include/ipxe/ib_mad.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IB_MAD_H
-#define _GPXE_IB_MAD_H
+#ifndef _IPXE_IB_MAD_H
+#define _IPXE_IB_MAD_H
 
 /** @file
  *
@@ -10,7 +10,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/ib_packet.h>
+#include <ipxe/ib_packet.h>
 
 /*****************************************************************************
  *
@@ -558,4 +558,4 @@ union ib_mad {
 	uint8_t bytes[256];
 } __attribute__ (( packed ));
 
-#endif /* _GPXE_IB_MAD_H */
+#endif /* _IPXE_IB_MAD_H */
diff --git a/src/include/gpxe/ib_mcast.h b/src/include/ipxe/ib_mcast.h
index 74eccd0..86d5709 100644
--- a/src/include/gpxe/ib_mcast.h
+++ b/src/include/ipxe/ib_mcast.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IB_MCAST_H
-#define _GPXE_IB_MCAST_H
+#ifndef _IPXE_IB_MCAST_H
+#define _IPXE_IB_MCAST_H
 
 /** @file
  *
@@ -9,7 +9,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/infiniband.h>
+#include <ipxe/infiniband.h>
 
 struct ib_mad_transaction;
 
@@ -45,4 +45,4 @@ extern int ib_mcast_join ( struct ib_device *ibdev, struct ib_queue_pair *qp,
 extern void ib_mcast_leave ( struct ib_device *ibdev, struct ib_queue_pair *qp,
 			     struct ib_mc_membership *membership );
 
-#endif /* _GPXE_IB_MCAST_H */
+#endif /* _IPXE_IB_MCAST_H */
diff --git a/src/include/gpxe/ib_mi.h b/src/include/ipxe/ib_mi.h
index b1cf686..5c5415b 100644
--- a/src/include/gpxe/ib_mi.h
+++ b/src/include/ipxe/ib_mi.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IB_MI_H
-#define _GPXE_IB_MI_H
+#ifndef _IPXE_IB_MI_H
+#define _IPXE_IB_MI_H
 
 /** @file
  *
@@ -9,10 +9,10 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/list.h>
-#include <gpxe/retry.h>
-#include <gpxe/tables.h>
-#include <gpxe/infiniband.h>
+#include <ipxe/list.h>
+#include <ipxe/retry.h>
+#include <ipxe/tables.h>
+#include <ipxe/infiniband.h>
 
 struct ib_mad_interface;
 struct ib_mad_transaction;
@@ -132,4 +132,4 @@ extern struct ib_mad_interface * ib_create_mi ( struct ib_device *ibdev,
 extern void ib_destroy_mi ( struct ib_device *ibdev,
 			    struct ib_mad_interface *mi );
 
-#endif /* _GPXE_IB_MI_H */
+#endif /* _IPXE_IB_MI_H */
diff --git a/src/include/gpxe/ib_packet.h b/src/include/ipxe/ib_packet.h
index d468859..0904295 100644
--- a/src/include/gpxe/ib_packet.h
+++ b/src/include/ipxe/ib_packet.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IB_PACKET_H
-#define _GPXE_IB_PACKET_H
+#ifndef _IPXE_IB_PACKET_H
+#define _IPXE_IB_PACKET_H
 
 /** @file
  *
@@ -144,4 +144,4 @@ extern int ib_pull ( struct ib_device *ibdev, struct io_buffer *iobuf,
 		     struct ib_queue_pair **qp, size_t *payload_len,
 		     struct ib_address_vector *av );
 
-#endif /* _GPXE_IB_PACKET_H */
+#endif /* _IPXE_IB_PACKET_H */
diff --git a/src/include/gpxe/ib_pathrec.h b/src/include/ipxe/ib_pathrec.h
index 5884d53..1fe67f8 100644
--- a/src/include/gpxe/ib_pathrec.h
+++ b/src/include/ipxe/ib_pathrec.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IB_PATHREC_H
-#define _GPXE_IB_PATHREC_H
+#ifndef _IPXE_IB_PATHREC_H
+#define _IPXE_IB_PATHREC_H
 
 /** @file
  *
@@ -9,7 +9,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/infiniband.h>
+#include <ipxe/infiniband.h>
 
 struct ib_mad_transaction;
 struct ib_path;
@@ -73,4 +73,4 @@ extern void ib_destroy_path ( struct ib_device *ibdev,
 extern int ib_resolve_path ( struct ib_device *ibdev,
 			     struct ib_address_vector *av );
 
-#endif /* _GPXE_IB_PATHREC_H */
+#endif /* _IPXE_IB_PATHREC_H */
diff --git a/src/include/gpxe/ib_sma.h b/src/include/ipxe/ib_sma.h
index 78fc672..fa355c6 100644
--- a/src/include/gpxe/ib_sma.h
+++ b/src/include/ipxe/ib_sma.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IB_SMA_H
-#define _GPXE_IB_SMA_H
+#ifndef _IPXE_IB_SMA_H
+#define _IPXE_IB_SMA_H
 
 /** @file
  *
@@ -17,4 +17,4 @@ extern int ib_create_sma ( struct ib_device *ibdev,
 extern void ib_destroy_sma ( struct ib_device *ibdev,
 			     struct ib_mad_interface *mi );
 
-#endif /* _GPXE_IB_SMA_H */
+#endif /* _IPXE_IB_SMA_H */
diff --git a/src/include/gpxe/ib_smc.h b/src/include/ipxe/ib_smc.h
index fdd1c9c..d16a37f 100644
--- a/src/include/gpxe/ib_smc.h
+++ b/src/include/ipxe/ib_smc.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IB_SMC_H
-#define _GPXE_IB_SMC_H
+#ifndef _IPXE_IB_SMC_H
+#define _IPXE_IB_SMC_H
 
 /** @file
  *
@@ -9,7 +9,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/infiniband.h>
+#include <ipxe/infiniband.h>
 
 typedef int ( * ib_local_mad_t ) ( struct ib_device *ibdev,
 				   union ib_mad *mad );
@@ -17,4 +17,4 @@ typedef int ( * ib_local_mad_t ) ( struct ib_device *ibdev,
 extern int ib_smc_update ( struct ib_device *ibdev,
 			   ib_local_mad_t local_mad );
 
-#endif /* _GPXE_IB_SMC_H */
+#endif /* _IPXE_IB_SMC_H */
diff --git a/src/include/gpxe/ib_srp.h b/src/include/ipxe/ib_srp.h
index cf705b3..b773f96 100644
--- a/src/include/gpxe/ib_srp.h
+++ b/src/include/ipxe/ib_srp.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IB_SRP_H
-#define _GPXE_IB_SRP_H
+#ifndef _IPXE_IB_SRP_H
+#define _IPXE_IB_SRP_H
 
 /** @file
  *
@@ -10,8 +10,8 @@
 FILE_LICENCE ( BSD2 );
 
 #include <stdint.h>
-#include <gpxe/infiniband.h>
-#include <gpxe/srp.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/srp.h>
 
 /** SRP initiator port identifier for Infiniband */
 struct ib_srp_initiator_port_id {
@@ -76,4 +76,4 @@ ib_srp_params ( struct srp_device *srp ) {
 
 extern struct srp_transport_type ib_srp_transport;
 
-#endif /* _GPXE_IB_SRP_H */
+#endif /* _IPXE_IB_SRP_H */
diff --git a/src/include/gpxe/icmp.h b/src/include/ipxe/icmp.h
index bb8fce8..e402ce4 100644
--- a/src/include/gpxe/icmp.h
+++ b/src/include/ipxe/icmp.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ICMP_H
-#define _GPXE_ICMP_H
+#ifndef _IPXE_ICMP_H
+#define _IPXE_ICMP_H
 
 /** @file
  *
@@ -22,4 +22,4 @@ struct icmp_header {
 #define ICMP_ECHO_RESPONSE 0
 #define ICMP_ECHO_REQUEST 8
 
-#endif /* _GPXE_ICMP_H */
+#endif /* _IPXE_ICMP_H */
diff --git a/src/include/gpxe/icmp6.h b/src/include/ipxe/icmp6.h
index e8fd1eb..d2ab3bc 100644
--- a/src/include/gpxe/icmp6.h
+++ b/src/include/ipxe/icmp6.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ICMP6_H
-#define _GPXE_ICMP6_H
+#ifndef _IPXE_ICMP6_H
+#define _IPXE_ICMP6_H
 
 /** @file
  *
@@ -9,8 +9,8 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/ip6.h>
-#include <gpxe/ndp.h>
+#include <ipxe/ip6.h>
+#include <ipxe/ndp.h>
 
 #define ICMP6_NSOLICIT 135
 #define ICMP6_NADVERT 136
@@ -56,4 +56,4 @@ struct neighbour_advert {
 
 int icmp6_send_solicit ( struct net_device *netdev, struct in6_addr *src, struct in6_addr *dest );
 
-#endif /* _GPXE_ICMP6_H */
+#endif /* _IPXE_ICMP6_H */
diff --git a/src/include/gpxe/ieee80211.h b/src/include/ipxe/ieee80211.h
index e5b10c3..8f4aa96 100644
--- a/src/include/gpxe/ieee80211.h
+++ b/src/include/ipxe/ieee80211.h
@@ -1,12 +1,12 @@
-#ifndef _GPXE_IEEE80211_H
-#define _GPXE_IEEE80211_H
+#ifndef _IPXE_IEEE80211_H
+#define _IPXE_IEEE80211_H
 
-#include <gpxe/if_ether.h>	/* for ETH_ALEN */
+#include <ipxe/if_ether.h>	/* for ETH_ALEN */
 #include <endian.h>
 
 /** @file
  * Constants and data structures defined in IEEE 802.11, subsetted
- * according to what gPXE knows how to use.
+ * according to what iPXE knows how to use.
  */
 
 FILE_LICENCE(GPL2_OR_LATER);
@@ -199,7 +199,7 @@ FILE_LICENCE(GPL2_OR_LATER);
 /** Subtype value for action management frames
  *
  * Action frames are used to implement spectrum management and QoS
- * features that gPXE currently does not support.
+ * features that iPXE currently does not support.
  */
 #define  IEEE80211_STYPE_ACTION	      0x00D0
 
@@ -436,7 +436,7 @@ struct ieee80211_cts_or_ack
  * @defgroup ieee80211_status 802.11 status codes
  *
  * These are returned to indicate an immediate denial of
- * authentication or association. In gPXE, the lower 5 bits of the
+ * authentication or association. In iPXE, the lower 5 bits of the
  * status code are encoded into the file-unique portion of an error
  * code, the ERRFILE portion is always @c ERRFILE_net80211, and the
  * POSIX error code is @c ECONNREFUSED for status 0-31 or @c
@@ -496,7 +496,7 @@ struct ieee80211_cts_or_ack
  *
  * These are returned to indicate the reason for a deauthentication or
  * disassociation sent (usually) after authentication or association
- * had succeeded.  In gPXE, the lower 5 bits of the reason code are
+ * had succeeded.  In iPXE, the lower 5 bits of the reason code are
  * encoded into the file-unique portion of an error code, the ERRFILE
  * portion is always @c ERRFILE_net80211, and the POSIX error code is
  * @c ECONNRESET for reason 0-31 or @c ENETRESET for reason 32-63.
@@ -554,7 +554,7 @@ struct ieee80211_cts_or_ack
  * parts it doesn't understand. Each IE contains a two-byte header,
  * one byte ID and one byte length, followed by IE-specific data. The
  * length does not include the two-byte header. Information elements
- * are required to be sorted by ID, but gPXE does not require that in
+ * are required to be sorted by ID, but iPXE does not require that in
  * those it receives.
  *
  * This group also includes a few inline functions to simplify common
@@ -901,7 +901,7 @@ static inline size_t ieee80211_rsn_size ( int npair, int nauth, int npmkid,
 
 /** 802.11 RSN IE capabilities: Node has conflict between TKIP and WEP
  *
- * This is a legacy issue; APs always set it to 0, and gPXE sets it to
+ * This is a legacy issue; APs always set it to 0, and iPXE sets it to
  * 0.
  */
 #define  IEEE80211_RSN_CAPAB_NO_PAIRWISE 0x002
diff --git a/src/include/gpxe/if_arp.h b/src/include/ipxe/if_arp.h
index 932bb3b..fd36e9c 100644
--- a/src/include/gpxe/if_arp.h
+++ b/src/include/ipxe/if_arp.h
@@ -1,5 +1,5 @@
-#ifndef	_GPXE_IF_ARP_H
-#define	_GPXE_IF_ARP_H
+#ifndef	_IPXE_IF_ARP_H
+#define	_IPXE_IF_ARP_H
 
 /** @file
  *
@@ -99,4 +99,4 @@ static inline void * arp_target_pa ( struct arphdr *arphdr ) {
 	return ( arp_target_ha ( arphdr ) + arphdr->ar_hln );
 }
 
-#endif	/* _GPXE_IF_ARP_H */
+#endif	/* _IPXE_IF_ARP_H */
diff --git a/src/include/gpxe/if_ether.h b/src/include/ipxe/if_ether.h
index b96bee0..a526241 100644
--- a/src/include/gpxe/if_ether.h
+++ b/src/include/ipxe/if_ether.h
@@ -1,5 +1,5 @@
-#ifndef	_GPXE_IF_ETHER_H
-#define	_GPXE_IF_ETHER_H
+#ifndef	_IPXE_IF_ETHER_H
+#define	_IPXE_IF_ETHER_H
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
@@ -33,4 +33,4 @@ struct ethhdr {
         uint16_t h_protocol;
 } __attribute__ ((packed));
 
-#endif	/* _GPXE_IF_ETHER_H */
+#endif	/* _IPXE_IF_ETHER_H */
diff --git a/src/include/gpxe/image.h b/src/include/ipxe/image.h
index 10db8af..abe4a61 100644
--- a/src/include/gpxe/image.h
+++ b/src/include/ipxe/image.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IMAGE_H
-#define _GPXE_IMAGE_H
+#ifndef _IPXE_IMAGE_H
+#define _IPXE_IMAGE_H
 
 /**
  * @file
@@ -10,10 +10,10 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/tables.h>
-#include <gpxe/list.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/refcnt.h>
+#include <ipxe/tables.h>
+#include <ipxe/list.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/refcnt.h>
 
 struct uri;
 struct image_type;
@@ -191,4 +191,4 @@ static inline int image_set_name ( struct image *image, const char *name ) {
 	return 0;
 }
 
-#endif /* _GPXE_IMAGE_H */
+#endif /* _IPXE_IMAGE_H */
diff --git a/src/include/gpxe/in.h b/src/include/ipxe/in.h
index c313717..20f1ce2 100644
--- a/src/include/gpxe/in.h
+++ b/src/include/ipxe/in.h
@@ -1,10 +1,10 @@
-#ifndef	_GPXE_IN_H
-#define	_GPXE_IN_H
+#ifndef	_IPXE_IN_H
+#define	_IPXE_IN_H
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/socket.h>
+#include <ipxe/socket.h>
 
 /* Protocol numbers */
 
@@ -101,4 +101,4 @@ extern char * inet6_ntoa ( struct in_addr in );
 
  */
 
-#endif	/* _GPXE_IN_H */
+#endif	/* _IPXE_IN_H */
diff --git a/src/include/gpxe/infiniband.h b/src/include/ipxe/infiniband.h
index d90b1c1..f2eb57c 100644
--- a/src/include/gpxe/infiniband.h
+++ b/src/include/ipxe/infiniband.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_INFINIBAND_H
-#define _GPXE_INFINIBAND_H
+#ifndef _IPXE_INFINIBAND_H
+#define _IPXE_INFINIBAND_H
 
 /** @file
  *
@@ -10,10 +10,10 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/refcnt.h>
-#include <gpxe/device.h>
-#include <gpxe/ib_packet.h>
-#include <gpxe/ib_mad.h>
+#include <ipxe/refcnt.h>
+#include <ipxe/device.h>
+#include <ipxe/ib_packet.h>
+#include <ipxe/ib_mad.h>
 
 /** Subnet management interface QPN */
 #define IB_QPN_SMI 0
@@ -656,4 +656,4 @@ ib_get_ownerdata ( struct ib_device *ibdev ) {
 	return ibdev->owner_priv;
 }
 
-#endif /* _GPXE_INFINIBAND_H */
+#endif /* _IPXE_INFINIBAND_H */
diff --git a/src/include/gpxe/init.h b/src/include/ipxe/init.h
index a72cba7..10ff869 100644
--- a/src/include/gpxe/init.h
+++ b/src/include/ipxe/init.h
@@ -1,9 +1,9 @@
-#ifndef _GPXE_INIT_H
-#define _GPXE_INIT_H
+#ifndef _IPXE_INIT_H
+#define _IPXE_INIT_H
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/tables.h>
+#include <ipxe/tables.h>
 
 /**
  * An initialisation function
@@ -34,7 +34,7 @@ struct init_fn {
 
 /** Shutdown flags */
 enum shutdown_flags {
-	/** Shutdown is in order to exit (return to gPXE's caller) */
+	/** Shutdown is in order to exit (return to iPXE's caller) */
 	SHUTDOWN_EXIT = 0x0001,
 	/** Shutdown is in order to boot an OS */
 	SHUTDOWN_BOOT = 0x0002,
@@ -78,4 +78,4 @@ extern void initialise ( void );
 extern void startup ( void );
 extern void shutdown ( int flags );
 
-#endif /* _GPXE_INIT_H */
+#endif /* _IPXE_INIT_H */
diff --git a/src/include/gpxe/interface.h b/src/include/ipxe/interface.h
index 114ebf3..4104105 100644
--- a/src/include/gpxe/interface.h
+++ b/src/include/ipxe/interface.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_INTERFACE_H
-#define _GPXE_INTERFACE_H
+#ifndef _IPXE_INTERFACE_H
+#define _IPXE_INTERFACE_H
 
 /** @file
  *
@@ -9,7 +9,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/refcnt.h>
+#include <ipxe/refcnt.h>
 
 /** An object communication interface */
 struct interface {
@@ -55,4 +55,4 @@ intf_put ( struct interface *intf ) {
 extern void plug ( struct interface *intf, struct interface *dest );
 extern void plug_plug ( struct interface *a, struct interface *b );
 
-#endif /* _GPXE_INTERFACE_H */
+#endif /* _IPXE_INTERFACE_H */
diff --git a/src/include/gpxe/io.h b/src/include/ipxe/io.h
index 919823d..5bfd899 100644
--- a/src/include/gpxe/io.h
+++ b/src/include/ipxe/io.h
@@ -1,9 +1,9 @@
-#ifndef _GPXE_IO_H
-#define _GPXE_IO_H
+#ifndef _IPXE_IO_H
+#define _IPXE_IO_H
 
 /** @file
  *
- * gPXE I/O API
+ * iPXE I/O API
  *
  * The I/O API provides methods for reading from and writing to
  * memory-mapped and I/O-mapped devices.
@@ -19,9 +19,9 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/api.h>
+#include <ipxe/api.h>
 #include <config/ioapi.h>
-#include <gpxe/uaccess.h>
+#include <ipxe/uaccess.h>
 
 /**
  * Calculate static inline I/O API function name
@@ -53,7 +53,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 	PROVIDE_SINGLE_API_INLINE ( IOAPI_PREFIX_ ## _subsys, _api_func )
 
 /* Include all architecture-independent I/O API headers */
-#include <gpxe/efi/efi_io.h>
+#include <ipxe/efi/efi_io.h>
 
 /* Include all architecture-dependent I/O API headers */
 #include <bits/io.h>
@@ -503,4 +503,4 @@ void mb ( void );
 #define rmb()	mb()
 #define wmb()	mb()
 
-#endif /* _GPXE_IO_H */
+#endif /* _IPXE_IO_H */
diff --git a/src/include/gpxe/iobuf.h b/src/include/ipxe/iobuf.h
index 8f05f9e..82c8b88 100644
--- a/src/include/gpxe/iobuf.h
+++ b/src/include/ipxe/iobuf.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IOBUF_H
-#define _GPXE_IOBUF_H
+#ifndef _IPXE_IOBUF_H
+#define _IPXE_IOBUF_H
 
 /** @file
  *
@@ -11,7 +11,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
 #include <assert.h>
-#include <gpxe/list.h>
+#include <ipxe/list.h>
 
 /**
  * I/O buffer alignment
@@ -226,4 +226,4 @@ extern void free_iob ( struct io_buffer *iobuf );
 extern void iob_pad ( struct io_buffer *iobuf, size_t min_len );
 extern int iob_ensure_headroom ( struct io_buffer *iobuf, size_t len );
 
-#endif /* _GPXE_IOBUF_H */
+#endif /* _IPXE_IOBUF_H */
diff --git a/src/include/gpxe/ip.h b/src/include/ipxe/ip.h
index 4342a0c..e3445aa 100644
--- a/src/include/gpxe/ip.h
+++ b/src/include/ipxe/ip.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IP_H
-#define _GPXE_IP_H
+#ifndef _IPXE_IP_H
+#define _IPXE_IP_H
 
 /** @file
  *
@@ -10,9 +10,9 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/in.h>
-#include <gpxe/list.h>
-#include <gpxe/retry.h>
+#include <ipxe/in.h>
+#include <ipxe/list.h>
+#include <ipxe/retry.h>
 
 struct io_buffer;
 struct net_device;
@@ -94,4 +94,4 @@ extern struct list_head ipv4_miniroutes;
 
 extern struct net_protocol ipv4_protocol;
 
-#endif /* _GPXE_IP_H */
+#endif /* _IPXE_IP_H */
diff --git a/src/include/gpxe/ip6.h b/src/include/ipxe/ip6.h
index edb2863..70c2fad 100644
--- a/src/include/gpxe/ip6.h
+++ b/src/include/ipxe/ip6.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IP6_H
-#define _GPXE_IP6_H
+#ifndef _IPXE_IP6_H
+#define _IPXE_IP6_H
 
 /** @file
  *
@@ -10,7 +10,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/in.h>
+#include <ipxe/in.h>
 
 /* IP6 constants */
 
@@ -77,4 +77,4 @@ extern int add_ipv6_address ( struct net_device *netdev,
 			      struct in6_addr gateway );
 extern void del_ipv6_address ( struct net_device *netdev );
 
-#endif /* _GPXE_IP6_H */
+#endif /* _IPXE_IP6_H */
diff --git a/src/include/gpxe/ipoib.h b/src/include/ipxe/ipoib.h
index 1d02f79..31b0c1b 100644
--- a/src/include/gpxe/ipoib.h
+++ b/src/include/ipxe/ipoib.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_IPOIB_H
-#define _GPXE_IPOIB_H
+#ifndef _IPXE_IPOIB_H
+#define _IPXE_IPOIB_H
 
 /** @file
  *
@@ -8,7 +8,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/infiniband.h>
+#include <ipxe/infiniband.h>
 
 /** IPoIB MAC address length */
 #define IPOIB_ALEN 20
@@ -58,4 +58,4 @@ extern int ipoib_probe ( struct ib_device *ibdev );
 extern void ipoib_remove ( struct ib_device *ibdev );
 extern struct net_device * alloc_ipoibdev ( size_t priv_size );
 
-#endif /* _GPXE_IPOIB_H */
+#endif /* _IPXE_IPOIB_H */
diff --git a/src/include/gpxe/isa.h b/src/include/ipxe/isa.h
index 63027a5..6d8f761 100644
--- a/src/include/gpxe/isa.h
+++ b/src/include/ipxe/isa.h
@@ -4,9 +4,9 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/isa_ids.h>
-#include <gpxe/device.h>
-#include <gpxe/tables.h>
+#include <ipxe/isa_ids.h>
+#include <ipxe/device.h>
+#include <ipxe/tables.h>
 
 /** An ISA device */
 struct isa_device {
diff --git a/src/include/gpxe/isa_ids.h b/src/include/ipxe/isa_ids.h
index 1faf114..1faf114 100644
--- a/src/include/gpxe/isa_ids.h
+++ b/src/include/ipxe/isa_ids.h
diff --git a/src/include/gpxe/isapnp.h b/src/include/ipxe/isapnp.h
index b58a87e..f2b0b34 100644
--- a/src/include/gpxe/isapnp.h
+++ b/src/include/ipxe/isapnp.h
@@ -39,9 +39,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define ISAPNP_H
 
 #include <stdint.h>
-#include <gpxe/isa_ids.h>
-#include <gpxe/device.h>
-#include <gpxe/tables.h>
+#include <ipxe/isa_ids.h>
+#include <ipxe/device.h>
+#include <ipxe/tables.h>
 
 /*
  * ISAPnP constants
diff --git a/src/include/gpxe/iscsi.h b/src/include/ipxe/iscsi.h
index 00717d2..c5e7251 100644
--- a/src/include/gpxe/iscsi.h
+++ b/src/include/ipxe/iscsi.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ISCSI_H
-#define _GPXE_ISCSI_H
+#ifndef _IPXE_ISCSI_H
+#define _IPXE_ISCSI_H
 
 /** @file
  *
@@ -10,12 +10,12 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/socket.h>
-#include <gpxe/scsi.h>
-#include <gpxe/chap.h>
-#include <gpxe/refcnt.h>
-#include <gpxe/xfer.h>
-#include <gpxe/process.h>
+#include <ipxe/socket.h>
+#include <ipxe/scsi.h>
+#include <ipxe/chap.h>
+#include <ipxe/refcnt.h>
+#include <ipxe/xfer.h>
+#include <ipxe/process.h>
 
 /** Default iSCSI port */
 #define ISCSI_PORT 3260
@@ -675,4 +675,4 @@ extern int iscsi_attach ( struct scsi_device *scsi, const char *root_path );
 extern void iscsi_detach ( struct scsi_device *scsi );
 extern const char * iscsi_initiator_iqn ( void );
 
-#endif /* _GPXE_ISCSI_H */
+#endif /* _IPXE_ISCSI_H */
diff --git a/src/include/gpxe/job.h b/src/include/ipxe/job.h
index f1bcada..893a790 100644
--- a/src/include/gpxe/job.h
+++ b/src/include/ipxe/job.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_JOB_H
-#define _GPXE_JOB_H
+#ifndef _IPXE_JOB_H
+#define _IPXE_JOB_H
 
 /** @file
  *
@@ -10,7 +10,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stddef.h>
-#include <gpxe/interface.h>
+#include <ipxe/interface.h>
 
 /** Job progress */
 struct job_progress {
@@ -166,4 +166,4 @@ static inline void job_nullify ( struct job_interface *job ) {
 	job->op = &null_job_ops;
 };
 
-#endif /* _GPXE_JOB_H */
+#endif /* _IPXE_JOB_H */
diff --git a/src/include/gpxe/keys.h b/src/include/ipxe/keys.h
index 25bc9bc..dba65ec 100644
--- a/src/include/gpxe/keys.h
+++ b/src/include/ipxe/keys.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_KEYS_H
-#define _GPXE_KEYS_H
+#ifndef _IPXE_KEYS_H
+#define _IPXE_KEYS_H
 
 /** @file
  *
@@ -78,4 +78,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define KEY_BACKSPACE	BACKSPACE
 #define KEY_ENTER	LF
 
-#endif /* _GPXE_KEYS_H */
+#endif /* _IPXE_KEYS_H */
diff --git a/src/include/gpxe/linebuf.h b/src/include/ipxe/linebuf.h
index cfa2147..706ef25 100644
--- a/src/include/gpxe/linebuf.h
+++ b/src/include/ipxe/linebuf.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_LINEBUF_H
-#define _GPXE_LINEBUF_H
+#ifndef _IPXE_LINEBUF_H
+#define _IPXE_LINEBUF_H
 
 /** @file
  *
@@ -27,4 +27,4 @@ extern ssize_t line_buffer ( struct line_buffer *linebuf,
 			     const char *data, size_t len );
 extern void empty_line_buffer ( struct line_buffer *linebuf );
 
-#endif /* _GPXE_LINEBUF_H */
+#endif /* _IPXE_LINEBUF_H */
diff --git a/src/include/gpxe/linux_compat.h b/src/include/ipxe/linux_compat.h
index 577512e..6f6ed97 100644
--- a/src/include/gpxe/linux_compat.h
+++ b/src/include/ipxe/linux_compat.h
@@ -1,12 +1,12 @@
-#ifndef _GPXE_LINUX_COMPAT_H
-#define _GPXE_LINUX_COMPAT_H
+#ifndef _IPXE_LINUX_COMPAT_H
+#define _IPXE_LINUX_COMPAT_H
 
 /** @file
  *
  * Linux code compatibility
  *
  * This file exists to ease the building of Linux source code within
- * gPXE.  This is intended to facilitate quick testing; it is not
+ * iPXE.  This is intended to facilitate quick testing; it is not
  * intended to be a substitute for proper porting.
  */
 
@@ -16,7 +16,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <errno.h>
 #include <stdio.h>
 #include <byteswap.h>
-#include <gpxe/bitops.h>
+#include <ipxe/bitops.h>
 
 #define __init
 #define __exit
@@ -24,4 +24,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define __exitdata
 #define printk printf
 
-#endif /* _GPXE_LINUX_COMPAT_H */
+#endif /* _IPXE_LINUX_COMPAT_H */
diff --git a/src/include/gpxe/list.h b/src/include/ipxe/list.h
index 22ba201..743a3e2 100644
--- a/src/include/gpxe/list.h
+++ b/src/include/ipxe/list.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_LIST_H
-#define _GPXE_LIST_H
+#ifndef _IPXE_LIST_H
+#define _IPXE_LIST_H
 
 /** @file
  *
@@ -177,4 +177,4 @@ static inline int list_empty ( const struct list_head *head ) {
 	      pos = tmp,						      \
 	      tmp = list_entry ( tmp->member.next, typeof ( *tmp ), member ) )
 
-#endif /* _GPXE_LIST_H */
+#endif /* _IPXE_LIST_H */
diff --git a/src/include/gpxe/login_ui.h b/src/include/ipxe/login_ui.h
index 4196f7b..01e5479 100644
--- a/src/include/gpxe/login_ui.h
+++ b/src/include/ipxe/login_ui.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_LOGIN_UI_H
-#define _GPXE_LOGIN_UI_H
+#ifndef _IPXE_LOGIN_UI_H
+#define _IPXE_LOGIN_UI_H
 
 /** @file
  *
@@ -11,4 +11,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 extern int login_ui ( void );
 
-#endif /* _GPXE_LOGIN_UI_H */
+#endif /* _IPXE_LOGIN_UI_H */
diff --git a/src/include/gpxe/malloc.h b/src/include/ipxe/malloc.h
index c02a866..a1b656c 100644
--- a/src/include/gpxe/malloc.h
+++ b/src/include/ipxe/malloc.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_MALLOC_H
-#define _GPXE_MALLOC_H
+#ifndef _IPXE_MALLOC_H
+#define _IPXE_MALLOC_H
 
 #include <stdint.h>
 
@@ -13,7 +13,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 /*
  * Prototypes for the standard functions (malloc() et al) are in
- * stdlib.h.  Include <gpxe/malloc.h> only if you need the
+ * stdlib.h.  Include <ipxe/malloc.h> only if you need the
  * non-standard functions, such as malloc_dma().
  *
  */
@@ -56,4 +56,4 @@ static inline void free_dma ( void *ptr, size_t size ) {
 	free_memblock ( ptr, size );
 }
 
-#endif /* _GPXE_MALLOC_H */
+#endif /* _IPXE_MALLOC_H */
diff --git a/src/include/gpxe/mca.h b/src/include/ipxe/mca.h
index da9d73e..79543c1 100644
--- a/src/include/gpxe/mca.h
+++ b/src/include/ipxe/mca.h
@@ -10,9 +10,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #ifndef MCA_H
 #define MCA_H
 
-#include <gpxe/isa_ids.h>
-#include <gpxe/device.h>
-#include <gpxe/tables.h>
+#include <ipxe/isa_ids.h>
+#include <ipxe/device.h>
+#include <ipxe/tables.h>
 
 /*
  * MCA constants
diff --git a/src/include/gpxe/md5.h b/src/include/ipxe/md5.h
index 03d65c1..c3dfeb7 100644
--- a/src/include/gpxe/md5.h
+++ b/src/include/ipxe/md5.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_MD5_H
-#define _GPXE_MD5_H
+#ifndef _IPXE_MD5_H
+#define _IPXE_MD5_H
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
@@ -21,4 +21,4 @@ struct md5_ctx {
 
 extern struct digest_algorithm md5_algorithm;
 
-#endif /* _GPXE_MD5_H */
+#endif /* _IPXE_MD5_H */
diff --git a/src/include/gpxe/memmap.h b/src/include/ipxe/memmap.h
index dc5bec3..cfd3fe9 100644
--- a/src/include/gpxe/memmap.h
+++ b/src/include/ipxe/memmap.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_MEMMAP_H
-#define _GPXE_MEMMAP_H
+#ifndef _IPXE_MEMMAP_H
+#define _IPXE_MEMMAP_H
 
 #include <stdint.h>
 
@@ -33,4 +33,4 @@ struct memory_map {
 
 extern void get_memmap ( struct memory_map *memmap );
 
-#endif /* _GPXE_MEMMAP_H */
+#endif /* _IPXE_MEMMAP_H */
diff --git a/src/include/gpxe/monojob.h b/src/include/ipxe/monojob.h
index 35ff4fd..b2f3dfd 100644
--- a/src/include/gpxe/monojob.h
+++ b/src/include/ipxe/monojob.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_MONOJOB_H
-#define _GPXE_MONOJOB_H
+#ifndef _IPXE_MONOJOB_H
+#define _IPXE_MONOJOB_H
 
 /** @file
  *
@@ -14,4 +14,4 @@ struct job_interface;
 extern struct job_interface monojob;
 extern int monojob_wait ( const char *string );
 
-#endif /* _GPXE_MONOJOB_H */
+#endif /* _IPXE_MONOJOB_H */
diff --git a/src/include/gpxe/nap.h b/src/include/ipxe/nap.h
index 6c2e40c..90bd958 100644
--- a/src/include/gpxe/nap.h
+++ b/src/include/ipxe/nap.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_NAP_H
-#define _GPXE_NAP_H
+#ifndef _IPXE_NAP_H
+#define _IPXE_NAP_H
 
 /** @file
  *
@@ -9,7 +9,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/api.h>
+#include <ipxe/api.h>
 #include <config/nap.h>
 
 /**
@@ -42,7 +42,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 	PROVIDE_SINGLE_API_INLINE ( NAP_PREFIX_ ## _subsys, _api_func )
 
 /* Include all architecture-independent I/O API headers */
-#include <gpxe/null_nap.h>
+#include <ipxe/null_nap.h>
 
 /* Include all architecture-dependent I/O API headers */
 #include <bits/nap.h>
@@ -53,4 +53,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
  */
 void cpu_nap ( void );
 
-#endif /* _GPXE_NAP_H */
+#endif /* _IPXE_NAP_H */
diff --git a/src/include/gpxe/ndp.h b/src/include/ipxe/ndp.h
index db32b0c..42bb2fe 100644
--- a/src/include/gpxe/ndp.h
+++ b/src/include/ipxe/ndp.h
@@ -1,12 +1,12 @@
 #include <stdint.h>
 #include <byteswap.h>
 #include <string.h>
-#include <gpxe/icmp6.h>
-#include <gpxe/ip6.h>
-#include <gpxe/in.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/tcpip.h>
+#include <ipxe/icmp6.h>
+#include <ipxe/ip6.h>
+#include <ipxe/in.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/tcpip.h>
 
 #define NDP_STATE_INVALID 0
 #define NDP_STATE_INCOMPLETE 1
diff --git a/src/include/gpxe/net80211.h b/src/include/ipxe/net80211.h
index 027e091..d70eb7c 100644
--- a/src/include/gpxe/net80211.h
+++ b/src/include/ipxe/net80211.h
@@ -1,15 +1,15 @@
-#ifndef _GPXE_NET80211_H
-#define _GPXE_NET80211_H
+#ifndef _IPXE_NET80211_H
+#define _IPXE_NET80211_H
 
-#include <gpxe/process.h>
-#include <gpxe/ieee80211.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/rc80211.h>
+#include <ipxe/process.h>
+#include <ipxe/ieee80211.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/rc80211.h>
 
 /** @file
  *
- * The gPXE 802.11 MAC layer.
+ * The iPXE 802.11 MAC layer.
  */
 
 /*
@@ -156,7 +156,7 @@ enum net80211_crypto_alg {
 	 * There exists one known attack on TKIP, that allows one to
 	 * send between 7 and 15 arbitrary short data packets on a
 	 * QoS-enabled network given about an hour of data
-	 * gathering. Since gPXE does not support QoS for 802.11
+	 * gathering. Since iPXE does not support QoS for 802.11
 	 * networks, this is not a threat to us. The only other method
 	 * is a brute-force passphrase attack.
 	 */
@@ -680,7 +680,7 @@ struct net80211_handshaker
 /** Interface to an 802.11 cryptosystem
  *
  * Cryptosystems define a net80211_crypto structure statically, using
- * a gPXE linker table to make it available to the 802.11 layer. When
+ * a iPXE linker table to make it available to the 802.11 layer. When
  * the cryptosystem needs to be used, the 802.11 code will allocate a
  * copy of the static definition plus whatever space the algorithm has
  * requested for private state, and point net80211_device::crypto or
@@ -902,7 +902,7 @@ struct net80211_device
 	 * defined) explaining why it canceled an association after it
 	 * had originally OK'ed it. Status and reason codes serve
 	 * similar functions, but they use separate error message
-	 * tables. A gPXE-formatted return status code (negative) is
+	 * tables. A iPXE-formatted return status code (negative) is
 	 * placed in @c assoc_rc.
 	 *
 	 * If the failure to associate is indicated by a status code,
@@ -1058,7 +1058,7 @@ struct net80211_wlan
 	/** The human-readable ESSID (network name)
 	 *
 	 * Although the 802.11 SSID field is generally not
-	 * NUL-terminated, the gPXE code adds an extra NUL (and
+	 * NUL-terminated, the iPXE code adds an extra NUL (and
 	 * expects one in this structure) for convenience.
 	 */
 	char essid[IEEE80211_MAX_SSID_LEN+1];
diff --git a/src/include/gpxe/netdevice.h b/src/include/ipxe/netdevice.h
index 97bf168..f829327 100644
--- a/src/include/gpxe/netdevice.h
+++ b/src/include/ipxe/netdevice.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_NETDEVICE_H
-#define _GPXE_NETDEVICE_H
+#ifndef _IPXE_NETDEVICE_H
+#define _IPXE_NETDEVICE_H
 
 /** @file
  *
@@ -10,10 +10,10 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/list.h>
-#include <gpxe/tables.h>
-#include <gpxe/refcnt.h>
-#include <gpxe/settings.h>
+#include <ipxe/list.h>
+#include <ipxe/tables.h>
+#include <ipxe/refcnt.h>
+#include <ipxe/settings.h>
 
 struct io_buffer;
 struct net_device;
@@ -554,4 +554,4 @@ static inline void netdev_tx_complete_next ( struct net_device *netdev ) {
 	netdev_tx_complete_next_err ( netdev, 0 );
 }
 
-#endif /* _GPXE_NETDEVICE_H */
+#endif /* _IPXE_NETDEVICE_H */
diff --git a/src/include/gpxe/null_nap.h b/src/include/ipxe/null_nap.h
index 0f46eaa..0c0704b 100644
--- a/src/include/gpxe/null_nap.h
+++ b/src/include/ipxe/null_nap.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_NULL_NAP_H
-#define _GPXE_NULL_NAP_H
+#ifndef _IPXE_NULL_NAP_H
+#define _IPXE_NULL_NAP_H
 
 /** @file
  *
@@ -20,4 +20,4 @@ NAP_INLINE ( null, cpu_nap ) ( void ) {
 	/* Do nothing */
 }
 
-#endif /* _GPXE_NULL_NAP_H */
+#endif /* _IPXE_NULL_NAP_H */
diff --git a/src/include/gpxe/nvo.h b/src/include/ipxe/nvo.h
index c965070..0a0222b 100644
--- a/src/include/gpxe/nvo.h
+++ b/src/include/ipxe/nvo.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_NVO_H
-#define _GPXE_NVO_H
+#ifndef _IPXE_NVO_H
+#define _IPXE_NVO_H
 
 /** @file
  *
@@ -10,8 +10,8 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/dhcpopts.h>
-#include <gpxe/settings.h>
+#include <ipxe/dhcpopts.h>
+#include <ipxe/settings.h>
 
 struct nvs_device;
 struct refcnt;
@@ -52,4 +52,4 @@ extern void nvo_init ( struct nvo_block *nvo, struct nvs_device *nvs,
 extern int register_nvo ( struct nvo_block *nvo, struct settings *parent );
 extern void unregister_nvo ( struct nvo_block *nvo );
 
-#endif /* _GPXE_NVO_H */
+#endif /* _IPXE_NVO_H */
diff --git a/src/include/gpxe/nvs.h b/src/include/ipxe/nvs.h
index 5c90c65..4733123 100644
--- a/src/include/gpxe/nvs.h
+++ b/src/include/ipxe/nvs.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_NVS_H
-#define _GPXE_NVS_H
+#ifndef _IPXE_NVS_H
+#define _IPXE_NVS_H
 
 /** @file
  *
@@ -65,4 +65,4 @@ extern int nvs_read ( struct nvs_device *nvs, unsigned int address,
 extern int nvs_write ( struct nvs_device *nvs, unsigned int address,
 		       const void *data, size_t len );
 
-#endif /* _GPXE_NVS_H */
+#endif /* _IPXE_NVS_H */
diff --git a/src/include/gpxe/open.h b/src/include/ipxe/open.h
index ebf754d..04e37e0 100644
--- a/src/include/gpxe/open.h
+++ b/src/include/ipxe/open.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_OPEN_H
-#define _GPXE_OPEN_H
+#ifndef _IPXE_OPEN_H
+#define _IPXE_OPEN_H
 
 /** @file
  *
@@ -10,8 +10,8 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdarg.h>
-#include <gpxe/tables.h>
-#include <gpxe/socket.h>
+#include <ipxe/tables.h>
+#include <ipxe/socket.h>
 
 struct xfer_interface;
 struct uri;
@@ -102,4 +102,4 @@ extern int xfer_open ( struct xfer_interface *xfer, int type, ... );
 extern int xfer_vreopen ( struct xfer_interface *xfer, int type,
 			  va_list args );
 
-#endif /* _GPXE_OPEN_H */
+#endif /* _IPXE_OPEN_H */
diff --git a/src/include/gpxe/pci.h b/src/include/ipxe/pci.h
index 8bcf1e0..60ac8bf 100644
--- a/src/include/gpxe/pci.h
+++ b/src/include/ipxe/pci.h
@@ -1,5 +1,5 @@
-#ifndef	_GPXE_PCI_H
-#define _GPXE_PCI_H
+#ifndef	_IPXE_PCI_H
+#define _IPXE_PCI_H
 
 /*
  * Support for NE2000 PCI clones added David Monro June 1997
@@ -19,9 +19,9 @@
 FILE_LICENCE ( GPL2_ONLY );
 
 #include <stdint.h>
-#include <gpxe/device.h>
-#include <gpxe/tables.h>
-#include <gpxe/pci_io.h>
+#include <ipxe/device.h>
+#include <ipxe/tables.h>
+#include <ipxe/pci_io.h>
 #include "pci_ids.h"
 
 /*
@@ -399,4 +399,4 @@ static inline void * pci_get_drvdata ( struct pci_device *pci ) {
 	return pci->priv;
 }
 
-#endif	/* _GPXE_PCI_H */
+#endif	/* _IPXE_PCI_H */
diff --git a/src/include/gpxe/pci_ids.h b/src/include/ipxe/pci_ids.h
index 4207013..25c7782 100644
--- a/src/include/gpxe/pci_ids.h
+++ b/src/include/ipxe/pci_ids.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_PCI_IDS_H
-#define _GPXE_PCI_IDS_H
+#ifndef _IPXE_PCI_IDS_H
+#define _IPXE_PCI_IDS_H
 
 /*
  *	PCI Class, Vendor and Device IDs
@@ -348,4 +348,4 @@ FILE_LICENCE ( GPL2_ONLY );
 #define PCI_VENDOR_ID_TIGERJET		0xe159
 #define PCI_VENDOR_ID_ARK		0xedd8
 
-#endif /* _GPXE_PCI_IDS_H */
+#endif /* _IPXE_PCI_IDS_H */
diff --git a/src/include/gpxe/pci_io.h b/src/include/ipxe/pci_io.h
index 8b2729a..1188090 100644
--- a/src/include/gpxe/pci_io.h
+++ b/src/include/ipxe/pci_io.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_PCI_IO_H
-#define _GPXE_PCI_IO_H
+#ifndef _IPXE_PCI_IO_H
+#define _IPXE_PCI_IO_H
 
 /** @file
  *
@@ -10,7 +10,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/api.h>
+#include <ipxe/api.h>
 #include <config/ioapi.h>
 
 /**
@@ -43,7 +43,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 	PROVIDE_SINGLE_API_INLINE ( PCIAPI_PREFIX_ ## _subsys, _api_func )
 
 /* Include all architecture-independent I/O API headers */
-#include <gpxe/efi/efi_pci.h>
+#include <ipxe/efi/efi_pci.h>
 
 /* Include all architecture-dependent I/O API headers */
 #include <bits/pci_io.h>
@@ -121,4 +121,4 @@ int pci_write_config_word ( struct pci_device *pci, unsigned int where,
 int pci_write_config_dword ( struct pci_device *pci, unsigned int where,
 			     uint32_t value );
 
-#endif /* _GPXE_PCI_IO_H */
+#endif /* _IPXE_PCI_IO_H */
diff --git a/src/include/gpxe/pcibackup.h b/src/include/ipxe/pcibackup.h
index 3d295c0..b9f55cf 100644
--- a/src/include/gpxe/pcibackup.h
+++ b/src/include/ipxe/pcibackup.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_PCIBACKUP_H
-#define _GPXE_PCIBACKUP_H
+#ifndef _IPXE_PCIBACKUP_H
+#define _IPXE_PCIBACKUP_H
 
 /** @file
  *
@@ -30,4 +30,4 @@ extern void pci_restore ( struct pci_device *pci,
 			  struct pci_config_backup *backup,
 			  const uint8_t *exclude );
 
-#endif /* _GPXE_PCIBACKUP_H */
+#endif /* _IPXE_PCIBACKUP_H */
diff --git a/src/include/gpxe/posix_io.h b/src/include/ipxe/posix_io.h
index 3063dff..11f3bb5 100644
--- a/src/include/gpxe/posix_io.h
+++ b/src/include/ipxe/posix_io.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_POSIX_IO_H
-#define _GPXE_POSIX_IO_H
+#ifndef _IPXE_POSIX_IO_H
+#define _IPXE_POSIX_IO_H
 
 /** @file
  *
@@ -10,7 +10,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/uaccess.h>
+#include <ipxe/uaccess.h>
 
 /** Minimum file descriptor that will ever be allocated */
 #define POSIX_FD_MIN ( 1 )
@@ -84,4 +84,4 @@ static inline ssize_t read ( int fd, void *buf, size_t len ) {
 	return read_user ( fd, virt_to_user ( buf ), 0, len );
 }
 
-#endif /* _GPXE_POSIX_IO_H */
+#endif /* _IPXE_POSIX_IO_H */
diff --git a/src/include/gpxe/process.h b/src/include/ipxe/process.h
index 944858d..7cd5b91 100644
--- a/src/include/gpxe/process.h
+++ b/src/include/ipxe/process.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_PROCESS_H
-#define _GPXE_PROCESS_H
+#ifndef _IPXE_PROCESS_H
+#define _IPXE_PROCESS_H
 
 /** @file
  *
@@ -9,9 +9,9 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/list.h>
-#include <gpxe/refcnt.h>
-#include <gpxe/tables.h>
+#include <ipxe/list.h>
+#include <ipxe/refcnt.h>
+#include <ipxe/tables.h>
 
 /** A process */
 struct process {
@@ -77,4 +77,4 @@ process_init ( struct process *process,
  */
 #define __permanent_process __table_entry ( PERMANENT_PROCESSES, 01 )
 
-#endif /* _GPXE_PROCESS_H */
+#endif /* _IPXE_PROCESS_H */
diff --git a/src/include/gpxe/profile.h b/src/include/ipxe/profile.h
index a5bdd3a..60dd53a 100644
--- a/src/include/gpxe/profile.h
+++ b/src/include/ipxe/profile.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_PROFILE_H
-#define _GPXE_PROFILE_H
+#ifndef _IPXE_PROFILE_H
+#define _IPXE_PROFILE_H
 
 /** @file
  *
@@ -77,4 +77,4 @@ simple_profile ( void ) {
 	return profile ( &simple_profiler );
 }
 
-#endif /* _GPXE_PROFILE_H */
+#endif /* _IPXE_PROFILE_H */
diff --git a/src/include/gpxe/ramdisk.h b/src/include/ipxe/ramdisk.h
index 31a1d99..012ac73 100644
--- a/src/include/gpxe/ramdisk.h
+++ b/src/include/ipxe/ramdisk.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_RAMDISK_H
-#define _GPXE_RAMDISK_H
+#ifndef _IPXE_RAMDISK_H
+#define _IPXE_RAMDISK_H
 
 /**
  * @file
@@ -10,8 +10,8 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/uaccess.h>
-#include <gpxe/blockdev.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/blockdev.h>
 
 struct ramdisk {
 	struct block_device blockdev;
@@ -21,4 +21,4 @@ struct ramdisk {
 extern int init_ramdisk ( struct ramdisk *ramdisk, userptr_t data, size_t len,
 			  unsigned int blksize );
 
-#endif /* _GPXE_RAMDISK_H */
+#endif /* _IPXE_RAMDISK_H */
diff --git a/src/include/gpxe/rarp.h b/src/include/ipxe/rarp.h
index 7ade831..7edbe21 100644
--- a/src/include/gpxe/rarp.h
+++ b/src/include/ipxe/rarp.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_RARP_H
-#define _GPXE_RARP_H
+#ifndef _IPXE_RARP_H
+#define _IPXE_RARP_H
 
 /** @file
  *
@@ -13,4 +13,4 @@ struct net_protocol;
 
 extern struct net_protocol rarp_protocol;
 
-#endif /* _GPXE_RARP_H */
+#endif /* _IPXE_RARP_H */
diff --git a/src/include/gpxe/rc80211.h b/src/include/ipxe/rc80211.h
index 0856896..eac6bc9 100644
--- a/src/include/gpxe/rc80211.h
+++ b/src/include/ipxe/rc80211.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_RC80211_H
-#define _GPXE_RC80211_H
+#ifndef _IPXE_RC80211_H
+#define _IPXE_RC80211_H
 
 /** @file
  *
@@ -16,4 +16,4 @@ void rc80211_update_tx ( struct net80211_device *dev, int retries, int rc );
 void rc80211_update_rx ( struct net80211_device *dev, int retry, u16 rate );
 void rc80211_free ( struct rc80211_ctx *ctx );
 
-#endif /* _GPXE_RC80211_H */
+#endif /* _IPXE_RC80211_H */
diff --git a/src/include/gpxe/refcnt.h b/src/include/ipxe/refcnt.h
index e56f1d3..4b02322 100644
--- a/src/include/gpxe/refcnt.h
+++ b/src/include/ipxe/refcnt.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_REFCNT_H
-#define _GPXE_REFCNT_H
+#ifndef _IPXE_REFCNT_H
+#define _IPXE_REFCNT_H
 
 /** @file
  *
@@ -43,4 +43,4 @@ struct refcnt {
 extern struct refcnt * ref_get ( struct refcnt *refcnt );
 extern void ref_put ( struct refcnt *refcnt );
 
-#endif /* _GPXE_REFCNT_H */
+#endif /* _IPXE_REFCNT_H */
diff --git a/src/include/gpxe/resolv.h b/src/include/ipxe/resolv.h
index 33bb098..c7d6199 100644
--- a/src/include/gpxe/resolv.h
+++ b/src/include/ipxe/resolv.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_RESOLV_H
-#define _GPXE_RESOLV_H
+#ifndef _IPXE_RESOLV_H
+#define _IPXE_RESOLV_H
 
 /** @file
  *
@@ -9,10 +9,10 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/refcnt.h>
-#include <gpxe/interface.h>
-#include <gpxe/tables.h>
-#include <gpxe/socket.h>
+#include <ipxe/refcnt.h>
+#include <ipxe/interface.h>
+#include <ipxe/tables.h>
+#include <ipxe/socket.h>
 
 struct resolv_interface;
 
@@ -167,4 +167,4 @@ extern struct resolv_interface null_resolv;
 extern int resolv ( struct resolv_interface *resolv, const char *name,
 		    struct sockaddr *sa );
 
-#endif /* _GPXE_RESOLV_H */
+#endif /* _IPXE_RESOLV_H */
diff --git a/src/include/gpxe/retry.h b/src/include/ipxe/retry.h
index ada0204..370a599 100644
--- a/src/include/gpxe/retry.h
+++ b/src/include/ipxe/retry.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_RETRY_H
-#define _GPXE_RETRY_H
+#ifndef _IPXE_RETRY_H
+#define _IPXE_RETRY_H
 
 /** @file
  *
@@ -9,7 +9,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/list.h>
+#include <ipxe/list.h>
 
 /** Default timeout value */
 #define DEFAULT_MIN_TIMEOUT ( TICKS_PER_SEC / 4 )
@@ -78,4 +78,4 @@ timer_running ( struct retry_timer *timer ) {
 	return ( timer->running );
 }
 
-#endif /* _GPXE_RETRY_H */
+#endif /* _IPXE_RETRY_H */
diff --git a/src/include/gpxe/rotate.h b/src/include/ipxe/rotate.h
index 0371c57..745d84e 100644
--- a/src/include/gpxe/rotate.h
+++ b/src/include/ipxe/rotate.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_ROTATE_H
-#define _GPXE_ROTATE_H
+#ifndef _IPXE_ROTATE_H
+#define _IPXE_ROTATE_H
 
 /** @file
  *
@@ -26,4 +26,4 @@ static inline uint64_t ror64 ( uint64_t data, unsigned int rotation ) {
         return ( ( data >> rotation ) | ( data << ( 64 - rotation ) ) );
 }
 
-#endif /* _GPXE_ROTATE_H */
+#endif /* _IPXE_ROTATE_H */
diff --git a/src/include/gpxe/rsa.h b/src/include/ipxe/rsa.h
index 5052ad4..a080f9f 100644
--- a/src/include/gpxe/rsa.h
+++ b/src/include/ipxe/rsa.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_RSA_H
-#define _GPXE_RSA_H
+#ifndef _IPXE_RSA_H
+#define _IPXE_RSA_H
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
@@ -9,4 +9,4 @@ extern struct pubkey_algorithm rsa_algorithm;
 
 #include "crypto/axtls/crypto.h"
 
-#endif /* _GPXE_RSA_H */
+#endif /* _IPXE_RSA_H */
diff --git a/src/include/gpxe/sanboot.h b/src/include/ipxe/sanboot.h
index fd06316..d27452c 100644
--- a/src/include/gpxe/sanboot.h
+++ b/src/include/ipxe/sanboot.h
@@ -1,9 +1,9 @@
-#ifndef _GPXE_SANBOOT_H
-#define _GPXE_SANBOOT_H
+#ifndef _IPXE_SANBOOT_H
+#define _IPXE_SANBOOT_H
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/tables.h>
+#include <ipxe/tables.h>
 
 struct sanboot_protocol {
 	const char *prefix;
@@ -17,4 +17,4 @@ struct sanboot_protocol {
 
 extern int keep_san ( void );
 
-#endif /* _GPXE_SANBOOT_H */
+#endif /* _IPXE_SANBOOT_H */
diff --git a/src/include/gpxe/scsi.h b/src/include/ipxe/scsi.h
index 9741697..b56ab75 100644
--- a/src/include/gpxe/scsi.h
+++ b/src/include/ipxe/scsi.h
@@ -1,10 +1,10 @@
-#ifndef _GPXE_SCSI_H
-#define _GPXE_SCSI_H
+#ifndef _IPXE_SCSI_H
+#define _IPXE_SCSI_H
 
 #include <stdint.h>
-#include <gpxe/blockdev.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/refcnt.h>
+#include <ipxe/blockdev.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/refcnt.h>
 
 /** @file
  *
@@ -278,4 +278,4 @@ extern int scsi_detached_command ( struct scsi_device *scsi,
 extern int init_scsidev ( struct scsi_device *scsi );
 extern int scsi_parse_lun ( const char *lun_string, struct scsi_lun *lun );
 
-#endif /* _GPXE_SCSI_H */
+#endif /* _IPXE_SCSI_H */
diff --git a/src/include/gpxe/sec80211.h b/src/include/ipxe/sec80211.h
index 502ebf7..5ac96de 100644
--- a/src/include/gpxe/sec80211.h
+++ b/src/include/ipxe/sec80211.h
@@ -16,12 +16,12 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef _GPXE_SEC80211_H
-#define _GPXE_SEC80211_H
+#ifndef _IPXE_SEC80211_H
+#define _IPXE_SEC80211_H
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/net80211.h>
+#include <ipxe/net80211.h>
 #include <errno.h>
 
 /** @file
@@ -79,5 +79,5 @@ u32 sec80211_rsn_get_akm_desc ( enum net80211_security_proto secprot,
 				int rsnie );
 enum net80211_crypto_alg sec80211_rsn_get_net80211_crypt ( u32 desc );
 
-#endif /* _GPXE_SEC80211_H */
+#endif /* _IPXE_SEC80211_H */
 
diff --git a/src/include/gpxe/segment.h b/src/include/ipxe/segment.h
index 5b59c54..37bed0e 100644
--- a/src/include/gpxe/segment.h
+++ b/src/include/ipxe/segment.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_SEGMENT_H
-#define _GPXE_SEGMENT_H
+#ifndef _IPXE_SEGMENT_H
+#define _IPXE_SEGMENT_H
 
 /**
  * @file
@@ -10,8 +10,8 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/uaccess.h>
+#include <ipxe/uaccess.h>
 
 extern int prep_segment ( userptr_t segment, size_t filesz, size_t memsz );
 
-#endif /* _GPXE_SEGMENT_H */
+#endif /* _IPXE_SEGMENT_H */
diff --git a/src/include/gpxe/serial.h b/src/include/ipxe/serial.h
index a72ca7e..c16e56a 100644
--- a/src/include/gpxe/serial.h
+++ b/src/include/ipxe/serial.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_SERIAL_H
-#define _GPXE_SERIAL_H
+#ifndef _IPXE_SERIAL_H
+#define _IPXE_SERIAL_H
 
 /** @file
  *
@@ -13,4 +13,4 @@ extern void serial_putc ( int ch );
 extern int serial_getc ( void );
 extern int serial_ischar ( void );
 
-#endif /* _GPXE_SERIAL_H */
+#endif /* _IPXE_SERIAL_H */
diff --git a/src/include/gpxe/settings.h b/src/include/ipxe/settings.h
index efefe73..1be1cf2 100644
--- a/src/include/gpxe/settings.h
+++ b/src/include/ipxe/settings.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_SETTINGS_H
-#define _GPXE_SETTINGS_H
+#ifndef _IPXE_SETTINGS_H
+#define _IPXE_SETTINGS_H
 
 /** @file
  *
@@ -10,9 +10,9 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/tables.h>
-#include <gpxe/list.h>
-#include <gpxe/refcnt.h>
+#include <ipxe/tables.h>
+#include <ipxe/list.h>
+#include <ipxe/refcnt.h>
 
 struct settings;
 struct in_addr;
@@ -332,4 +332,4 @@ static inline int setting_exists ( struct settings *settings,
 	return ( fetch_setting_len ( settings, setting ) >= 0 );
 }
 
-#endif /* _GPXE_SETTINGS_H */
+#endif /* _IPXE_SETTINGS_H */
diff --git a/src/include/gpxe/settings_ui.h b/src/include/ipxe/settings_ui.h
index a82d733..5f7be30 100644
--- a/src/include/gpxe/settings_ui.h
+++ b/src/include/ipxe/settings_ui.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_SETTINGS_UI_H
-#define _GPXE_SETTINGS_UI_H
+#ifndef _IPXE_SETTINGS_UI_H
+#define _IPXE_SETTINGS_UI_H
 
 /** @file
  *
@@ -13,4 +13,4 @@ struct settings;
 
 extern int settings_ui ( struct settings *settings ) __nonnull;
 
-#endif /* _GPXE_SETTINGS_UI_H */
+#endif /* _IPXE_SETTINGS_UI_H */
diff --git a/src/include/gpxe/sha1.h b/src/include/ipxe/sha1.h
index c203d99..9b6f551 100644
--- a/src/include/gpxe/sha1.h
+++ b/src/include/ipxe/sha1.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_SHA1_H
-#define _GPXE_SHA1_H
+#ifndef _IPXE_SHA1_H
+#define _IPXE_SHA1_H
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
@@ -21,4 +21,4 @@ void pbkdf2_sha1 ( const void *passphrase, size_t pass_len,
 		   const void *salt, size_t salt_len,
 		   int iterations, void *key, size_t key_len );
 
-#endif /* _GPXE_SHA1_H */
+#endif /* _IPXE_SHA1_H */
diff --git a/src/include/gpxe/shell.h b/src/include/ipxe/shell.h
index a65a344..635de24 100644
--- a/src/include/gpxe/shell.h
+++ b/src/include/ipxe/shell.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_SHELL_H
-#define _GPXE_SHELL_H
+#ifndef _IPXE_SHELL_H
+#define _IPXE_SHELL_H
 
 /** @file
  *
@@ -11,4 +11,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 extern void shell ( void );
 
-#endif /* _GPXE_SHELL_H */
+#endif /* _IPXE_SHELL_H */
diff --git a/src/include/gpxe/shell_banner.h b/src/include/ipxe/shell_banner.h
index 28482be..d03fcba 100644
--- a/src/include/gpxe/shell_banner.h
+++ b/src/include/ipxe/shell_banner.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_SHELL_BANNER_H
-#define _GPXE_SHELL_BANNER_H
+#ifndef _IPXE_SHELL_BANNER_H
+#define _IPXE_SHELL_BANNER_H
 
 /** @file
  *
@@ -11,4 +11,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 extern int shell_banner ( void );
 
-#endif /* _GPXE_SHELL_BANNER_H */
+#endif /* _IPXE_SHELL_BANNER_H */
diff --git a/src/include/gpxe/smbios.h b/src/include/ipxe/smbios.h
index 4df25c3..dc34bbe 100644
--- a/src/include/gpxe/smbios.h
+++ b/src/include/ipxe/smbios.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_SMBIOS_H
-#define _GPXE_SMBIOS_H
+#ifndef _IPXE_SMBIOS_H
+#define _IPXE_SMBIOS_H
 
 /** @file
  *
@@ -10,9 +10,9 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/api.h>
+#include <ipxe/api.h>
 #include <config/general.h>
-#include <gpxe/uaccess.h>
+#include <ipxe/uaccess.h>
 
 /**
  * Provide an SMBIOS API implementation
@@ -25,7 +25,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 	PROVIDE_SINGLE_API ( SMBIOS_PREFIX_ ## _subsys, _api_func, _func )
 
 /* Include all architecture-independent SMBIOS API headers */
-#include <gpxe/efi/efi_smbios.h>
+#include <ipxe/efi/efi_smbios.h>
 
 /* Include all architecture-dependent SMBIOS API headers */
 #include <bits/smbios.h>
@@ -158,4 +158,4 @@ extern int read_smbios_string ( struct smbios_structure *structure,
 				unsigned int index,
 				void *data, size_t len );
 
-#endif /* _GPXE_SMBIOS_H */
+#endif /* _IPXE_SMBIOS_H */
diff --git a/src/include/gpxe/socket.h b/src/include/ipxe/socket.h
index 9ea0db9..ea2972a 100644
--- a/src/include/gpxe/socket.h
+++ b/src/include/ipxe/socket.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_SOCKET_H
-#define _GPXE_SOCKET_H
+#ifndef _IPXE_SOCKET_H
+#define _IPXE_SOCKET_H
 
 /** @file
  *
@@ -98,4 +98,4 @@ struct sockaddr {
 	char pad[ SA_LEN - sizeof ( sa_family_t ) ];
 } __attribute__ (( may_alias ));
 
-#endif /* _GPXE_SOCKET_H */
+#endif /* _IPXE_SOCKET_H */
diff --git a/src/include/gpxe/spi.h b/src/include/ipxe/spi.h
index 8e4a676..d92d1ae 100644
--- a/src/include/gpxe/spi.h
+++ b/src/include/ipxe/spi.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_SPI_H
-#define _GPXE_SPI_H
+#ifndef _IPXE_SPI_H
+#define _IPXE_SPI_H
 
 /** @file
  *
@@ -9,7 +9,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/nvs.h>
+#include <ipxe/nvs.h>
 
 /**
  * @defgroup spicmds SPI commands
@@ -255,4 +255,4 @@ init_mc25xx640 ( struct spi_device *device ) {
 
 /** @} */
 
-#endif /* _GPXE_SPI_H */
+#endif /* _IPXE_SPI_H */
diff --git a/src/include/gpxe/spi_bit.h b/src/include/ipxe/spi_bit.h
index 8bd2519..9cfa7b8 100644
--- a/src/include/gpxe/spi_bit.h
+++ b/src/include/ipxe/spi_bit.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_SPI_BIT_H
-#define _GPXE_SPI_BIT_H
+#ifndef _IPXE_SPI_BIT_H
+#define _IPXE_SPI_BIT_H
 
 /** @file
  *
@@ -9,8 +9,8 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/spi.h>
-#include <gpxe/bitbash.h>
+#include <ipxe/spi.h>
+#include <ipxe/bitbash.h>
 
 /** A bit-bashing SPI bus */
 struct spi_bit_basher {
@@ -60,4 +60,4 @@ enum {
 
 extern void init_spi_bit_basher ( struct spi_bit_basher *spibit );
 
-#endif /* _GPXE_SPI_BIT_H */
+#endif /* _IPXE_SPI_BIT_H */
diff --git a/src/include/gpxe/srp.h b/src/include/ipxe/srp.h
index 85f39b9..7c0ff4c 100644
--- a/src/include/gpxe/srp.h
+++ b/src/include/ipxe/srp.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_SRP_H
-#define _GPXE_SRP_H
+#ifndef _IPXE_SRP_H
+#define _IPXE_SRP_H
 
 /** @file
  *
@@ -11,9 +11,9 @@ FILE_LICENCE ( BSD2 );
 
 #include <stdint.h>
 #include <byteswap.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/xfer.h>
-#include <gpxe/scsi.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/xfer.h>
+#include <ipxe/scsi.h>
 
 /*****************************************************************************
  *
@@ -865,4 +865,4 @@ enum srp_state {
 extern int srp_attach ( struct scsi_device *scsi, const char *root_path );
 extern void srp_detach ( struct scsi_device *scsi );
 
-#endif /* _GPXE_SRP_H */
+#endif /* _IPXE_SRP_H */
diff --git a/src/include/gpxe/tables.h b/src/include/ipxe/tables.h
index 7dfced8..130486c 100644
--- a/src/include/gpxe/tables.h
+++ b/src/include/ipxe/tables.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_TABLES_H
-#define _GPXE_TABLES_H
+#ifndef _IPXE_TABLES_H
+#define _IPXE_TABLES_H
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
@@ -431,4 +431,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #endif /* __ICC */
 
-#endif /* _GPXE_TABLES_H */
+#endif /* _IPXE_TABLES_H */
diff --git a/src/include/gpxe/tcp.h b/src/include/ipxe/tcp.h
index 7ae7eab..f834cc3 100644
--- a/src/include/gpxe/tcp.h
+++ b/src/include/ipxe/tcp.h
@@ -1,17 +1,17 @@
-#ifndef _GPXE_TCP_H
-#define _GPXE_TCP_H
+#ifndef _IPXE_TCP_H
+#define _IPXE_TCP_H
 
 /** @file
  *
  * TCP protocol
  *
- * This file defines the gPXE TCP API.
+ * This file defines the iPXE TCP API.
  *
  */
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/tcpip.h>
+#include <ipxe/tcpip.h>
 
 /**
  * A TCP header
@@ -315,4 +315,4 @@ struct tcp_options {
 
 extern struct tcpip_protocol tcp_protocol;
 
-#endif /* _GPXE_TCP_H */
+#endif /* _IPXE_TCP_H */
diff --git a/src/include/gpxe/tcpip.h b/src/include/ipxe/tcpip.h
index f71d7d6..cdf554e 100644
--- a/src/include/gpxe/tcpip.h
+++ b/src/include/ipxe/tcpip.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_TCPIP_H
-#define _GPXE_TCPIP_H
+#ifndef _IPXE_TCPIP_H
+#define _IPXE_TCPIP_H
 
 /** @file
  *
@@ -10,9 +10,9 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/socket.h>
-#include <gpxe/in.h>
-#include <gpxe/tables.h>
+#include <ipxe/socket.h>
+#include <ipxe/in.h>
+#include <ipxe/tables.h>
 
 struct io_buffer;
 struct net_device;
@@ -125,4 +125,4 @@ extern uint16_t tcpip_continue_chksum ( uint16_t partial,
 					const void *data, size_t len );
 extern uint16_t tcpip_chksum ( const void *data, size_t len );
 
-#endif /* _GPXE_TCPIP_H */
+#endif /* _IPXE_TCPIP_H */
diff --git a/src/include/gpxe/tftp.h b/src/include/ipxe/tftp.h
index c57bb25..38be0d4 100644
--- a/src/include/gpxe/tftp.h
+++ b/src/include/ipxe/tftp.h
@@ -1,5 +1,5 @@
-#ifndef	_GPXE_TFTP_H
-#define	_GPXE_TFTP_H
+#ifndef	_IPXE_TFTP_H
+#define	_IPXE_TFTP_H
 
 /** @file
  *
@@ -82,4 +82,4 @@ union tftp_any {
 
 extern void tftp_set_request_blksize ( unsigned int blksize );
 
-#endif /* _GPXE_TFTP_H */
+#endif /* _IPXE_TFTP_H */
diff --git a/src/include/gpxe/threewire.h b/src/include/ipxe/threewire.h
index e23284a..135ef56 100644
--- a/src/include/gpxe/threewire.h
+++ b/src/include/ipxe/threewire.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_THREEWIRE_H
-#define _GPXE_THREEWIRE_H
+#ifndef _IPXE_THREEWIRE_H
+#define _IPXE_THREEWIRE_H
 
 /** @file
  *
@@ -12,7 +12,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/spi.h>
+#include <ipxe/spi.h>
 #include <limits.h>
 
 /**
@@ -102,4 +102,4 @@ init_at93c66 ( struct spi_device *device, unsigned int organisation ) {
 
 /** @} */
 
-#endif /* _GPXE_THREEWIRE_H */
+#endif /* _IPXE_THREEWIRE_H */
diff --git a/src/include/gpxe/timer.h b/src/include/ipxe/timer.h
index 86722dc..d59122f 100644
--- a/src/include/gpxe/timer.h
+++ b/src/include/ipxe/timer.h
@@ -1,9 +1,9 @@
-#ifndef	_GPXE_TIMER_H
-#define _GPXE_TIMER_H
+#ifndef	_IPXE_TIMER_H
+#define _IPXE_TIMER_H
 
 /** @file
  *
- * gPXE timer API
+ * iPXE timer API
  *
  * The timer API provides udelay() for fixed delays, and currticks()
  * for a monotonically increasing tick counter.
@@ -11,7 +11,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/api.h>
+#include <ipxe/api.h>
 #include <config/timer.h>
 
 /**
@@ -44,7 +44,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 	PROVIDE_SINGLE_API_INLINE ( TIMER_PREFIX_ ## _subsys, _api_func )
 
 /* Include all architecture-independent I/O API headers */
-#include <gpxe/efi/efi_timer.h>
+#include <ipxe/efi/efi_timer.h>
 
 /* Include all architecture-dependent I/O API headers */
 #include <bits/timer.h>
@@ -73,4 +73,4 @@ unsigned long ticks_per_sec ( void );
 /** Number of ticks per second */
 #define TICKS_PER_SEC ( ticks_per_sec() )
 
-#endif /* _GPXE_TIMER_H */
+#endif /* _IPXE_TIMER_H */
diff --git a/src/include/gpxe/tls.h b/src/include/ipxe/tls.h
index e2da046..2cc36dd 100644
--- a/src/include/gpxe/tls.h
+++ b/src/include/ipxe/tls.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_TLS_H
-#define _GPXE_TLS_H
+#ifndef _IPXE_TLS_H
+#define _IPXE_TLS_H
 
 /**
  * @file
@@ -10,13 +10,13 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/refcnt.h>
-#include <gpxe/filter.h>
-#include <gpxe/process.h>
-#include <gpxe/crypto.h>
-#include <gpxe/md5.h>
-#include <gpxe/sha1.h>
-#include <gpxe/x509.h>
+#include <ipxe/refcnt.h>
+#include <ipxe/filter.h>
+#include <ipxe/process.h>
+#include <ipxe/crypto.h>
+#include <ipxe/md5.h>
+#include <ipxe/sha1.h>
+#include <ipxe/x509.h>
 
 /** A TLS header */
 struct tls_header {
@@ -184,4 +184,4 @@ struct tls_session {
 extern int add_tls ( struct xfer_interface *xfer,
 		     struct xfer_interface **next );
 
-#endif /* _GPXE_TLS_H */
+#endif /* _IPXE_TLS_H */
diff --git a/src/include/gpxe/uaccess.h b/src/include/ipxe/uaccess.h
index 5a8f292..7d4ab9c 100644
--- a/src/include/gpxe/uaccess.h
+++ b/src/include/ipxe/uaccess.h
@@ -1,12 +1,12 @@
-#ifndef _GPXE_UACCESS_H
-#define _GPXE_UACCESS_H
+#ifndef _IPXE_UACCESS_H
+#define _IPXE_UACCESS_H
 
 /**
  * @file
  *
  * Access to external ("user") memory
  *
- * gPXE often needs to transfer data between internal and external
+ * iPXE often needs to transfer data between internal and external
  * buffers.  On i386, the external buffers may require access via a
  * different segment, and the buffer address cannot be encoded into a
  * simple void * pointer.  The @c userptr_t type encapsulates the
@@ -23,7 +23,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
 #include <string.h>
-#include <gpxe/api.h>
+#include <ipxe/api.h>
 #include <config/ioapi.h>
 
 /**
@@ -188,7 +188,7 @@ trivial_memchr_user ( userptr_t buffer, off_t offset, int c, size_t len ) {
 	PROVIDE_SINGLE_API_INLINE ( UACCESS_PREFIX_ ## _subsys, _api_func )
 
 /* Include all architecture-independent user access API headers */
-#include <gpxe/efi/efi_uaccess.h>
+#include <ipxe/efi/efi_uaccess.h>
 
 /* Include all architecture-dependent user access API headers */
 #include <bits/uaccess.h>
@@ -341,4 +341,4 @@ size_t strlen_user ( userptr_t userptr, off_t offset );
  */
 off_t memchr_user ( userptr_t userptr, off_t offset, int c, size_t len );
 
-#endif /* _GPXE_UACCESS_H */
+#endif /* _IPXE_UACCESS_H */
diff --git a/src/include/gpxe/udp.h b/src/include/ipxe/udp.h
index 670c5e5..5e55c5e 100644
--- a/src/include/gpxe/udp.h
+++ b/src/include/ipxe/udp.h
@@ -1,20 +1,20 @@
-#ifndef _GPXE_UDP_H
-#define _GPXE_UDP_H
+#ifndef _IPXE_UDP_H
+#define _IPXE_UDP_H
 
 /** @file
  *
  * UDP protocol
  *
- * This file defines the gPXE UDP API.
+ * This file defines the iPXE UDP API.
  *
  */
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stddef.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/tcpip.h>
-#include <gpxe/if_ether.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/tcpip.h>
+#include <ipxe/if_ether.h>
 
 struct xfer_interface;
 
@@ -44,5 +44,5 @@ extern int udp_open_promisc ( struct xfer_interface *xfer );
 extern int udp_open ( struct xfer_interface *xfer, struct sockaddr *peer,
 		      struct sockaddr *local );
 
-#endif /* _GPXE_UDP_H */
+#endif /* _IPXE_UDP_H */
 
diff --git a/src/include/gpxe/umalloc.h b/src/include/ipxe/umalloc.h
index b0e5564..4afa0c9 100644
--- a/src/include/gpxe/umalloc.h
+++ b/src/include/ipxe/umalloc.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_UMALLOC_H
-#define _GPXE_UMALLOC_H
+#ifndef _IPXE_UMALLOC_H
+#define _IPXE_UMALLOC_H
 
 /**
  * @file
@@ -10,9 +10,9 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/api.h>
+#include <ipxe/api.h>
 #include <config/umalloc.h>
-#include <gpxe/uaccess.h>
+#include <ipxe/uaccess.h>
 
 /**
  * Provide a user memory allocation API implementation
@@ -25,7 +25,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 	PROVIDE_SINGLE_API ( UMALLOC_PREFIX_ ## _subsys, _api_func, _func )
 
 /* Include all architecture-independent I/O API headers */
-#include <gpxe/efi/efi_umalloc.h>
+#include <ipxe/efi/efi_umalloc.h>
 
 /* Include all architecture-dependent I/O API headers */
 #include <bits/umalloc.h>
@@ -65,4 +65,4 @@ static inline __always_inline void ufree ( userptr_t userptr ) {
 	urealloc ( userptr, 0 );
 }
 
-#endif /* _GPXE_UMALLOC_H */
+#endif /* _IPXE_UMALLOC_H */
diff --git a/src/include/gpxe/uri.h b/src/include/ipxe/uri.h
index 405d0ce..cb0898e 100644
--- a/src/include/gpxe/uri.h
+++ b/src/include/ipxe/uri.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_URI_H
-#define _GPXE_URI_H
+#ifndef _IPXE_URI_H
+#define _IPXE_URI_H
 
 /** @file
  *
@@ -11,7 +11,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stddef.h>
 #include <stdlib.h>
-#include <gpxe/refcnt.h>
+#include <ipxe/refcnt.h>
 
 /** A Uniform Resource Identifier
  *
@@ -26,9 +26,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
  *
  * Some examples are probably helpful:
  *
- *   http://www.etherboot.org/wiki :
+ *   http://www.ipxe.org/wiki :
  *
- *   scheme = "http", host = "www.etherboot.org", path = "/wiki"
+ *   scheme = "http", host = "www.ipxe.org", path = "/wiki"
  *
  *   /var/lib/tftpboot :
  *
@@ -179,4 +179,4 @@ extern size_t uri_encode ( const char *raw_string, char *buf, ssize_t len,
 			   int field );
 extern size_t uri_decode ( const char *encoded_string, char *buf, ssize_t len );
 
-#endif /* _GPXE_URI_H */
+#endif /* _IPXE_URI_H */
diff --git a/src/include/gpxe/uuid.h b/src/include/ipxe/uuid.h
index 019cd05..2f3c224 100644
--- a/src/include/gpxe/uuid.h
+++ b/src/include/ipxe/uuid.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_UUID_H
-#define _GPXE_UUID_H
+#ifndef _IPXE_UUID_H
+#define _IPXE_UUID_H
 
 /** @file
  *
@@ -30,4 +30,4 @@ union uuid {
 
 extern char * uuid_ntoa ( union uuid *uuid );
 
-#endif /* _GPXE_UUID_H */
+#endif /* _IPXE_UUID_H */
diff --git a/src/include/gpxe/virtio-pci.h b/src/include/ipxe/virtio-pci.h
index f0c17e8..f0c17e8 100644
--- a/src/include/gpxe/virtio-pci.h
+++ b/src/include/ipxe/virtio-pci.h
diff --git a/src/include/gpxe/virtio-ring.h b/src/include/ipxe/virtio-ring.h
index e96dd37..e96dd37 100644
--- a/src/include/gpxe/virtio-ring.h
+++ b/src/include/ipxe/virtio-ring.h
diff --git a/src/include/gpxe/vsprintf.h b/src/include/ipxe/vsprintf.h
index ee860a5..c48c97a 100644
--- a/src/include/gpxe/vsprintf.h
+++ b/src/include/ipxe/vsprintf.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_VSPRINTF_H
-#define _GPXE_VSPRINTF_H
+#ifndef _IPXE_VSPRINTF_H
+#define _IPXE_VSPRINTF_H
 
 /** @file
  *
@@ -71,4 +71,4 @@ extern int vssnprintf ( char *buf, ssize_t ssize, const char *fmt,
 extern int __attribute__ (( format ( printf, 3, 4 ) ))
 ssnprintf ( char *buf, ssize_t ssize, const char *fmt, ... );
 
-#endif /* _GPXE_VSPRINTF_H */
+#endif /* _IPXE_VSPRINTF_H */
diff --git a/src/include/gpxe/wpa.h b/src/include/ipxe/wpa.h
index a7f19d7..2934228 100644
--- a/src/include/gpxe/wpa.h
+++ b/src/include/ipxe/wpa.h
@@ -16,11 +16,11 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef _GPXE_WPA_H
-#define _GPXE_WPA_H
+#ifndef _IPXE_WPA_H
+#define _IPXE_WPA_H
 
-#include <gpxe/ieee80211.h>
-#include <gpxe/list.h>
+#include <ipxe/ieee80211.h>
+#include <ipxe/list.h>
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
@@ -500,4 +500,4 @@ int wpa_start ( struct net80211_device *dev, struct wpa_common_ctx *ctx,
 		const void *pmk, size_t pmk_len );
 void wpa_stop ( struct net80211_device *dev );
 
-#endif /* _GPXE_WPA_H */
+#endif /* _IPXE_WPA_H */
diff --git a/src/include/gpxe/x509.h b/src/include/ipxe/x509.h
index 1b9d9aa..37c5a4e 100644
--- a/src/include/gpxe/x509.h
+++ b/src/include/ipxe/x509.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_X509_H
-#define _GPXE_X509_H
+#ifndef _IPXE_X509_H
+#define _IPXE_X509_H
 
 /** @file
  *
@@ -38,4 +38,4 @@ x509_free_rsa_public_key ( struct x509_rsa_public_key *rsa_pubkey ) {
 extern int x509_rsa_public_key ( const struct asn1_cursor *certificate,
 				 struct x509_rsa_public_key *rsa_pubkey );
 
-#endif /* _GPXE_X509_H */
+#endif /* _IPXE_X509_H */
diff --git a/src/include/gpxe/xfer.h b/src/include/ipxe/xfer.h
index edd3703..ad41e93 100644
--- a/src/include/gpxe/xfer.h
+++ b/src/include/ipxe/xfer.h
@@ -1,5 +1,5 @@
-#ifndef _GPXE_XFER_H
-#define _GPXE_XFER_H
+#ifndef _IPXE_XFER_H
+#define _IPXE_XFER_H
 
 /** @file
  *
@@ -11,8 +11,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stddef.h>
 #include <stdarg.h>
-#include <gpxe/interface.h>
-#include <gpxe/iobuf.h>
+#include <ipxe/interface.h>
+#include <ipxe/iobuf.h>
 
 struct xfer_interface;
 struct xfer_metadata;
@@ -274,4 +274,4 @@ static inline void xfer_nullify ( struct xfer_interface *xfer ) {
 	xfer->op = &null_xfer_ops;
 };
 
-#endif /* _GPXE_XFER_H */
+#endif /* _IPXE_XFER_H */
diff --git a/src/include/mii.h b/src/include/mii.h
index 3b735d9..2baff2f 100644
--- a/src/include/mii.h
+++ b/src/include/mii.h
@@ -140,7 +140,7 @@ FILE_LICENCE ( GPL2_ONLY );
 #define LPA_1000FULL            0x0800  /* Link partner 1000BASE-T full duplex */
 #define LPA_1000HALF            0x0400  /* Link partner 1000BASE-T half duplex */
 
-#include <gpxe/netdevice.h>
+#include <ipxe/netdevice.h>
 
 struct mii_if_info {
         int phy_id;
diff --git a/src/include/nic.h b/src/include/nic.h
index c808972..d5375bd 100644
--- a/src/include/nic.h
+++ b/src/include/nic.h
@@ -14,12 +14,12 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <stdio.h>
 #include <byteswap.h>
-#include <gpxe/pci.h>
-#include <gpxe/isapnp.h>
-#include <gpxe/isa.h>
-#include <gpxe/eisa.h>
-#include <gpxe/mca.h>
-#include <gpxe/io.h>
+#include <ipxe/pci.h>
+#include <ipxe/isapnp.h>
+#include <ipxe/isa.h>
+#include <ipxe/eisa.h>
+#include <ipxe/mca.h>
+#include <ipxe/io.h>
 
 typedef enum {
 	DISABLE = 0,
diff --git a/src/include/unistd.h b/src/include/unistd.h
index ef94694..3a50a25 100644
--- a/src/include/unistd.h
+++ b/src/include/unistd.h
@@ -24,7 +24,7 @@ extern int execv ( const char *command, char * const argv[] );
 	} )
 
 /* Pick up udelay() */
-#include <gpxe/timer.h>
+#include <ipxe/timer.h>
 
 /*
  * sleep() prototype is defined by POSIX.1.  usleep() prototype is
diff --git a/src/include/usr/autoboot.h b/src/include/usr/autoboot.h
index a918020..70c1adf 100644
--- a/src/include/usr/autoboot.h
+++ b/src/include/usr/autoboot.h
@@ -9,7 +9,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/in.h>
+#include <ipxe/in.h>
 struct net_device;
 
 extern int shutdown_exit_flags;
diff --git a/src/interface/efi/efi_console.c b/src/interface/efi/efi_console.c
index 04af28a..6d766ec 100644
--- a/src/interface/efi/efi_console.c
+++ b/src/interface/efi/efi_console.c
@@ -20,8 +20,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stddef.h>
 #include <assert.h>
-#include <gpxe/efi/efi.h>
-#include <gpxe/ansiesc.h>
+#include <ipxe/efi/efi.h>
+#include <ipxe/ansiesc.h>
 #include <console.h>
 
 #define ATTR_BOLD		0x08
diff --git a/src/interface/efi/efi_init.c b/src/interface/efi/efi_init.c
index ad55037..ed65993 100644
--- a/src/interface/efi/efi_init.c
+++ b/src/interface/efi/efi_init.c
@@ -19,8 +19,8 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <string.h>
-#include <gpxe/efi/efi.h>
-#include <gpxe/uuid.h>
+#include <ipxe/efi/efi.h>
+#include <ipxe/uuid.h>
 
 /** Image handle passed to entry point */
 EFI_HANDLE efi_image_handle;
diff --git a/src/interface/efi/efi_io.c b/src/interface/efi/efi_io.c
index 0ba16f8..13a3e23 100644
--- a/src/interface/efi/efi_io.c
+++ b/src/interface/efi/efi_io.c
@@ -19,14 +19,14 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <assert.h>
-#include <gpxe/io.h>
-#include <gpxe/efi/efi.h>
-#include <gpxe/efi/Protocol/CpuIo.h>
-#include <gpxe/efi/efi_io.h>
+#include <ipxe/io.h>
+#include <ipxe/efi/efi.h>
+#include <ipxe/efi/Protocol/CpuIo.h>
+#include <ipxe/efi/efi_io.h>
 
 /** @file
  *
- * gPXE I/O API for EFI
+ * iPXE I/O API for EFI
  *
  */
 
diff --git a/src/interface/efi/efi_pci.c b/src/interface/efi/efi_pci.c
index ec43391..9a402c4 100644
--- a/src/interface/efi/efi_pci.c
+++ b/src/interface/efi/efi_pci.c
@@ -19,13 +19,13 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <errno.h>
-#include <gpxe/pci.h>
-#include <gpxe/efi/efi.h>
-#include <gpxe/efi/Protocol/PciRootBridgeIo.h>
+#include <ipxe/pci.h>
+#include <ipxe/efi/efi.h>
+#include <ipxe/efi/Protocol/PciRootBridgeIo.h>
 
 /** @file
  *
- * gPXE PCI I/O API for EFI
+ * iPXE PCI I/O API for EFI
  *
  */
 
diff --git a/src/interface/efi/efi_smbios.c b/src/interface/efi/efi_smbios.c
index 8caf624..150083b 100644
--- a/src/interface/efi/efi_smbios.c
+++ b/src/interface/efi/efi_smbios.c
@@ -19,13 +19,13 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <errno.h>
-#include <gpxe/smbios.h>
-#include <gpxe/efi/efi.h>
-#include <gpxe/efi/Guid/SmBios.h>
+#include <ipxe/smbios.h>
+#include <ipxe/efi/efi.h>
+#include <ipxe/efi/Guid/SmBios.h>
 
 /** @file
  *
- * gPXE SMBIOS API for EFI
+ * iPXE SMBIOS API for EFI
  *
  */
 
diff --git a/src/interface/efi/efi_snp.c b/src/interface/efi/efi_snp.c
index e57d8db..01b6b50 100644
--- a/src/interface/efi/efi_snp.c
+++ b/src/interface/efi/efi_snp.c
@@ -23,27 +23,27 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <errno.h>
 #include <assert.h>
 #include <byteswap.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/in.h>
-#include <gpxe/pci.h>
-#include <gpxe/efi/efi.h>
-#include <gpxe/efi/Protocol/DriverBinding.h>
-#include <gpxe/efi/Protocol/PciIo.h>
-#include <gpxe/efi/Protocol/SimpleNetwork.h>
-#include <gpxe/efi/Protocol/ComponentName2.h>
-#include <gpxe/efi/Protocol/NetworkInterfaceIdentifier.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/in.h>
+#include <ipxe/pci.h>
+#include <ipxe/efi/efi.h>
+#include <ipxe/efi/Protocol/DriverBinding.h>
+#include <ipxe/efi/Protocol/PciIo.h>
+#include <ipxe/efi/Protocol/SimpleNetwork.h>
+#include <ipxe/efi/Protocol/ComponentName2.h>
+#include <ipxe/efi/Protocol/NetworkInterfaceIdentifier.h>
 #include <config/general.h>
 
 /** @file
  *
- * gPXE EFI SNP interface
+ * iPXE EFI SNP interface
  *
  */
 
 /** An SNP device */
 struct efi_snp_device {
-	/** The underlying gPXE network device */
+	/** The underlying iPXE network device */
 	struct net_device *netdev;
 	/** EFI device handle */
 	EFI_HANDLE handle;
@@ -112,7 +112,7 @@ static EFI_GUID efi_pci_io_protocol_guid
 	= EFI_PCI_IO_PROTOCOL_GUID;
 
 /**
- * Set EFI SNP mode based on gPXE net device parameters
+ * Set EFI SNP mode based on iPXE net device parameters
  *
  * @v snp		SNP interface
  */
@@ -794,7 +794,7 @@ efi_snp_netdev ( EFI_DRIVER_BINDING_PROTOCOL *driver, EFI_HANDLE device ) {
 	pci_busdevfn = PCI_BUSDEVFN ( pci_bus, PCI_DEVFN ( pci_dev, pci_fn ) );
 	if ( ( netdev = find_netdev_by_location ( BUS_TYPE_PCI,
 						  pci_busdevfn ) ) == NULL ) {
-		DBGCP ( driver, "SNPDRV %p device %p is not a gPXE network "
+		DBGCP ( driver, "SNPDRV %p device %p is not a iPXE network "
 			"device\n", driver, device );
 		goto out_no_netdev;
 	}
@@ -958,7 +958,7 @@ efi_snp_driver_start ( EFI_DRIVER_BINDING_PROTOCOL *driver,
 	/* Populate the NII structure */
 	snpdev->nii.Revision =
 		EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_REVISION;
-	strncpy ( snpdev->nii.StringId, "gPXE",
+	strncpy ( snpdev->nii.StringId, "iPXE",
 		  sizeof ( snpdev->nii.StringId ) );
 
 	/* Populate the device name */
diff --git a/src/interface/efi/efi_strerror.c b/src/interface/efi/efi_strerror.c
index 2bf4581..430758f 100644
--- a/src/interface/efi/efi_strerror.c
+++ b/src/interface/efi/efi_strerror.c
@@ -19,11 +19,11 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdio.h>
-#include <gpxe/efi/efi.h>
+#include <ipxe/efi/efi.h>
 
 /** @file
  *
- * gPXE error message formatting for EFI
+ * iPXE error message formatting for EFI
  *
  */
 
diff --git a/src/interface/efi/efi_timer.c b/src/interface/efi/efi_timer.c
index 0dcb760..1f8ad15 100644
--- a/src/interface/efi/efi_timer.c
+++ b/src/interface/efi/efi_timer.c
@@ -21,13 +21,13 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <limits.h>
 #include <assert.h>
 #include <unistd.h>
-#include <gpxe/timer.h>
-#include <gpxe/efi/efi.h>
-#include <gpxe/efi/Protocol/Cpu.h>
+#include <ipxe/timer.h>
+#include <ipxe/efi/efi.h>
+#include <ipxe/efi/Protocol/Cpu.h>
 
 /** @file
  *
- * gPXE timer API for EFI
+ * iPXE timer API for EFI
  *
  */
 
diff --git a/src/interface/efi/efi_uaccess.c b/src/interface/efi/efi_uaccess.c
index 63e9521..d80ca7a 100644
--- a/src/interface/efi/efi_uaccess.c
+++ b/src/interface/efi/efi_uaccess.c
@@ -18,12 +18,12 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/uaccess.h>
-#include <gpxe/efi/efi.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/efi/efi.h>
 
 /** @file
  *
- * gPXE user access API for EFI
+ * iPXE user access API for EFI
  *
  */
 
diff --git a/src/interface/efi/efi_umalloc.c b/src/interface/efi/efi_umalloc.c
index 7113c79..d1d689e 100644
--- a/src/interface/efi/efi_umalloc.c
+++ b/src/interface/efi/efi_umalloc.c
@@ -19,12 +19,12 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <assert.h>
-#include <gpxe/umalloc.h>
-#include <gpxe/efi/efi.h>
+#include <ipxe/umalloc.h>
+#include <ipxe/efi/efi.h>
 
 /** @file
  *
- * gPXE user memory allocation API for EFI
+ * iPXE user memory allocation API for EFI
  *
  */
 
diff --git a/src/interface/smbios/smbios.c b/src/interface/smbios/smbios.c
index cc7df59..b60e10f 100644
--- a/src/interface/smbios/smbios.c
+++ b/src/interface/smbios/smbios.c
@@ -22,8 +22,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/smbios.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/smbios.h>
 
 /** @file
  *
diff --git a/src/interface/smbios/smbios_settings.c b/src/interface/smbios/smbios_settings.c
index 1c96564..09e1a57 100644
--- a/src/interface/smbios/smbios_settings.c
+++ b/src/interface/smbios/smbios_settings.c
@@ -21,10 +21,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdint.h>
 #include <string.h>
 #include <errno.h>
-#include <gpxe/settings.h>
-#include <gpxe/init.h>
-#include <gpxe/uuid.h>
-#include <gpxe/smbios.h>
+#include <ipxe/settings.h>
+#include <ipxe/init.h>
+#include <ipxe/uuid.h>
+#include <ipxe/smbios.h>
 
 /** SMBIOS settings tag magic number */
 #define SMBIOS_TAG_MAGIC 0x5B /* "SmBios" */
diff --git a/src/net/80211/net80211.c b/src/net/80211/net80211.c
index 40f7ba2..0069aba 100644
--- a/src/net/80211/net80211.c
+++ b/src/net/80211/net80211.c
@@ -1,5 +1,5 @@
 /*
- * The gPXE 802.11 MAC layer.
+ * The iPXE 802.11 MAC layer.
  *
  * Copyright (c) 2009 Joshua Oreman <oremanj@rwcr.net>.
  *
@@ -23,15 +23,15 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <byteswap.h>
 #include <stdlib.h>
-#include <gpxe/settings.h>
-#include <gpxe/if_arp.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/ieee80211.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/net80211.h>
-#include <gpxe/sec80211.h>
-#include <gpxe/timer.h>
-#include <gpxe/nap.h>
+#include <ipxe/settings.h>
+#include <ipxe/if_arp.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/ieee80211.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/net80211.h>
+#include <ipxe/sec80211.h>
+#include <ipxe/timer.h>
+#include <ipxe/nap.h>
 #include <unistd.h>
 #include <errno.h>
 
@@ -248,7 +248,7 @@ struct setting net80211_active_setting __setting = {
 /** The cryptographic key to use
  *
  * For hex WEP keys, as is common, this must be entered using the
- * normal gPXE method for entering hex settings; an ASCII string of
+ * normal iPXE method for entering hex settings; an ASCII string of
  * hex characters will not behave as expected.
  */
 struct setting net80211_key_setting __setting = {
@@ -459,7 +459,7 @@ static inline int net80211_rate_is_erp ( u16 rate )
  * being protected and its ACK; add the results of two calls, one with
  * bytes = 10 and one with bytes set to the next frame's size.
  *
- * No other frame types are currently supported by gPXE.
+ * No other frame types are currently supported by iPXE.
  */
 u16 net80211_duration ( struct net80211_device *dev, int bytes, u16 rate )
 {
@@ -1285,7 +1285,7 @@ net80211_marshal_request_info ( struct net80211_device *dev,
  * @ret ctx	Probe context
  *
  * Active scanning may only be used on channels 1-11 in the 2.4GHz
- * band, due to gPXE's lack of a complete regulatory database. If
+ * band, due to iPXE's lack of a complete regulatory database. If
  * active scanning is used, probe packets will be sent on each
  * channel; this can allow association with hidden-SSID networks if
  * the SSID is properly specified.
diff --git a/src/net/80211/rc80211.c b/src/net/80211/rc80211.c
index 5bd1914..56bbc8a 100644
--- a/src/net/80211/rc80211.c
+++ b/src/net/80211/rc80211.c
@@ -1,5 +1,5 @@
 /*
- * Simple 802.11 rate-control algorithm for gPXE.
+ * Simple 802.11 rate-control algorithm for iPXE.
  *
  * Copyright (c) 2009 Joshua Oreman <oremanj@rwcr.net>.
  *
@@ -21,7 +21,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdlib.h>
-#include <gpxe/net80211.h>
+#include <ipxe/net80211.h>
 
 /**
  * @file
@@ -69,11 +69,11 @@ FILE_LICENCE ( GPL2_OR_LATER );
  * below some threshold, and try increasing our rate when the goodness
  * is very high.
  *
- * This system is optimized for gPXE's style of usage. Because normal
+ * This system is optimized for iPXE's style of usage. Because normal
  * operation always involves receiving something, we'll make our way
  * to the best rate pretty quickly. We tend to follow the lead of the
  * sending AP in choosing rates, but we won't use rates for long that
- * don't work well for us in transmission. We assume gPXE won't be
+ * don't work well for us in transmission. We assume iPXE won't be
  * running for long enough that rate patterns will change much, so we
  * don't have to keep time counters or the like.  And if this doesn't
  * work well in practice there are many ways it could be tweaked.
diff --git a/src/net/80211/sec80211.c b/src/net/80211/sec80211.c
index c5aa118..69fad8f 100644
--- a/src/net/80211/sec80211.c
+++ b/src/net/80211/sec80211.c
@@ -21,9 +21,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <gpxe/ieee80211.h>
-#include <gpxe/net80211.h>
-#include <gpxe/sec80211.h>
+#include <ipxe/ieee80211.h>
+#include <ipxe/net80211.h>
+#include <ipxe/sec80211.h>
 
 /** @file
  *
@@ -148,8 +148,8 @@ int sec80211_install ( struct net80211_crypto **which,
  * @v rsnp		Pointer to next descriptor count field in RSN IE
  * @v rsn_end		Pointer to end of RSN IE
  * @v map		Descriptor map to use
- * @v tbl_start		Start of linker table to examine for gPXE support
- * @v tbl_end		End of linker table to examine for gPXE support
+ * @v tbl_start		Start of linker table to examine for iPXE support
+ * @v tbl_end		End of linker table to examine for iPXE support
  * @ret rsnp		Updated to point to first byte after descriptors
  * @ret map_ent		Descriptor map entry of translation to use
  *
@@ -162,7 +162,7 @@ int sec80211_install ( struct net80211_crypto **which,
  * will return @c NULL if the input packet is malformed, and otherwise
  * set @a rsnp to the first byte it has not looked at. It will return
  * the first cipher in the list that is supported by the current build
- * of gPXE, or the first of all if none are supported.
+ * of iPXE, or the first of all if none are supported.
  *
  * We play rather fast and loose with type checking, because this
  * function is only called from two well-defined places in the
diff --git a/src/net/80211/wep.c b/src/net/80211/wep.c
index 1c37e0c..3b10455 100644
--- a/src/net/80211/wep.c
+++ b/src/net/80211/wep.c
@@ -18,11 +18,11 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/net80211.h>
-#include <gpxe/sec80211.h>
-#include <gpxe/crypto.h>
-#include <gpxe/arc4.h>
-#include <gpxe/crc32.h>
+#include <ipxe/net80211.h>
+#include <ipxe/sec80211.h>
+#include <ipxe/crypto.h>
+#include <ipxe/arc4.h>
+#include <ipxe/crc32.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
diff --git a/src/net/80211/wpa.c b/src/net/80211/wpa.c
index 9bac8fe..3e78c8d 100644
--- a/src/net/80211/wpa.c
+++ b/src/net/80211/wpa.c
@@ -18,17 +18,17 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/net80211.h>
-#include <gpxe/sec80211.h>
-#include <gpxe/wpa.h>
-#include <gpxe/eapol.h>
-#include <gpxe/crypto.h>
-#include <gpxe/arc4.h>
-#include <gpxe/crc32.h>
-#include <gpxe/sha1.h>
-#include <gpxe/hmac.h>
-#include <gpxe/list.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/net80211.h>
+#include <ipxe/sec80211.h>
+#include <ipxe/wpa.h>
+#include <ipxe/eapol.h>
+#include <ipxe/crypto.h>
+#include <ipxe/arc4.h>
+#include <ipxe/crc32.h>
+#include <ipxe/sha1.h>
+#include <ipxe/hmac.h>
+#include <ipxe/list.h>
+#include <ipxe/ethernet.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
@@ -63,7 +63,7 @@ static int wpa_fail ( struct wpa_common_ctx *ctx, int rc )
  * @v crypt	Cryptosystem ID
  * @ret crypto	Cryptosystem handler structure
  *
- * If support for @a crypt is not compiled in to gPXE, or if @a crypt
+ * If support for @a crypt is not compiled in to iPXE, or if @a crypt
  * is NET80211_CRYPT_UNKNOWN, returns @c NULL.
  */
 static struct net80211_crypto *
@@ -110,7 +110,7 @@ struct wpa_kie * wpa_find_kie ( int version )
  * information element suitable for including in an association
  * request frame to the network identified by @c dev->associating.
  * If it is impossible to construct an information element consistent
- * with gPXE's capabilities that is compatible with that network, or
+ * with iPXE's capabilities that is compatible with that network, or
  * if none should be sent because that network's beacon included no
  * security information, returns an error indication and leaves
  * @a ie_ret unchanged.
@@ -777,7 +777,7 @@ static int wpa_handle_1_of_2 ( struct wpa_common_ctx *ctx,
 	 * So from an old WPA host, 3/4 does not contain an
 	 * encapsulated GTK. The first frame of the GK handshake
 	 * contains it, encrypted, but without a KDE wrapper, and with
-	 * the key ID field (which gPXE doesn't use) shoved away in
+	 * the key ID field (which iPXE doesn't use) shoved away in
 	 * the reserved bits in the info field, and the TxRx bit
 	 * stealing the Install bit's spot.
 	 */
diff --git a/src/net/80211/wpa_ccmp.c b/src/net/80211/wpa_ccmp.c
index 08b1e17..89bb36f 100644
--- a/src/net/80211/wpa_ccmp.c
+++ b/src/net/80211/wpa_ccmp.c
@@ -18,12 +18,12 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/net80211.h>
-#include <gpxe/crypto.h>
-#include <gpxe/hmac.h>
-#include <gpxe/sha1.h>
-#include <gpxe/aes.h>
-#include <gpxe/wpa.h>
+#include <ipxe/net80211.h>
+#include <ipxe/crypto.h>
+#include <ipxe/hmac.h>
+#include <ipxe/sha1.h>
+#include <ipxe/aes.h>
+#include <ipxe/wpa.h>
 #include <byteswap.h>
 #include <errno.h>
 
diff --git a/src/net/80211/wpa_psk.c b/src/net/80211/wpa_psk.c
index e752168..780738e 100644
--- a/src/net/80211/wpa_psk.c
+++ b/src/net/80211/wpa_psk.c
@@ -18,9 +18,9 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/net80211.h>
-#include <gpxe/sha1.h>
-#include <gpxe/wpa.h>
+#include <ipxe/net80211.h>
+#include <ipxe/sha1.h>
+#include <ipxe/wpa.h>
 #include <errno.h>
 
 /** @file
diff --git a/src/net/80211/wpa_tkip.c b/src/net/80211/wpa_tkip.c
index 0cb697f..0a94df0 100644
--- a/src/net/80211/wpa_tkip.c
+++ b/src/net/80211/wpa_tkip.c
@@ -18,14 +18,14 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/net80211.h>
-#include <gpxe/crypto.h>
-#include <gpxe/hmac.h>
-#include <gpxe/sha1.h>
-#include <gpxe/md5.h>
-#include <gpxe/crc32.h>
-#include <gpxe/arc4.h>
-#include <gpxe/wpa.h>
+#include <ipxe/net80211.h>
+#include <ipxe/crypto.h>
+#include <ipxe/hmac.h>
+#include <ipxe/sha1.h>
+#include <ipxe/md5.h>
+#include <ipxe/crc32.h>
+#include <ipxe/arc4.h>
+#include <ipxe/wpa.h>
 #include <byteswap.h>
 #include <errno.h>
 
diff --git a/src/net/aoe.c b/src/net/aoe.c
index 839a875..497c12a 100644
--- a/src/net/aoe.c
+++ b/src/net/aoe.c
@@ -25,16 +25,16 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <errno.h>
 #include <assert.h>
 #include <byteswap.h>
-#include <gpxe/list.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/ata.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/process.h>
-#include <gpxe/features.h>
-#include <gpxe/aoe.h>
+#include <ipxe/list.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/ata.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/process.h>
+#include <ipxe/features.h>
+#include <ipxe/aoe.h>
 
 /** @file
  *
diff --git a/src/net/arp.c b/src/net/arp.c
index 124a856..fe4dbff 100644
--- a/src/net/arp.c
+++ b/src/net/arp.c
@@ -22,11 +22,11 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <byteswap.h>
 #include <errno.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/if_arp.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/arp.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/if_arp.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/arp.h>
 
 /** @file
  *
diff --git a/src/net/cachedhcp.c b/src/net/cachedhcp.c
index 37f344b..299b164 100644
--- a/src/net/cachedhcp.c
+++ b/src/net/cachedhcp.c
@@ -21,11 +21,11 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <gpxe/dhcp.h>
-#include <gpxe/dhcppkt.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/uaccess.h>
+#include <ipxe/dhcp.h>
+#include <ipxe/dhcppkt.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/uaccess.h>
 
 /** @file
  *
diff --git a/src/net/dhcpopts.c b/src/net/dhcpopts.c
index 6482c62..f351c32 100644
--- a/src/net/dhcpopts.c
+++ b/src/net/dhcpopts.c
@@ -23,8 +23,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
-#include <gpxe/dhcp.h>
-#include <gpxe/dhcpopts.h>
+#include <ipxe/dhcp.h>
+#include <ipxe/dhcpopts.h>
 
 /** @file
  *
diff --git a/src/net/dhcppkt.c b/src/net/dhcppkt.c
index 20a0e66..bc99401 100644
--- a/src/net/dhcppkt.c
+++ b/src/net/dhcppkt.c
@@ -23,10 +23,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/dhcp.h>
-#include <gpxe/dhcpopts.h>
-#include <gpxe/dhcppkt.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/dhcp.h>
+#include <ipxe/dhcpopts.h>
+#include <ipxe/dhcppkt.h>
 
 /** @file
  *
diff --git a/src/net/eapol.c b/src/net/eapol.c
index 507c8ce..7246c7b 100644
--- a/src/net/eapol.c
+++ b/src/net/eapol.c
@@ -24,10 +24,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
  *
  */
 
-#include <gpxe/netdevice.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/eapol.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/eapol.h>
 #include <errno.h>
 #include <byteswap.h>
 
diff --git a/src/net/ethernet.c b/src/net/ethernet.c
index 79ed1dc..5c5936f 100644
--- a/src/net/ethernet.c
+++ b/src/net/ethernet.c
@@ -24,12 +24,12 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <byteswap.h>
 #include <errno.h>
 #include <assert.h>
-#include <gpxe/if_arp.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/in.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/if_arp.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/in.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/ethernet.h>
 
 /** @file
  *
diff --git a/src/net/fakedhcp.c b/src/net/fakedhcp.c
index ad3f046..b43e9b1 100644
--- a/src/net/fakedhcp.c
+++ b/src/net/fakedhcp.c
@@ -23,10 +23,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
-#include <gpxe/settings.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/dhcppkt.h>
-#include <gpxe/fakedhcp.h>
+#include <ipxe/settings.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/dhcppkt.h>
+#include <ipxe/fakedhcp.h>
 
 /** @file
  *
diff --git a/src/net/icmp.c b/src/net/icmp.c
index 749c345..84dad42 100644
--- a/src/net/icmp.c
+++ b/src/net/icmp.c
@@ -20,10 +20,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <string.h>
 #include <errno.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/in.h>
-#include <gpxe/tcpip.h>
-#include <gpxe/icmp.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/in.h>
+#include <ipxe/tcpip.h>
+#include <ipxe/icmp.h>
 
 /** @file
  *
diff --git a/src/net/icmpv6.c b/src/net/icmpv6.c
index 237fc4a..ab8a65e 100644
--- a/src/net/icmpv6.c
+++ b/src/net/icmpv6.c
@@ -2,14 +2,14 @@
 #include <string.h>
 #include <byteswap.h>
 #include <errno.h>
-#include <gpxe/in.h>
-#include <gpxe/ip6.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/ndp.h>
-#include <gpxe/icmp6.h>
-#include <gpxe/tcpip.h>
-#include <gpxe/netdevice.h>
+#include <ipxe/in.h>
+#include <ipxe/ip6.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/ndp.h>
+#include <ipxe/icmp6.h>
+#include <ipxe/tcpip.h>
+#include <ipxe/netdevice.h>
 
 struct tcpip_protocol icmp6_protocol;
 
diff --git a/src/net/infiniband.c b/src/net/infiniband.c
index d781324..dd98e92 100644
--- a/src/net/infiniband.c
+++ b/src/net/infiniband.c
@@ -26,16 +26,16 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <byteswap.h>
 #include <errno.h>
 #include <assert.h>
-#include <gpxe/list.h>
-#include <gpxe/errortab.h>
-#include <gpxe/if_arp.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/ipoib.h>
-#include <gpxe/process.h>
-#include <gpxe/infiniband.h>
-#include <gpxe/ib_mi.h>
-#include <gpxe/ib_sma.h>
+#include <ipxe/list.h>
+#include <ipxe/errortab.h>
+#include <ipxe/if_arp.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/ipoib.h>
+#include <ipxe/process.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/ib_mi.h>
+#include <ipxe/ib_sma.h>
 
 /** @file
  *
diff --git a/src/net/infiniband/ib_cm.c b/src/net/infiniband/ib_cm.c
index ebe65b3..35ade66 100644
--- a/src/net/infiniband/ib_cm.c
+++ b/src/net/infiniband/ib_cm.c
@@ -24,10 +24,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <byteswap.h>
 #include <errno.h>
 #include <assert.h>
-#include <gpxe/infiniband.h>
-#include <gpxe/ib_mi.h>
-#include <gpxe/ib_pathrec.h>
-#include <gpxe/ib_cm.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/ib_mi.h>
+#include <ipxe/ib_pathrec.h>
+#include <ipxe/ib_cm.h>
 
 /**
  * @file
diff --git a/src/net/infiniband/ib_cmrc.c b/src/net/infiniband/ib_cmrc.c
index 2d64811..de19c51 100644
--- a/src/net/infiniband/ib_cmrc.c
+++ b/src/net/infiniband/ib_cmrc.c
@@ -33,12 +33,12 @@ FILE_LICENCE ( BSD2 );
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/xfer.h>
-#include <gpxe/process.h>
-#include <gpxe/infiniband.h>
-#include <gpxe/ib_cm.h>
-#include <gpxe/ib_cmrc.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/xfer.h>
+#include <ipxe/process.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/ib_cm.h>
+#include <ipxe/ib_cmrc.h>
 
 /**
  * @file
diff --git a/src/net/infiniband/ib_mcast.c b/src/net/infiniband/ib_mcast.c
index 5cb395d..9eff189 100644
--- a/src/net/infiniband/ib_mcast.c
+++ b/src/net/infiniband/ib_mcast.c
@@ -22,10 +22,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <byteswap.h>
 #include <errno.h>
-#include <gpxe/list.h>
-#include <gpxe/infiniband.h>
-#include <gpxe/ib_mi.h>
-#include <gpxe/ib_mcast.h>
+#include <ipxe/list.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/ib_mi.h>
+#include <ipxe/ib_mcast.h>
 
 /** @file
  *
diff --git a/src/net/infiniband/ib_mi.c b/src/net/infiniband/ib_mi.c
index 7511fd8..b4b64ca 100644
--- a/src/net/infiniband/ib_mi.c
+++ b/src/net/infiniband/ib_mi.c
@@ -25,9 +25,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdio.h>
 #include <unistd.h>
 #include <byteswap.h>
-#include <gpxe/infiniband.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/ib_mi.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/ib_mi.h>
 
 /**
  * @file
diff --git a/src/net/infiniband/ib_packet.c b/src/net/infiniband/ib_packet.c
index 08820ef..943f395 100644
--- a/src/net/infiniband/ib_packet.c
+++ b/src/net/infiniband/ib_packet.c
@@ -23,9 +23,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/infiniband.h>
-#include <gpxe/ib_packet.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/ib_packet.h>
 
 /**
  * @file
diff --git a/src/net/infiniband/ib_pathrec.c b/src/net/infiniband/ib_pathrec.c
index 136e628..e1fa530 100644
--- a/src/net/infiniband/ib_pathrec.c
+++ b/src/net/infiniband/ib_pathrec.c
@@ -23,9 +23,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <byteswap.h>
 #include <errno.h>
-#include <gpxe/infiniband.h>
-#include <gpxe/ib_mi.h>
-#include <gpxe/ib_pathrec.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/ib_mi.h>
+#include <ipxe/ib_pathrec.h>
 
 /** @file
  *
diff --git a/src/net/infiniband/ib_sma.c b/src/net/infiniband/ib_sma.c
index ff4cbbf..b832735 100644
--- a/src/net/infiniband/ib_sma.c
+++ b/src/net/infiniband/ib_sma.c
@@ -25,11 +25,11 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdio.h>
 #include <unistd.h>
 #include <byteswap.h>
-#include <gpxe/settings.h>
-#include <gpxe/infiniband.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/ib_mi.h>
-#include <gpxe/ib_sma.h>
+#include <ipxe/settings.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/ib_mi.h>
+#include <ipxe/ib_sma.h>
 
 /**
  * @file
@@ -99,7 +99,7 @@ static void ib_sma_node_desc ( struct ib_device *ibdev,
 	hostname_len = fetch_string_setting ( NULL, &hostname_setting,
 					      hostname, sizeof ( hostname ) );
 	snprintf ( node_desc->node_string, sizeof ( node_desc->node_string ),
-		   "gPXE %s%s%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x (%s)",
+		   "iPXE %s%s%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x (%s)",
 		   hostname, ( ( hostname_len >= 0 ) ? " " : "" ),
 		   guid.u.bytes[0], guid.u.bytes[1], guid.u.bytes[2],
 		   guid.u.bytes[3], guid.u.bytes[4], guid.u.bytes[5],
diff --git a/src/net/infiniband/ib_smc.c b/src/net/infiniband/ib_smc.c
index d308dd9..7d59635 100644
--- a/src/net/infiniband/ib_smc.c
+++ b/src/net/infiniband/ib_smc.c
@@ -24,8 +24,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <errno.h>
 #include <unistd.h>
 #include <byteswap.h>
-#include <gpxe/infiniband.h>
-#include <gpxe/ib_smc.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/ib_smc.h>
 
 /**
  * @file
diff --git a/src/net/infiniband/ib_srp.c b/src/net/infiniband/ib_srp.c
index c156d3a..24eb1f9 100644
--- a/src/net/infiniband/ib_srp.c
+++ b/src/net/infiniband/ib_srp.c
@@ -32,10 +32,10 @@ FILE_LICENCE ( BSD2 );
 
 #include <stdlib.h>
 #include <errno.h>
-#include <gpxe/srp.h>
-#include <gpxe/infiniband.h>
-#include <gpxe/ib_cmrc.h>
-#include <gpxe/ib_srp.h>
+#include <ipxe/srp.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/ib_cmrc.h>
+#include <ipxe/ib_srp.h>
 
 /**
  * @file
diff --git a/src/net/iobpad.c b/src/net/iobpad.c
index cbae221..f83c76d 100644
--- a/src/net/iobpad.c
+++ b/src/net/iobpad.c
@@ -26,7 +26,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
  */
 
 #include <string.h>
-#include <gpxe/iobuf.h>
+#include <ipxe/iobuf.h>
 
 /**
  * Pad I/O buffer
diff --git a/src/net/ipv4.c b/src/net/ipv4.c
index 7a8ddd3..6d3d80a 100644
--- a/src/net/ipv4.c
+++ b/src/net/ipv4.c
@@ -4,16 +4,16 @@
 #include <stdio.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/list.h>
-#include <gpxe/in.h>
-#include <gpxe/arp.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/ip.h>
-#include <gpxe/tcpip.h>
-#include <gpxe/dhcp.h>
-#include <gpxe/settings.h>
+#include <ipxe/list.h>
+#include <ipxe/in.h>
+#include <ipxe/arp.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/ip.h>
+#include <ipxe/tcpip.h>
+#include <ipxe/dhcp.h>
+#include <ipxe/settings.h>
 
 /** @file
  *
diff --git a/src/net/ipv6.c b/src/net/ipv6.c
index f7308bb..781d762 100644
--- a/src/net/ipv6.c
+++ b/src/net/ipv6.c
@@ -4,16 +4,16 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <byteswap.h>
-#include <gpxe/in.h>
-#include <gpxe/ip6.h>
-#include <gpxe/ndp.h>
-#include <gpxe/list.h>
-#include <gpxe/icmp6.h>
-#include <gpxe/tcpip.h>
-#include <gpxe/socket.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/if_ether.h>
+#include <ipxe/in.h>
+#include <ipxe/ip6.h>
+#include <ipxe/ndp.h>
+#include <ipxe/list.h>
+#include <ipxe/icmp6.h>
+#include <ipxe/tcpip.h>
+#include <ipxe/socket.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/if_ether.h>
 
 struct net_protocol ipv6_protocol;
 
diff --git a/src/net/mii.c b/src/net/mii.c
index 0de6442..dbaecf1 100644
--- a/src/net/mii.c
+++ b/src/net/mii.c
@@ -2,7 +2,7 @@
 
 	mii.c: MII interface library
 
-	Ported to gPXE by Daniel Verkamp <daniel@drv.nu>
+	Ported to iPXE by Daniel Verkamp <daniel@drv.nu>
 	from Linux drivers/net/mii.c
 
 	Maintained by Jeff Garzik <jgarzik@pobox.com>
diff --git a/src/net/ndp.c b/src/net/ndp.c
index 8bea8b3..4d37133 100644
--- a/src/net/ndp.c
+++ b/src/net/ndp.c
@@ -2,12 +2,12 @@
 #include <string.h>
 #include <byteswap.h>
 #include <errno.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/ndp.h>
-#include <gpxe/icmp6.h>
-#include <gpxe/ip6.h>
-#include <gpxe/netdevice.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/ndp.h>
+#include <ipxe/icmp6.h>
+#include <ipxe/ip6.h>
+#include <ipxe/netdevice.h>
 
 /** @file
  *
diff --git a/src/net/netdev_settings.c b/src/net/netdev_settings.c
index d814193..f641d3b 100644
--- a/src/net/netdev_settings.c
+++ b/src/net/netdev_settings.c
@@ -21,10 +21,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/dhcp.h>
-#include <gpxe/settings.h>
-#include <gpxe/device.h>
-#include <gpxe/netdevice.h>
+#include <ipxe/dhcp.h>
+#include <ipxe/settings.h>
+#include <ipxe/device.h>
+#include <ipxe/netdevice.h>
 
 /** @file
  *
diff --git a/src/net/netdevice.c b/src/net/netdevice.c
index b91f98c..9b42ad3 100644
--- a/src/net/netdevice.c
+++ b/src/net/netdevice.c
@@ -24,14 +24,14 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <byteswap.h>
 #include <string.h>
 #include <errno.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/tables.h>
-#include <gpxe/process.h>
-#include <gpxe/init.h>
-#include <gpxe/device.h>
-#include <gpxe/errortab.h>
-#include <gpxe/netdevice.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/tables.h>
+#include <ipxe/process.h>
+#include <ipxe/init.h>
+#include <ipxe/device.h>
+#include <ipxe/errortab.h>
+#include <ipxe/netdevice.h>
 
 /** @file
  *
diff --git a/src/net/nullnet.c b/src/net/nullnet.c
index 381f02a..48849df 100644
--- a/src/net/nullnet.c
+++ b/src/net/nullnet.c
@@ -20,8 +20,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
 #include <errno.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
 
 /** @file
  *
diff --git a/src/net/rarp.c b/src/net/rarp.c
index 1d0dd96..bf2e7f0 100644
--- a/src/net/rarp.c
+++ b/src/net/rarp.c
@@ -20,10 +20,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
 #include <byteswap.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/rarp.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/rarp.h>
 
 /** @file
  *
diff --git a/src/net/retry.c b/src/net/retry.c
index 40f656f..5eefa3d 100644
--- a/src/net/retry.c
+++ b/src/net/retry.c
@@ -19,11 +19,11 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stddef.h>
-#include <gpxe/timer.h>
-#include <gpxe/list.h>
-#include <gpxe/process.h>
-#include <gpxe/init.h>
-#include <gpxe/retry.h>
+#include <ipxe/timer.h>
+#include <ipxe/list.h>
+#include <ipxe/process.h>
+#include <ipxe/init.h>
+#include <ipxe/retry.h>
 
 /** @file
  *
diff --git a/src/net/tcp.c b/src/net/tcp.c
index a061962..decc921 100644
--- a/src/net/tcp.c
+++ b/src/net/tcp.c
@@ -4,16 +4,16 @@
 #include <assert.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/timer.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/malloc.h>
-#include <gpxe/retry.h>
-#include <gpxe/refcnt.h>
-#include <gpxe/xfer.h>
-#include <gpxe/open.h>
-#include <gpxe/uri.h>
-#include <gpxe/tcpip.h>
-#include <gpxe/tcp.h>
+#include <ipxe/timer.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/malloc.h>
+#include <ipxe/retry.h>
+#include <ipxe/refcnt.h>
+#include <ipxe/xfer.h>
+#include <ipxe/open.h>
+#include <ipxe/uri.h>
+#include <ipxe/tcpip.h>
+#include <ipxe/tcp.h>
 
 /** @file
  *
diff --git a/src/net/tcp/ftp.c b/src/net/tcp/ftp.c
index 920e537..3ef71b6 100644
--- a/src/net/tcp/ftp.c
+++ b/src/net/tcp/ftp.c
@@ -5,14 +5,14 @@
 #include <assert.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/socket.h>
-#include <gpxe/tcpip.h>
-#include <gpxe/in.h>
-#include <gpxe/xfer.h>
-#include <gpxe/open.h>
-#include <gpxe/uri.h>
-#include <gpxe/features.h>
-#include <gpxe/ftp.h>
+#include <ipxe/socket.h>
+#include <ipxe/tcpip.h>
+#include <ipxe/in.h>
+#include <ipxe/xfer.h>
+#include <ipxe/open.h>
+#include <ipxe/uri.h>
+#include <ipxe/features.h>
+#include <ipxe/ftp.h>
 
 /** @file
  *
@@ -149,7 +149,7 @@ static const char * ftp_user ( struct ftp_request *ftp ) {
  * @ret password	FTP password
  */
 static const char * ftp_password ( struct ftp_request *ftp ) {
-	static char *ftp_default_password = "etherboot@etherboot.org";
+	static char *ftp_default_password = "ipxe@ipxe.org";
 	return ftp->uri->password ? ftp->uri->password : ftp_default_password;
 }
 
diff --git a/src/net/tcp/http.c b/src/net/tcp/http.c
index a365b2a..c7027d2 100644
--- a/src/net/tcp/http.c
+++ b/src/net/tcp/http.c
@@ -33,18 +33,18 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <byteswap.h>
 #include <errno.h>
 #include <assert.h>
-#include <gpxe/uri.h>
-#include <gpxe/refcnt.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/xfer.h>
-#include <gpxe/open.h>
-#include <gpxe/socket.h>
-#include <gpxe/tcpip.h>
-#include <gpxe/process.h>
-#include <gpxe/linebuf.h>
-#include <gpxe/features.h>
-#include <gpxe/base64.h>
-#include <gpxe/http.h>
+#include <ipxe/uri.h>
+#include <ipxe/refcnt.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/xfer.h>
+#include <ipxe/open.h>
+#include <ipxe/socket.h>
+#include <ipxe/tcpip.h>
+#include <ipxe/process.h>
+#include <ipxe/linebuf.h>
+#include <ipxe/features.h>
+#include <ipxe/base64.h>
+#include <ipxe/http.h>
 
 FEATURE ( FEATURE_PROTOCOL, "HTTP", DHCP_EB_FEATURE_HTTP, 1 );
 
@@ -453,7 +453,7 @@ static void http_step ( struct process *process ) {
 		/* Send GET request */
 		if ( ( rc = xfer_printf ( &http->socket,
 					  "GET %s%s HTTP/1.0\r\n"
-					  "User-Agent: gPXE/" VERSION "\r\n"
+					  "User-Agent: iPXE/" VERSION "\r\n"
 					  "%s%s%s"
 					  "Host: %s\r\n"
 					  "\r\n",
diff --git a/src/net/tcp/https.c b/src/net/tcp/https.c
index 7a2961f..b738f41 100644
--- a/src/net/tcp/https.c
+++ b/src/net/tcp/https.c
@@ -26,10 +26,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
  */
 
 #include <stddef.h>
-#include <gpxe/open.h>
-#include <gpxe/tls.h>
-#include <gpxe/http.h>
-#include <gpxe/features.h>
+#include <ipxe/open.h>
+#include <ipxe/tls.h>
+#include <ipxe/http.h>
+#include <ipxe/features.h>
 
 FEATURE ( FEATURE_PROTOCOL, "HTTPS", DHCP_EB_FEATURE_HTTPS, 1 );
 
diff --git a/src/net/tcp/iscsi.c b/src/net/tcp/iscsi.c
index b13a107..27e454e 100644
--- a/src/net/tcp/iscsi.c
+++ b/src/net/tcp/iscsi.c
@@ -25,17 +25,17 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <errno.h>
 #include <assert.h>
 #include <byteswap.h>
-#include <gpxe/vsprintf.h>
-#include <gpxe/socket.h>
-#include <gpxe/xfer.h>
-#include <gpxe/open.h>
-#include <gpxe/scsi.h>
-#include <gpxe/process.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/tcpip.h>
-#include <gpxe/settings.h>
-#include <gpxe/features.h>
-#include <gpxe/iscsi.h>
+#include <ipxe/vsprintf.h>
+#include <ipxe/socket.h>
+#include <ipxe/xfer.h>
+#include <ipxe/open.h>
+#include <ipxe/scsi.h>
+#include <ipxe/process.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/tcpip.h>
+#include <ipxe/settings.h>
+#include <ipxe/features.h>
+#include <ipxe/iscsi.h>
 
 /** @file
  *
diff --git a/src/net/tcpip.c b/src/net/tcpip.c
index 932fd48..4451bf1 100644
--- a/src/net/tcpip.c
+++ b/src/net/tcpip.c
@@ -2,9 +2,9 @@
 #include <string.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/tables.h>
-#include <gpxe/tcpip.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/tables.h>
+#include <ipxe/tcpip.h>
 
 /** @file
  *
diff --git a/src/net/tls.c b/src/net/tls.c
index a5b126e..3c72b45 100644
--- a/src/net/tls.c
+++ b/src/net/tls.c
@@ -30,17 +30,17 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/hmac.h>
-#include <gpxe/md5.h>
-#include <gpxe/sha1.h>
-#include <gpxe/aes.h>
-#include <gpxe/rsa.h>
-#include <gpxe/xfer.h>
-#include <gpxe/open.h>
-#include <gpxe/filter.h>
-#include <gpxe/asn1.h>
-#include <gpxe/x509.h>
-#include <gpxe/tls.h>
+#include <ipxe/hmac.h>
+#include <ipxe/md5.h>
+#include <ipxe/sha1.h>
+#include <ipxe/aes.h>
+#include <ipxe/rsa.h>
+#include <ipxe/xfer.h>
+#include <ipxe/open.h>
+#include <ipxe/filter.h>
+#include <ipxe/asn1.h>
+#include <ipxe/x509.h>
+#include <ipxe/tls.h>
 
 static int tls_send_plaintext ( struct tls_session *tls, unsigned int type,
 				const void *data, size_t len );
diff --git a/src/net/udp.c b/src/net/udp.c
index 771655e..1aa0e49 100644
--- a/src/net/udp.c
+++ b/src/net/udp.c
@@ -4,12 +4,12 @@
 #include <assert.h>
 #include <byteswap.h>
 #include <errno.h>
-#include <gpxe/tcpip.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/xfer.h>
-#include <gpxe/open.h>
-#include <gpxe/uri.h>
-#include <gpxe/udp.h>
+#include <ipxe/tcpip.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/xfer.h>
+#include <ipxe/open.h>
+#include <ipxe/uri.h>
+#include <ipxe/udp.h>
 
 /** @file
  *
diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c
index ce2c820..63d1ecc 100644
--- a/src/net/udp/dhcp.c
+++ b/src/net/udp/dhcp.c
@@ -25,22 +25,22 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <errno.h>
 #include <assert.h>
 #include <byteswap.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/device.h>
-#include <gpxe/xfer.h>
-#include <gpxe/open.h>
-#include <gpxe/job.h>
-#include <gpxe/retry.h>
-#include <gpxe/tcpip.h>
-#include <gpxe/ip.h>
-#include <gpxe/uuid.h>
-#include <gpxe/timer.h>
-#include <gpxe/settings.h>
-#include <gpxe/dhcp.h>
-#include <gpxe/dhcpopts.h>
-#include <gpxe/dhcppkt.h>
-#include <gpxe/features.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/device.h>
+#include <ipxe/xfer.h>
+#include <ipxe/open.h>
+#include <ipxe/job.h>
+#include <ipxe/retry.h>
+#include <ipxe/tcpip.h>
+#include <ipxe/ip.h>
+#include <ipxe/uuid.h>
+#include <ipxe/timer.h>
+#include <ipxe/settings.h>
+#include <ipxe/dhcp.h>
+#include <ipxe/dhcpopts.h>
+#include <ipxe/dhcppkt.h>
+#include <ipxe/features.h>
 
 /** @file
  *
diff --git a/src/net/udp/dns.c b/src/net/udp/dns.c
index f94094a..db9c036 100644
--- a/src/net/udp/dns.c
+++ b/src/net/udp/dns.c
@@ -27,15 +27,15 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdio.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/refcnt.h>
-#include <gpxe/xfer.h>
-#include <gpxe/open.h>
-#include <gpxe/resolv.h>
-#include <gpxe/retry.h>
-#include <gpxe/tcpip.h>
-#include <gpxe/settings.h>
-#include <gpxe/features.h>
-#include <gpxe/dns.h>
+#include <ipxe/refcnt.h>
+#include <ipxe/xfer.h>
+#include <ipxe/open.h>
+#include <ipxe/resolv.h>
+#include <ipxe/retry.h>
+#include <ipxe/tcpip.h>
+#include <ipxe/settings.h>
+#include <ipxe/features.h>
+#include <ipxe/dns.h>
 
 /** @file
  *
diff --git a/src/net/udp/slam.c b/src/net/udp/slam.c
index 396f69b..aa15933 100644
--- a/src/net/udp/slam.c
+++ b/src/net/udp/slam.c
@@ -25,15 +25,15 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <errno.h>
 #include <assert.h>
 #include <byteswap.h>
-#include <gpxe/features.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/bitmap.h>
-#include <gpxe/xfer.h>
-#include <gpxe/open.h>
-#include <gpxe/uri.h>
-#include <gpxe/tcpip.h>
-#include <gpxe/timer.h>
-#include <gpxe/retry.h>
+#include <ipxe/features.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/bitmap.h>
+#include <ipxe/xfer.h>
+#include <ipxe/open.h>
+#include <ipxe/uri.h>
+#include <ipxe/tcpip.h>
+#include <ipxe/timer.h>
+#include <ipxe/retry.h>
 
 /** @file
  *
diff --git a/src/net/udp/tftp.c b/src/net/udp/tftp.c
index 3de2fb9..70ba4f6 100644
--- a/src/net/udp/tftp.c
+++ b/src/net/udp/tftp.c
@@ -26,18 +26,18 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <byteswap.h>
 #include <errno.h>
 #include <assert.h>
-#include <gpxe/refcnt.h>
-#include <gpxe/xfer.h>
-#include <gpxe/open.h>
-#include <gpxe/uri.h>
-#include <gpxe/tcpip.h>
-#include <gpxe/retry.h>
-#include <gpxe/features.h>
-#include <gpxe/bitmap.h>
-#include <gpxe/settings.h>
-#include <gpxe/dhcp.h>
-#include <gpxe/uri.h>
-#include <gpxe/tftp.h>
+#include <ipxe/refcnt.h>
+#include <ipxe/xfer.h>
+#include <ipxe/open.h>
+#include <ipxe/uri.h>
+#include <ipxe/tcpip.h>
+#include <ipxe/retry.h>
+#include <ipxe/features.h>
+#include <ipxe/bitmap.h>
+#include <ipxe/settings.h>
+#include <ipxe/dhcp.h>
+#include <ipxe/uri.h>
+#include <ipxe/tftp.h>
 
 /** @file
  *
diff --git a/src/tests/gdbstub_test.gdb b/src/tests/gdbstub_test.gdb
index 52aa693..bcfa07d 100755
--- a/src/tests/gdbstub_test.gdb
+++ b/src/tests/gdbstub_test.gdb
@@ -1,7 +1,7 @@
 #!/usr/bin/gdb -x
 # Test suite for GDB remote debugging
 # Run:
-#   make bin/gpxe.hd.tmp
+#   make bin/ipxe.hd.tmp
 #   make
 #   gdb
 #   (gdb) target remote :TCPPORT
@@ -9,11 +9,11 @@
 #   (gdb) target remote udp:IP:UDPPORT
 #   (gdb) source tests/gdbstub_test.gdb
 
-define gpxe_load_symbols
-	file bin/gpxe.hd.tmp
+define ipxe_load_symbols
+	file bin/ipxe.hd.tmp
 end
 
-define gpxe_assert
+define ipxe_assert
 	if $arg0 != $arg1
 		echo FAIL $arg2\n
 	else
@@ -21,20 +21,20 @@ define gpxe_assert
 	end
 end
 
-define gpxe_start_tests
+define ipxe_start_tests
 	jump gdbstub_test
 end
 
-define gpxe_test_regs_read
-	gpxe_assert $eax 0xea010203 "gpxe_test_regs_read eax"
-	gpxe_assert $ebx 0xeb040506 "gpxe_test_regs_read ebx"
-	gpxe_assert $ecx 0xec070809 "gpxe_test_regs_read ecx"
-	gpxe_assert $edx 0xed0a0b0c "gpxe_test_regs_read edx"
-	gpxe_assert $esi 0x510d0e0f "gpxe_test_regs_read esi"
-	gpxe_assert $edi 0xd1102030 "gpxe_test_regs_read edi"
+define ipxe_test_regs_read
+	ipxe_assert $eax 0xea010203 "ipxe_test_regs_read eax"
+	ipxe_assert $ebx 0xeb040506 "ipxe_test_regs_read ebx"
+	ipxe_assert $ecx 0xec070809 "ipxe_test_regs_read ecx"
+	ipxe_assert $edx 0xed0a0b0c "ipxe_test_regs_read edx"
+	ipxe_assert $esi 0x510d0e0f "ipxe_test_regs_read esi"
+	ipxe_assert $edi 0xd1102030 "ipxe_test_regs_read edi"
 end
 
-define gpxe_test_regs_write
+define ipxe_test_regs_write
 	set $eax = 0xea112233
 	set $ebx = 0xeb445566
 	set $ecx = 0xec778899
@@ -42,52 +42,52 @@ define gpxe_test_regs_write
 	set $esi = 0x51ddeeff
 	set $edi = 0xd1010203
 	c
-	gpxe_assert $eax 0xea112233 "gpxe_test_regs_write eax"
-	gpxe_assert $ebx 0xeb445566 "gpxe_test_regs_write ebx"
-	gpxe_assert $ecx 0xec778899 "gpxe_test_regs_write ecx"
-	gpxe_assert $edx 0xedaabbcc "gpxe_test_regs_write edx"
-	gpxe_assert $esi 0x51ddeeff "gpxe_test_regs_write esi"
-	gpxe_assert $edi 0xd1010203 "gpxe_test_regs_write edi"
+	ipxe_assert $eax 0xea112233 "ipxe_test_regs_write eax"
+	ipxe_assert $ebx 0xeb445566 "ipxe_test_regs_write ebx"
+	ipxe_assert $ecx 0xec778899 "ipxe_test_regs_write ecx"
+	ipxe_assert $edx 0xedaabbcc "ipxe_test_regs_write edx"
+	ipxe_assert $esi 0x51ddeeff "ipxe_test_regs_write esi"
+	ipxe_assert $edi 0xd1010203 "ipxe_test_regs_write edi"
 
 	# This assumes segment selectors are always 0x10 or 0x8 (for code).
-	gpxe_assert $cs 0x08 "gpxe_test_regs_write cs"
-	gpxe_assert $ds 0x10 "gpxe_test_regs_write ds"
+	ipxe_assert $cs 0x08 "ipxe_test_regs_write cs"
+	ipxe_assert $ds 0x10 "ipxe_test_regs_write ds"
 end
 
-define gpxe_test_mem_read
+define ipxe_test_mem_read
 	c
-	gpxe_assert ({int}($esp+4)) 0x11223344 "gpxe_test_mem_read int"
-	gpxe_assert ({short}($esp+2)) 0x5566 "gpxe_test_mem_read short"
-	gpxe_assert ({char}($esp)) 0x77 "gpxe_test_mem_read char"
+	ipxe_assert ({int}($esp+4)) 0x11223344 "ipxe_test_mem_read int"
+	ipxe_assert ({short}($esp+2)) 0x5566 "ipxe_test_mem_read short"
+	ipxe_assert ({char}($esp)) 0x77 "ipxe_test_mem_read char"
 end
 
-define gpxe_test_mem_write
+define ipxe_test_mem_write
 	set ({int}($esp+4)) = 0xaabbccdd
 	set ({short}($esp+2)) = 0xeeff
 	set ({char}($esp)) = 0x99
 	c
-	gpxe_assert ({int}($esp+4)) 0xaabbccdd "gpxe_test_mem_write int"
-	gpxe_assert ({short}($esp+2)) (short)0xeeff "gpxe_test_mem_write short"
-	gpxe_assert ({char}($esp)) (char)0x99 "gpxe_test_mem_write char"
+	ipxe_assert ({int}($esp+4)) 0xaabbccdd "ipxe_test_mem_write int"
+	ipxe_assert ({short}($esp+2)) (short)0xeeff "ipxe_test_mem_write short"
+	ipxe_assert ({char}($esp)) (char)0x99 "ipxe_test_mem_write char"
 end
 
-define gpxe_test_step
+define ipxe_test_step
 	c
 	si
-	gpxe_assert ({char}($eip-1)) (char)0x90 "gpxe_test_step" # nop = 0x90
+	ipxe_assert ({char}($eip-1)) (char)0x90 "ipxe_test_step" # nop = 0x90
 end
 
-define gpxe_test_awatch
+define ipxe_test_awatch
 	awatch watch_me
 
 	c
-	gpxe_assert $ecx 0x600d0000 "gpxe_test_awatch read"
+	ipxe_assert $ecx 0x600d0000 "ipxe_test_awatch read"
 	if $ecx == 0x600d0000
 		c
 	end
 
 	c
-	gpxe_assert $ecx 0x600d0001 "gpxe_test_awatch write"
+	ipxe_assert $ecx 0x600d0001 "ipxe_test_awatch write"
 	if $ecx == 0x600d0001
 		c
 	end
@@ -95,22 +95,22 @@ define gpxe_test_awatch
 	delete
 end
 
-define gpxe_test_watch
+define ipxe_test_watch
 	watch watch_me
 	c
-	gpxe_assert $ecx 0x600d0002 "gpxe_test_watch"
+	ipxe_assert $ecx 0x600d0002 "ipxe_test_watch"
 	if $ecx == 0x600d0002
 		c
 	end
 	delete
 end
 
-gpxe_load_symbols
-gpxe_start_tests
-gpxe_test_regs_read
-gpxe_test_regs_write
-gpxe_test_mem_read
-gpxe_test_mem_write
-gpxe_test_step
-gpxe_test_awatch
-gpxe_test_watch
+ipxe_load_symbols
+ipxe_start_tests
+ipxe_test_regs_read
+ipxe_test_regs_write
+ipxe_test_mem_read
+ipxe_test_mem_write
+ipxe_test_step
+ipxe_test_awatch
+ipxe_test_watch
diff --git a/src/tests/linebuf_test.c b/src/tests/linebuf_test.c
index c3c3b37..e06ac7d 100644
--- a/src/tests/linebuf_test.c
+++ b/src/tests/linebuf_test.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdio.h>
-#include <gpxe/linebuf.h>
+#include <ipxe/linebuf.h>
 
 static const char data1[] = 
 "Hello world\r\n"
diff --git a/src/tests/umalloc_test.c b/src/tests/umalloc_test.c
index 7a36186..157835d 100644
--- a/src/tests/umalloc_test.c
+++ b/src/tests/umalloc_test.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/umalloc.h>
-#include <gpxe/memmap.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/umalloc.h>
+#include <ipxe/memmap.h>
 
 void umalloc_test ( void ) {
 	struct memory_map memmap;
diff --git a/src/tests/uri_test.c b/src/tests/uri_test.c
index ca3aed9..fd29d39 100644
--- a/src/tests/uri_test.c
+++ b/src/tests/uri_test.c
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <gpxe/uri.h>
+#include <ipxe/uri.h>
 
 #define URI_MAX_LEN 1024
 
@@ -16,17 +16,17 @@ struct uri_test {
 static struct uri_test uri_tests[] = {
 	{ "http://www.fensystems.co.uk", "",
 	  "http://www.fensystems.co.uk/" },
-	{ "http://etherboot.org/wiki/page1", "page2",
-	  "http://etherboot.org/wiki/page2" },
-	{ "http://etherboot.org/wiki/page1", "../page3",
-	  "http://etherboot.org/page3" },
+	{ "http://ipxe.org/wiki/page1", "page2",
+	  "http://ipxe.org/wiki/page2" },
+	{ "http://ipxe.org/wiki/page1", "../page3",
+	  "http://ipxe.org/page3" },
 	{ "tftp://192.168.0.1/", "/tftpboot/vmlinuz",
 	  "tftp://192.168.0.1/tftpboot/vmlinuz" },
 	{ "ftp://the%41nswer%3d:%34ty%32wo@ether%62oot.org:8080/p%41th/foo",
 	  "to?%41=b#%43d",
-	  "ftp://theAnswer%3d:4ty2wo@etherboot.org:8080/path/to?a=b#cd" },
+	  "ftp://theAnswer%3d:4ty2wo@ipxe.org:8080/path/to?a=b#cd" },
 #if 0
-	"http://www.etherboot.org/wiki",
+	"http://www.ipxe.org/wiki",
 	"mailto:bob@nowhere.com",
 	"ftp://joe:secret@insecure.org:8081/hidden/path/to?what=is#this",
 #endif
diff --git a/src/usr/autoboot.c b/src/usr/autoboot.c
index 2fa10e6..acc4efd 100644
--- a/src/usr/autoboot.c
+++ b/src/usr/autoboot.c
@@ -21,12 +21,12 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/dhcp.h>
-#include <gpxe/settings.h>
-#include <gpxe/image.h>
-#include <gpxe/sanboot.h>
-#include <gpxe/uri.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/dhcp.h>
+#include <ipxe/settings.h>
+#include <ipxe/image.h>
+#include <ipxe/sanboot.h>
+#include <ipxe/uri.h>
 #include <usr/ifmgmt.h>
 #include <usr/route.h>
 #include <usr/dhcpmgmt.h>
diff --git a/src/usr/dhcpmgmt.c b/src/usr/dhcpmgmt.c
index f82a3bb..ed8a9fe 100644
--- a/src/usr/dhcpmgmt.c
+++ b/src/usr/dhcpmgmt.c
@@ -21,10 +21,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/dhcp.h>
-#include <gpxe/monojob.h>
-#include <gpxe/process.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/dhcp.h>
+#include <ipxe/monojob.h>
+#include <ipxe/process.h>
 #include <usr/ifmgmt.h>
 #include <usr/dhcpmgmt.h>
 
diff --git a/src/usr/ifmgmt.c b/src/usr/ifmgmt.c
index 95505fc..e031cd0 100644
--- a/src/usr/ifmgmt.c
+++ b/src/usr/ifmgmt.c
@@ -23,10 +23,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <unistd.h>
 #include <errno.h>
 #include <console.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/device.h>
-#include <gpxe/process.h>
-#include <gpxe/keys.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/device.h>
+#include <ipxe/process.h>
+#include <ipxe/keys.h>
 #include <usr/ifmgmt.h>
 
 /** @file
diff --git a/src/usr/imgmgmt.c b/src/usr/imgmgmt.c
index 023e3f0..5e7629a 100644
--- a/src/usr/imgmgmt.c
+++ b/src/usr/imgmgmt.c
@@ -22,11 +22,11 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
-#include <gpxe/image.h>
-#include <gpxe/downloader.h>
-#include <gpxe/monojob.h>
-#include <gpxe/open.h>
-#include <gpxe/uri.h>
+#include <ipxe/image.h>
+#include <ipxe/downloader.h>
+#include <ipxe/monojob.h>
+#include <ipxe/open.h>
+#include <ipxe/uri.h>
 #include <usr/imgmgmt.h>
 
 /** @file
diff --git a/src/usr/iwmgmt.c b/src/usr/iwmgmt.c
index dd45662..27e7795 100644
--- a/src/usr/iwmgmt.c
+++ b/src/usr/iwmgmt.c
@@ -22,11 +22,11 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <console.h>
 #include <string.h>
 #include <errno.h>
-#include <gpxe/net80211.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/net80211.h>
+#include <ipxe/ethernet.h>
 #include <usr/ifmgmt.h>
 #include <usr/iwmgmt.h>
-#include <gpxe/errortab.h>
+#include <ipxe/errortab.h>
 
 /** @file
  *
diff --git a/src/usr/pxemenu.c b/src/usr/pxemenu.c
index 519c200..bbd7670 100644
--- a/src/usr/pxemenu.c
+++ b/src/usr/pxemenu.c
@@ -27,10 +27,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <byteswap.h>
 #include <curses.h>
 #include <console.h>
-#include <gpxe/dhcp.h>
-#include <gpxe/keys.h>
-#include <gpxe/timer.h>
-#include <gpxe/process.h>
+#include <ipxe/dhcp.h>
+#include <ipxe/keys.h>
+#include <ipxe/timer.h>
+#include <ipxe/process.h>
 #include <usr/dhcpmgmt.h>
 #include <usr/autoboot.h>
 
diff --git a/src/usr/route.c b/src/usr/route.c
index 101d170..1da7135 100644
--- a/src/usr/route.c
+++ b/src/usr/route.c
@@ -19,8 +19,8 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdio.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/ip.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/ip.h>
 #include <usr/route.h>
 
 /** @file
diff --git a/src/util/diffsize.pl b/src/util/diffsize.pl
index d4978c2..ced0786 100755
--- a/src/util/diffsize.pl
+++ b/src/util/diffsize.pl
@@ -1,11 +1,11 @@
 #!/usr/bin/perl -w
 # usage:
-# [somebody@somewhere ~/gpxe/src]$ ./util/diffsize.pl [<old rev> [<new rev>]]
+# [somebody@somewhere ~/ipxe/src]$ ./util/diffsize.pl [<old rev> [<new rev>]]
 # by default <old rev> is HEAD and <new rev> is the working tree
 
 use strict;
 
--d "bin" or die "Please run me in the gPXE src directory\n";
+-d "bin" or die "Please run me in the iPXE src directory\n";
 mkdir ".sizes";
 
 my($oldrev, $newrev);
@@ -47,8 +47,8 @@ sub calc_sizes($$) {
     system("git checkout $name >/dev/null"); $res ||= $?;
   }
 
-  system("make -j4 bin/gpxe.lkrn >/dev/null"); $res ||= $?;
-  system("make bin/gpxe.lkrn.sizes > .sizes/$rev.sizes"); $res ||= $?;
+  system("make -j4 bin/ipxe.lkrn >/dev/null"); $res ||= $?;
+  system("make bin/ipxe.lkrn.sizes > .sizes/$rev.sizes"); $res ||= $?;
 
   if (defined $name) {
     system("git checkout $lastrev >/dev/null"); $res ||= $?;
diff --git a/src/util/efirom.c b/src/util/efirom.c
index 9369db8..d0bdace 100644
--- a/src/util/efirom.c
+++ b/src/util/efirom.c
@@ -26,9 +26,9 @@
 #include <errno.h>
 #include <assert.h>
 #include <getopt.h>
-#include <gpxe/efi/efi.h>
-#include <gpxe/efi/IndustryStandard/PeImage.h>
-#include <gpxe/efi/IndustryStandard/Pci22.h>
+#include <ipxe/efi/efi.h>
+#include <ipxe/efi/IndustryStandard/PeImage.h>
+#include <ipxe/efi/IndustryStandard/Pci22.h>
 
 #define eprintf(...) fprintf ( stderr, __VA_ARGS__ )
 
diff --git a/src/util/elf2efi.c b/src/util/elf2efi.c
index bb766bd..7870bb9 100644
--- a/src/util/elf2efi.c
+++ b/src/util/elf2efi.c
@@ -27,8 +27,8 @@
 #include <assert.h>
 #include <getopt.h>
 #include <bfd.h>
-#include <gpxe/efi/efi.h>
-#include <gpxe/efi/IndustryStandard/PeImage.h>
+#include <ipxe/efi/efi.h>
+#include <ipxe/efi/IndustryStandard/PeImage.h>
 #include <libgen.h>
 
 #define eprintf(...) fprintf ( stderr, __VA_ARGS__ )
diff --git a/src/util/fnrec.sh b/src/util/fnrec.sh
index 00784ac..3be5cea 100755
--- a/src/util/fnrec.sh
+++ b/src/util/fnrec.sh
@@ -24,7 +24,7 @@ Look up symbol names in <elf-binary> for function addresses from
 <addresses-file>.
 
 Example:
-$0 bin/gpxe.hd.tmp fnrec.dat
+$0 bin/ipxe.hd.tmp fnrec.dat
 EOF
 	exit 1
 fi
diff --git a/src/util/genliso b/src/util/genliso
index 1f1c116..184408a 100755
--- a/src/util/genliso
+++ b/src/util/genliso
@@ -34,7 +34,7 @@ mformat -f 1440 -C -i $img ::
 cfg=$dir/syslinux.cfg
 cat > $cfg <<EOF
 # These default options can be changed in the genliso script
-SAY gPXE ISO boot image generated by genliso
+SAY iPXE ISO boot image generated by genliso
 TIMEOUT 30
 EOF
 
diff --git a/src/util/gensdsk b/src/util/gensdsk
index a866158..9e8361d 100755
--- a/src/util/gensdsk
+++ b/src/util/gensdsk
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Generate a syslinux floppy that loads a gPXE image
+# Generate a syslinux floppy that loads a iPXE image
 #
 # gensdsk foo.sdsk foo.lkrn
 #
diff --git a/src/util/iccfix.c b/src/util/iccfix.c
index 303ae9c..8b555c5 100644
--- a/src/util/iccfix.c
+++ b/src/util/iccfix.c
@@ -9,7 +9,7 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <elf.h>
-#include <gpxe/tables.h>
+#include <ipxe/tables.h>
 
 #define DEBUG 0