diff --git a/panels/network/gnome-network-panel.desktop.in.in b/panels/network/gnome-network-panel.desktop.in.in
index 6b4787ac1..9b3114713 100644
--- a/panels/network/gnome-network-panel.desktop.in.in
+++ b/panels/network/gnome-network-panel.desktop.in.in
@@ -14,4 +14,4 @@ X-GNOME-Bugzilla-Component=network
 X-GNOME-Bugzilla-Version=@VERSION@
 X-GNOME-Settings-Panel=network
 # Translators: those are keywords for the network control-center panel
-_Keywords=Network;Wireless;IP;LAN;Proxy;
+_Keywords=Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;
diff --git a/panels/network/network-wifi.ui b/panels/network/network-wifi.ui
index 00c89850d..b55affd72 100644
--- a/panels/network/network-wifi.ui
+++ b/panels/network/network-wifi.ui
@@ -35,7 +35,7 @@
               <object class="GtkLabel" id="hotspot-dialog-title">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Wireless Hotspot</property>
+                <property name="label" translatable="yes">Wi-Fi Hotspot</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                   <attribute name="scale" value="1.2"/>
@@ -174,7 +174,7 @@
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
                         <property name="hexpand">True</property>
-                        <property name="label" translatable="yes">Wireless</property>
+                        <property name="label" translatable="yes">Wi-Fi</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                           <attribute name="scale" value="1.2"/>
@@ -335,7 +335,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Wireless</property>
+                        <property name="label" translatable="yes">Wi-Fi</property>
                         <property name="ellipsize">end</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
@@ -866,7 +866,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Wireless Hotspot</property>
+                        <property name="label" translatable="yes">Wi-Fi Hotspot</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                           <attribute name="scale" value="1.2"/>
@@ -883,7 +883,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Switch off to connect to a wireless network</property>
+                        <property name="label" translatable="yes">Switch off to connect to a Wi-Fi network</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
diff --git a/panels/network/panel-common.c b/panels/network/panel-common.c
index debc95766..707db8daf 100644
--- a/panels/network/panel-common.c
+++ b/panels/network/panel-common.c
@@ -87,7 +87,7 @@ panel_device_to_localized_string (NMDevice *device)
                 break;
         case NM_DEVICE_TYPE_WIFI:
                 /* TRANSLATORS: device type */
-                value = _("Wireless");
+                value = _("Wi-Fi");
                 break;
         case NM_DEVICE_TYPE_MODEM:
                 caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device));