diff --git a/server/server.go b/server/server.go
index fc00626..84b7a9f 100644
--- a/server/server.go
+++ b/server/server.go
@@ -444,9 +444,9 @@ func (s *Server) Publish(topic string, payload []byte, retain bool) error {
 // It provides a 'client' to which inline retained messages can be assigned.
 func (*inlineMessages) Info() events.Client {
 	return events.Client{
-		"inline",
-		"inline",
-		"inline",
+		ID:       "inline",
+		Remote:   "inline",
+		Listener: "inline",
 	}
 }
 
diff --git a/server/server_test.go b/server/server_test.go
index b9ec51d..37194e8 100644
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -210,7 +210,11 @@ func BenchmarkServerServe(b *testing.B) {
 
 func TestServerInlineInfo(t *testing.T) {
 	s := New()
-	require.Equal(t, events.Client{"inline", "inline", "inline"}, s.inline.Info())
+	require.Equal(t, events.Client{
+		ID:       "inline",
+		Remote:   "inline",
+		Listener: "inline",
+	}, s.inline.Info())
 }
 
 func TestServerEstablishConnectionOKCleanSession(t *testing.T) {