diff --git a/src/Nerdbank.Zcash/LightWalletServers.cs b/src/Nerdbank.Zcash/LightWalletServers.cs
index 4b65c2d4..e7708871 100644
--- a/src/Nerdbank.Zcash/LightWalletServers.cs
+++ b/src/Nerdbank.Zcash/LightWalletServers.cs
@@ -28,31 +28,25 @@ public static class LightWalletServers
 	public static Uri GetDefaultServer(ZcashNetwork network) =>
 		network switch
 		{
-			ZcashNetwork.MainNet => Nighthawk.MainNet,
-			ZcashNetwork.TestNet => ElectricCoinCo.TestNet,
+			ZcashNetwork.MainNet => Nerdbank.MainNet,
+			ZcashNetwork.TestNet => Nerdbank.TestNet,
 			_ => throw new ArgumentOutOfRangeException(nameof(network)),
 		};
 
 	/// <summary>
-	/// Servers hosted by the Nighthawk Wallet team.
+	/// Servers hosted by the same authors as this library.
 	/// </summary>
-	public static class Nighthawk
+	public static class Nerdbank
 	{
 		/// <summary>
-		/// Gets the URI to the Nighthawk MainNet server.
+		/// Gets the URI to the MainNet server.
 		/// </summary>
-		public static readonly Uri MainNet = new("https://mainnet.lightwalletd.com:9067/");
-	}
+		public static readonly Uri MainNet = new("https://zcash.mysideoftheweb.com:9067/");
 
-	/// <summary>
-	/// Servers hosted by the Electric Coin Company.
-	/// </summary>
-	public static class ElectricCoinCo
-	{
 		/// <summary>
-		/// Gets the URI to the Electric Coin Company TestNet server.
+		/// Gets the URI to the TestNet server.
 		/// </summary>
-		public static readonly Uri TestNet = new("https://lightwalletd.testnet.electriccoin.co:9067/");
+		public static readonly Uri TestNet = new("https://zcash.mysideoftheweb.com:19067/");
 	}
 
 	/// <summary>
diff --git a/src/Nerdbank.Zcash/PublicAPI.Unshipped.txt b/src/Nerdbank.Zcash/PublicAPI.Unshipped.txt
index 7ce2fde2..ad53e8bd 100644
--- a/src/Nerdbank.Zcash/PublicAPI.Unshipped.txt
+++ b/src/Nerdbank.Zcash/PublicAPI.Unshipped.txt
@@ -161,9 +161,8 @@ Nerdbank.Zcash.LightWalletException.ErrorCode.Sqlite = 3 -> Nerdbank.Zcash.Light
 Nerdbank.Zcash.LightWalletException.LightWalletException(string? message) -> void
 Nerdbank.Zcash.LightWalletException.LightWalletException(string? message, System.Exception? innerException) -> void
 Nerdbank.Zcash.LightWalletServers
-Nerdbank.Zcash.LightWalletServers.ElectricCoinCo
 Nerdbank.Zcash.LightWalletServers.Hanh
-Nerdbank.Zcash.LightWalletServers.Nighthawk
+Nerdbank.Zcash.LightWalletServers.Nerdbank
 Nerdbank.Zcash.ManagedLightWalletClient
 Nerdbank.Zcash.ManagedLightWalletClient.Dispose() -> void
 Nerdbank.Zcash.ManagedLightWalletClient.GetLatestBlockHeightAsync(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask<ulong>
@@ -989,8 +988,8 @@ static Nerdbank.Zcash.Zip32HDWallet.Transparent.Create(Nerdbank.Bitcoin.Bip39Mne
 static Nerdbank.Zcash.Zip32HDWallet.Transparent.Create(System.ReadOnlySpan<byte> seed, Nerdbank.Zcash.ZcashNetwork network) -> Nerdbank.Zcash.Zip32HDWallet.Transparent.ExtendedSpendingKey!
 static Nerdbank.Zcash.Zip32HDWallet.Transparent.ExtendedSpendingKey.TryDecode(System.ReadOnlySpan<char> encoding, out Nerdbank.Cryptocurrencies.DecodeError? decodeError, out string? errorMessage, out Nerdbank.Zcash.Zip32HDWallet.Transparent.ExtendedSpendingKey? key) -> bool
 static Nerdbank.Zcash.Zip32HDWallet.Transparent.ExtendedViewingKey.TryDecode(System.ReadOnlySpan<char> encoding, out Nerdbank.Cryptocurrencies.DecodeError? decodeResult, out string? errorMessage, out Nerdbank.Zcash.Zip32HDWallet.Transparent.ExtendedViewingKey? key) -> bool
-static readonly Nerdbank.Zcash.LightWalletServers.ElectricCoinCo.TestNet -> System.Uri!
-static readonly Nerdbank.Zcash.LightWalletServers.Nighthawk.MainNet -> System.Uri!
+static readonly Nerdbank.Zcash.LightWalletServers.Nerdbank.MainNet -> System.Uri!
+static readonly Nerdbank.Zcash.LightWalletServers.Nerdbank.TestNet -> System.Uri!
 static readonly Nerdbank.Zcash.UnifiedEncodingMetadata.Default -> Nerdbank.Zcash.UnifiedEncodingMetadata!
 static readonly Nerdbank.Zcash.ZcashAccount.Equality.ByFullViewingKey -> System.Collections.Generic.IEqualityComparer<Nerdbank.Zcash.ZcashAccount!>!
 static readonly Nerdbank.Zcash.ZcashAccount.Equality.ByIncomingViewingKey -> System.Collections.Generic.IEqualityComparer<Nerdbank.Zcash.ZcashAccount!>!