diff --git a/caplets/ap.cap b/caplets/ap.cap
index b750c07d..d356b5e1 100644
--- a/caplets/ap.cap
+++ b/caplets/ap.cap
@@ -7,7 +7,7 @@ set net.sniff.filter not arp and not udp port 53
 events.stream off
 events.clear 
 
-set events.stream.filter target.
+set events.stream.filter endpoint.
 events.stream on
 
 api.rest on
diff --git a/modules/events_view.go b/modules/events_view.go
index aeac1761..587300f2 100644
--- a/modules/events_view.go
+++ b/modules/events_view.go
@@ -20,7 +20,7 @@ func (s EventsStream) viewLogEvent(e session.Event) {
 		e.Data.(session.LogMessage).Message)
 }
 
-func (s EventsStream) viewTargetEvent(e session.Event) {
+func (s EventsStream) viewEndpointEvent(e session.Event) {
 	t := e.Data.(*net.Endpoint)
 	fmt.Printf("[%s] [%s] %s\n",
 		e.Time.Format(eventTimeFormat),
@@ -47,8 +47,8 @@ func (s *EventsStream) View(e session.Event, refresh bool) {
 	if s.filter == "" || strings.Contains(e.Tag, s.filter) {
 		if e.Tag == "sys.log" {
 			s.viewLogEvent(e)
-		} else if strings.HasPrefix(e.Tag, "target.") {
-			s.viewTargetEvent(e)
+		} else if strings.HasPrefix(e.Tag, "endpoint.") {
+			s.viewEndpointEvent(e)
 		} else if strings.HasPrefix(e.Tag, "mod.") {
 			s.viewModuleEvent(e)
 		} else if strings.HasPrefix(e.Tag, "net.sniff.") {
diff --git a/session/targets.go b/session/targets.go
index b4326df3..9b202888 100644
--- a/session/targets.go
+++ b/session/targets.go
@@ -128,7 +128,7 @@ func (tp *Targets) Remove(ip, mac string) {
 	if e, found := tp.Targets[mac]; found {
 		tp.TTL[mac]--
 		if tp.TTL[mac] == 0 {
-			tp.Session.Events.Add("target.lost", e)
+			tp.Session.Events.Add("endpoint.lost", e)
 			delete(tp.Targets, mac)
 			delete(tp.TTL, mac)
 		}
@@ -171,7 +171,7 @@ func (tp *Targets) AddIfNew(ip, mac string) *net.Endpoint {
 
 	e := net.NewEndpoint(ip, mac)
 	e.ResolvedCallback = func(e *net.Endpoint) {
-		tp.Session.Events.Add("target.resolved", e)
+		tp.Session.Events.Add("endpoint.resolved", e)
 	}
 
 	if alias, found := tp.Aliases[mac]; found {
@@ -181,7 +181,7 @@ func (tp *Targets) AddIfNew(ip, mac string) *net.Endpoint {
 	tp.Targets[mac] = e
 	tp.TTL[mac] = TargetsDefaultTTL
 
-	tp.Session.Events.Add("target.new", e)
+	tp.Session.Events.Add("endpoint.new", e)
 
 	return nil
 }