diff --git a/pkg/listeners/http/http.go b/pkg/listeners/http/http.go
index 13e43609..6f3a7cc7 100644
--- a/pkg/listeners/http/http.go
+++ b/pkg/listeners/http/http.go
@@ -34,7 +34,7 @@ import (
 	"github.com/google/uuid"
 
 	// Merlin Message
-	messages "github.com/Ne0nd0g/merlin-message"
+	"github.com/Ne0nd0g/merlin-message"
 
 	// Merlin
 	"github.com/Ne0nd0g/merlin/v2/pkg/authenticators"
diff --git a/pkg/listeners/smb/smb.go b/pkg/listeners/smb/smb.go
index c82e52fb..0a6c941c 100644
--- a/pkg/listeners/smb/smb.go
+++ b/pkg/listeners/smb/smb.go
@@ -34,7 +34,7 @@ import (
 	"github.com/google/uuid"
 
 	// Merlin Message
-	messages "github.com/Ne0nd0g/merlin-message"
+	"github.com/Ne0nd0g/merlin-message"
 
 	// Internal
 	"github.com/Ne0nd0g/merlin/v2/pkg/authenticators"
diff --git a/pkg/listeners/tcp/tcp.go b/pkg/listeners/tcp/tcp.go
index a2c6fb31..90b74b21 100644
--- a/pkg/listeners/tcp/tcp.go
+++ b/pkg/listeners/tcp/tcp.go
@@ -37,7 +37,7 @@ import (
 	"github.com/google/uuid"
 
 	// Merlin Message
-	messages "github.com/Ne0nd0g/merlin-message"
+	"github.com/Ne0nd0g/merlin-message"
 
 	// Merlin
 	"github.com/Ne0nd0g/merlin/v2/pkg/authenticators"
diff --git a/pkg/listeners/udp/udp.go b/pkg/listeners/udp/udp.go
index 76cb5e04..9ed752a7 100644
--- a/pkg/listeners/udp/udp.go
+++ b/pkg/listeners/udp/udp.go
@@ -36,7 +36,7 @@ import (
 	"github.com/google/uuid"
 
 	// Merlin Message
-	messages "github.com/Ne0nd0g/merlin-message"
+	"github.com/Ne0nd0g/merlin-message"
 
 	// Merlin