diff --git a/modules/events_view_wifi.go b/modules/events_view_wifi.go
index 7e8ad92e..a8fabefb 100644
--- a/modules/events_view_wifi.go
+++ b/modules/events_view_wifi.go
@@ -88,18 +88,21 @@ func (s *EventsStream) viewWiFiHandshakeEvent(e session.Event) {
 
 func (s *EventsStream) viewWiFiClientEvent(e session.Event) {
 	ce := e.Data.(WiFiClientEvent)
+
+	ce.Client.Alias = s.Session.Lan.GetAlias(ce.Client.BSSID())
+
 	if e.Tag == "wifi.client.new" {
-		fmt.Fprintf(s.output, "[%s] [%s] new wifi client %s detected for %s (%s)\n",
+		fmt.Fprintf(s.output, "[%s] [%s] new station %s detected for %s (%s)\n",
 			e.Time.Format(eventTimeFormat),
 			tui.Green(e.Tag),
-			ce.Client.BSSID(),
+			ce.Client.String(),
 			tui.Bold(ce.AP.ESSID()),
 			tui.Dim(ce.AP.BSSID()))
 	} else if e.Tag == "wifi.client.lost" {
-		fmt.Fprintf(s.output, "[%s] [%s] wifi client %s disconnected from %s (%s)\n",
+		fmt.Fprintf(s.output, "[%s] [%s] station %s disconnected from %s (%s)\n",
 			e.Time.Format(eventTimeFormat),
 			tui.Green(e.Tag),
-			ce.Client.BSSID(),
+			ce.Client.String(),
 			tui.Bold(ce.AP.ESSID()),
 			tui.Dim(ce.AP.BSSID()))
 	}
diff --git a/network/lan_endpoint.go b/network/lan_endpoint.go
index 025995cb..15925928 100644
--- a/network/lan_endpoint.go
+++ b/network/lan_endpoint.go
@@ -149,10 +149,16 @@ func (t *Endpoint) String() string {
 		return t.IpAddress
 	} else if t.Vendor == "" {
 		return fmt.Sprintf("%s%s", ipPart, t.HwAddress)
-	} else if t.Hostname == "" {
-		return fmt.Sprintf("%s%s ( %s )", ipPart, t.HwAddress, t.Vendor)
+	} else if t.Hostname == "" && t.Alias == "" {
+		return fmt.Sprintf("%s%s (%s)", ipPart, t.HwAddress, t.Vendor)
 	}
-	return fmt.Sprintf("%s%s ( %s ) - %s", ipPart, t.HwAddress, t.Vendor, tui.Bold(t.Hostname))
+
+	name := t.Hostname
+	if t.Alias != "" {
+		name = t.Alias
+	}
+
+	return fmt.Sprintf("%s%s (%s) - %s", ipPart, t.HwAddress, t.Vendor, tui.Bold(name))
 }
 
 func (t *Endpoint) OnMeta(meta map[string]string) {