diff --git a/examples/sse-with-state/pages/index.go b/examples/sse-with-state/pages/index.go
index d6e2cf9..6992ffc 100644
--- a/examples/sse-with-state/pages/index.go
+++ b/examples/sse-with-state/pages/index.go
@@ -2,8 +2,8 @@ package pages
 
 import (
 	"fmt"
-	"github.com/maddalax/htmgo/extensions/ws/state"
-	"github.com/maddalax/htmgo/extensions/ws/ws"
+	"github.com/maddalax/htmgo/extensions/websocket/state"
+	"github.com/maddalax/htmgo/extensions/websocket/ws"
 	"github.com/maddalax/htmgo/framework/h"
 	"sse-with-state/partials"
 )
diff --git a/examples/sse-with-state/pages/root.go b/examples/sse-with-state/pages/root.go
index feb4d1a..edd844e 100644
--- a/examples/sse-with-state/pages/root.go
+++ b/examples/sse-with-state/pages/root.go
@@ -1,7 +1,7 @@
 package pages
 
 import (
-	"github.com/maddalax/htmgo/extensions/ws/state"
+	"github.com/maddalax/htmgo/extensions/websocket/state"
 	"github.com/maddalax/htmgo/framework/h"
 )
 
diff --git a/examples/sse-with-state/partials/index.go b/examples/sse-with-state/partials/index.go
index 908d96b..fcec0e8 100644
--- a/examples/sse-with-state/partials/index.go
+++ b/examples/sse-with-state/partials/index.go
@@ -1,8 +1,8 @@
 package partials
 
 import (
-	"github.com/maddalax/htmgo/extensions/ws/state"
-	"github.com/maddalax/htmgo/extensions/ws/ws"
+	"github.com/maddalax/htmgo/extensions/websocket/state"
+	"github.com/maddalax/htmgo/extensions/websocket/ws"
 	"github.com/maddalax/htmgo/framework/h"
 )
 
diff --git a/examples/sse-with-state/partials/repeater.go b/examples/sse-with-state/partials/repeater.go
index cf0a3a3..858bc70 100644
--- a/examples/sse-with-state/partials/repeater.go
+++ b/examples/sse-with-state/partials/repeater.go
@@ -2,7 +2,7 @@ package partials
 
 import (
 	"fmt"
-	"github.com/maddalax/htmgo/extensions/ws/ws"
+	"github.com/maddalax/htmgo/extensions/websocket/ws"
 	"github.com/maddalax/htmgo/framework/h"
 )
 
diff --git a/extensions/websocket/init.go b/extensions/websocket/init.go
index 3629917..4547b9e 100644
--- a/extensions/websocket/init.go
+++ b/extensions/websocket/init.go
@@ -1,8 +1,8 @@
 package websocket
 
 import (
-	"github.com/maddalax/htmgo/extensions/ws/internal/wsutil"
-	"github.com/maddalax/htmgo/extensions/ws/ws"
+	"github.com/maddalax/htmgo/extensions/websocket/internal/wsutil"
+	"github.com/maddalax/htmgo/extensions/websocket/ws"
 	"github.com/maddalax/htmgo/framework/h"
 	"github.com/maddalax/htmgo/framework/service"
 )
diff --git a/extensions/websocket/state/state.go b/extensions/websocket/state/state.go
index cee8c67..039e47b 100644
--- a/extensions/websocket/state/state.go
+++ b/extensions/websocket/state/state.go
@@ -2,7 +2,7 @@ package state
 
 import (
 	"fmt"
-	"github.com/maddalax/htmgo/extensions/ws/internal"
+	"github.com/maddalax/htmgo/extensions/websocket/internal"
 	"github.com/maddalax/htmgo/framework/h"
 	"github.com/puzpuzpuz/xsync/v3"
 )
diff --git a/extensions/websocket/ws/handler.go b/extensions/websocket/ws/handler.go
index cee718a..6ad056e 100644
--- a/extensions/websocket/ws/handler.go
+++ b/extensions/websocket/ws/handler.go
@@ -2,8 +2,8 @@ package ws
 
 import (
 	"fmt"
-	"github.com/maddalax/htmgo/extensions/ws/internal/wsutil"
-	"github.com/maddalax/htmgo/extensions/ws/state"
+	"github.com/maddalax/htmgo/extensions/websocket/internal/wsutil"
+	"github.com/maddalax/htmgo/extensions/websocket/state"
 	"sync"
 )
 
diff --git a/extensions/websocket/ws/listener.go b/extensions/websocket/ws/listener.go
index 30660ac..4d02d47 100644
--- a/extensions/websocket/ws/listener.go
+++ b/extensions/websocket/ws/listener.go
@@ -2,8 +2,8 @@ package ws
 
 import (
 	"fmt"
-	"github.com/maddalax/htmgo/extensions/ws/internal/wsutil"
-	"github.com/maddalax/htmgo/extensions/ws/state"
+	"github.com/maddalax/htmgo/extensions/websocket/internal/wsutil"
+	"github.com/maddalax/htmgo/extensions/websocket/state"
 	"github.com/maddalax/htmgo/framework/service"
 	"time"
 )
diff --git a/extensions/websocket/ws/register.go b/extensions/websocket/ws/register.go
index 61da8d7..222fa90 100644
--- a/extensions/websocket/ws/register.go
+++ b/extensions/websocket/ws/register.go
@@ -1,8 +1,8 @@
 package ws
 
 import (
-	"github.com/maddalax/htmgo/extensions/ws/internal/wsutil"
-	"github.com/maddalax/htmgo/extensions/ws/state"
+	"github.com/maddalax/htmgo/extensions/websocket/internal/wsutil"
+	"github.com/maddalax/htmgo/extensions/websocket/state"
 	"github.com/maddalax/htmgo/framework/h"
 	"github.com/puzpuzpuz/xsync/v3"
 	"sync"