[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>

50 files changed, 320 insertions, 320 deletions

diff --git a/src/net/80211/net80211.c b/src/net/80211/net80211.c
index 40f7ba25f..0069abaa8 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 5bd191438..56bbc8a06 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 c5aa1183f..69fad8ffc 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 1c37e0c30..3b1045525 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 9bac8fe74..3e78c8d58 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 08b1e17b6..89bb36fd8 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 e75216825..780738e79 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 0cb697fa5..0a94df07e 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 839a875b4..497c12a02 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 124a856eb..fe4dbff91 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 37f344b69..299b164cf 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 6482c627b..f351c32e3 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 20a0e6668..bc99401f2 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 507c8ce2b..7246c7b8a 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 79ed1dc60..5c5936f40 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 ad3f046fe..b43e9b124 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 749c34549..84dad4256 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 237fc4a63..ab8a65ec9 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 d7813249a..dd98e9228 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 ebe65b33b..35ade6690 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 2d6481158..de19c51f7 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 5cb395de7..9eff1899e 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 7511fd87e..b4b64ca45 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 08820ef36..943f39571 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 136e628d2..e1fa53068 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 ff4cbbf6a..b8327355f 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 d308dd9dc..7d5963594 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 c156d3aec..24eb1f92a 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 cbae221a1..f83c76d87 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 7a8ddd3b2..6d3d80a55 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 f7308bb43..781d7628a 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 0de644288..dbaecf11c 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 8bea8b32b..4d3713353 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 d814193b8..f641d3b21 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 b91f98c49..9b42ad37f 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 381f02a6a..48849dfd6 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 1d0dd961f..bf2e7f0ae 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 40f656f2a..5eefa3d48 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 a06196226..decc9215b 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 920e537ab..3ef71b610 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 a365b2a48..c7027d2d0 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 7a2961f21..b738f4167 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 b13a107c2..27e454e25 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 932fd482a..4451bf111 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 a5b126ed8..3c72b45c4 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 771655e06..1aa0e4968 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 ce2c82072..63d1ecc60 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 f94094aa9..db9c03622 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 396f69b07..aa15933ec 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 3de2fb9b7..70ba4f62e 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
  *