diff --git a/PiPedalCommon/src/ChannelInfo.cpp b/PiPedalCommon/src/ChannelInfo.cpp
index dffbe1f..3195134 100644
--- a/PiPedalCommon/src/ChannelInfo.cpp
+++ b/PiPedalCommon/src/ChannelInfo.cpp
@@ -53,12 +53,12 @@ static std::vector<OpClassChannels> opClasses = {
      * care of removing invalid channels.
      */
 
-        // WiFi 5.
+        // Wi-Fi 5.
         // {WifiMode::IEEE80211A, 128, 36, 177, 4, WifiBandwidth::BW80, true},
         // {WifiMode::IEEE80211A, 129, 36, 177, 4, WifiBandwidth::BW160, true},
         // {WifiMode::IEEE80211A, 130, 36, 177, 4, WifiBandwidth::BW80P80, true},
 
-        // WiFi 6.
+        // Wi-Fi 6.
     // {WifiMode::IEEE80211AX, 131, 1, 233, 4, WifiBandwidth::BW20, true},
     // {WifiMode::IEEE80211AX, 132, 1, 233, 8, WifiBandwidth::BW40PLUS, true},
     // {WifiMode::IEEE80211AX, 133, 1, 233, 16, WifiBandwidth::BW80, true},
diff --git a/PiPedalCommon/src/WifiConfigSettings.cpp b/PiPedalCommon/src/WifiConfigSettings.cpp
index 40e7919..c6a364b 100644
--- a/PiPedalCommon/src/WifiConfigSettings.cpp
+++ b/PiPedalCommon/src/WifiConfigSettings.cpp
@@ -504,7 +504,7 @@ uint32_t pipedal::ChannelToWifiFrequency(uint32_t channel)
     {
         return 5500 + (channel - 100) / 5;
     }
-    throw invalid_argument(SS("Invalid WiFi channel: " << channel));
+    throw invalid_argument(SS("Invalid Wi-Fi channel: " << channel));
 }
 
 bool WifiConfigSettings::ValidateChannel(const std::string &countryCode, const std::string &value)
diff --git a/PiPedalCommon/src/WifiDirectConfigSettings.cpp b/PiPedalCommon/src/WifiDirectConfigSettings.cpp
index 049a8ee..5b674d2 100644
--- a/PiPedalCommon/src/WifiDirectConfigSettings.cpp
+++ b/PiPedalCommon/src/WifiDirectConfigSettings.cpp
@@ -123,7 +123,7 @@ void WifiDirectConfigSettings::ParseArguments(const std::vector<std::string> &ar
 
     if (!WifiConfigSettings::ValidateChannel(this->countryCode_,channel_))
     {
-        throw invalid_argument(SS("Invalid WiFi channel: " << channel_));
+        throw invalid_argument(SS("Invalid Wi-Fi channel: " << channel_));
     }
 }
 
diff --git a/src/ConfigMain.cpp b/src/ConfigMain.cpp
index 565f00a..806c4ba 100644
--- a/src/ConfigMain.cpp
+++ b/src/ConfigMain.cpp
@@ -1105,7 +1105,7 @@ void Install(const fs::path &programPrefix, const std::string endpointAddress)
 
         EnableService();
 
-        // Restart WiFi Direct if neccessary.
+        // Restart Wi-Fi Direct if neccessary.
         OnWifiReinstall();
     }
     catch (const std::exception &e)
diff --git a/src/PiPedalVersion.cpp b/src/PiPedalVersion.cpp
index 54d3bb1..d8f47f4 100644
--- a/src/PiPedalVersion.cpp
+++ b/src/PiPedalVersion.cpp
@@ -107,7 +107,7 @@ PiPedalVersion::PiPedalVersion(PiPedalModel&model)
     std::string p2pAddr = GetInterfaceIpv4Address("p2p-wlan0-0");
     if (p2pAddr.length() != 0)
     {
-        this->webAddresses_.push_back(MakeWebAddress(p2pAddr,port) + " (WiFi Direct)");
+        this->webAddresses_.push_back(MakeWebAddress(p2pAddr,port) + " (Wi-Fi Direct)");
 
     }
 
diff --git a/src/templates/pipedal_p2pd.conf.template b/src/templates/pipedal_p2pd.conf.template
index 9253a1f..9b175ee 100644
--- a/src/templates/pipedal_p2pd.conf.template
+++ b/src/templates/pipedal_p2pd.conf.template
@@ -1,4 +1,4 @@
-# WiFi regdomain 2-letter country code.
+# Wi-Fi regdomain 2-letter country code.
 # see: http://www.davros.org/misc/iso3166.txt
 country_code=${COUNTRY_CODE}