diff --git a/go.mod b/go.mod
index 6c445e6..a112752 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module clickandjoin.app/managementsystem
 go 1.18
 
 require (
-	git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.71
+	git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.77
 	github.com/gocql/gocql v0.0.0-20211015133455-b225f9b53fa1
 	github.com/gofiber/fiber/v2 v2.42.0
 	github.com/gofiber/websocket/v2 v2.1.4
diff --git a/go.sum b/go.sum
index 4c600b4..f10460d 100644
--- a/go.sum
+++ b/go.sum
@@ -12,6 +12,8 @@ git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.70 h1:9/H8LSk+MK6Yuh
 git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.70/go.mod h1:rnEM9rcZy2dg4SaDCGmSf34fp7ECzdyxxnRut2HBmrs=
 git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.71 h1:FPBLRwAiWf/mvvO7rUZIfWXyyoHE3mK04iHFf8Pvbv0=
 git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.71/go.mod h1:rnEM9rcZy2dg4SaDCGmSf34fp7ECzdyxxnRut2HBmrs=
+git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.77 h1:GF5H+RSVubG9uP6/FF5llP0tKA+nm8C4gN3RDwhIW6A=
+git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.77/go.mod h1:rnEM9rcZy2dg4SaDCGmSf34fp7ECzdyxxnRut2HBmrs=
 github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
 github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 h1:mXoPYz/Ul5HYEDvkta6I8/rnYM5gSdSV2tJ6XbZuEtY=
diff --git a/modules/structs/chat.go b/modules/structs/room.go
similarity index 53%
rename from modules/structs/chat.go
rename to modules/structs/room.go
index c9db63c..64475ee 100644
--- a/modules/structs/chat.go
+++ b/modules/structs/room.go
@@ -2,7 +2,7 @@ package structs
 
 import "git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper/dbstructs"
 
-// swagger:model ChatsResponse
-type ChatsResponse struct {
-	Chats []dbstructs.Chat
+// swagger:model RoomsResponse
+type RoomsResponse struct {
+	Rooms []dbstructs.Room
 }
diff --git a/modules/structs/stats.go b/modules/structs/stats.go
index 1ee7a4d..175dbb0 100644
--- a/modules/structs/stats.go
+++ b/modules/structs/stats.go
@@ -4,7 +4,7 @@ package structs
 type StatsResponse struct {
 	Users               int
 	UserSessions        int
-	Chats               int
+	Rooms               int
 	WebSocketSessions   int
 	UserSignUpProcesses int
 	UserPrivacySettings int
diff --git a/routers/api/v1/chats/chats.go b/routers/api/v1/rooms/rooms.go
similarity index 52%
rename from routers/api/v1/chats/chats.go
rename to routers/api/v1/rooms/rooms.go
index 02b234f..7aafd68 100644
--- a/routers/api/v1/chats/chats.go
+++ b/routers/api/v1/rooms/rooms.go
@@ -1,4 +1,4 @@
-package chats
+package rooms
 
 import (
 	"clickandjoin.app/managementsystem/modules/scylladb"
@@ -8,10 +8,10 @@ import (
 	"github.com/gofiber/fiber/v2"
 )
 
-func GetAllChats(c *fiber.Ctx) error {
-	// swagger:operation GET /chats chats chatsGetAllChats
+func GetAllRooms(c *fiber.Ctx) error {
+	// swagger:operation GET /rooms rooms roomsGetAllRooms
 	// ---
-	// summary: List of chats
+	// summary: List of rooms
 	// consumes:
 	// - application/json
 	// produces:
@@ -19,17 +19,17 @@ func GetAllChats(c *fiber.Ctx) error {
 	// responses:
 	//  '200':
 	//    schema:
-	//      "$ref": "#/definitions/ChatsResponse"
+	//      "$ref": "#/definitions/RoomsResponse"
 	//  '500':
 	//    description: Internal server error
 
-	var chats []dbstructs.Chat
+	var rooms []dbstructs.Room
 
-	q := scylladb.Session.Query(gocnjhelper.DbMChats.SelectAll())
+	q := scylladb.Session.Query(gocnjhelper.DbMRooms.SelectAll())
 
-	if err := q.SelectRelease(&chats); err != nil {
-		gocnjhelper.LogErrorf("Failed to get chats, err: %s", err)
+	if err := q.SelectRelease(&rooms); err != nil {
+		gocnjhelper.LogErrorf("Failed to get rooms, err: %s", err)
 	}
 
-	return c.JSON(structs.ChatsResponse{Chats: chats})
+	return c.JSON(structs.RoomsResponse{Rooms: rooms})
 }
diff --git a/routers/api/v1/stats/stats.go b/routers/api/v1/stats/stats.go
index b05bf4e..251f832 100644
--- a/routers/api/v1/stats/stats.go
+++ b/routers/api/v1/stats/stats.go
@@ -33,8 +33,8 @@ func GetStats(c *fiber.Ctx) error {
 		stats.UserSessions = count
 	}
 
-	if count, err := getCount(gocnjhelper.DbMChats.Name()); err == nil {
-		stats.Chats = count
+	if count, err := getCount(gocnjhelper.DbMRooms.Name()); err == nil {
+		stats.Rooms = count
 	}
 
 	if count, err := getCount(gocnjhelper.DbMWebSocketSessions.Name()); err == nil {
diff --git a/routers/router/router.go b/routers/router/router.go
index 51f96d6..b7c38f9 100644
--- a/routers/router/router.go
+++ b/routers/router/router.go
@@ -2,7 +2,7 @@ package router
 
 import (
 	"clickandjoin.app/managementsystem/modules/config"
-	"clickandjoin.app/managementsystem/routers/api/v1/chats"
+	"clickandjoin.app/managementsystem/routers/api/v1/rooms"
 	"clickandjoin.app/managementsystem/routers/api/v1/stats"
 	"clickandjoin.app/managementsystem/routers/api/v1/user"
 	"clickandjoin.app/managementsystem/routers/api/v1/users"
@@ -26,8 +26,8 @@ func SetupRoutes(app *fiber.App) {
 	wss := v1.Group("/wssessions")
 	wss.Get("/", ApiKeyValidation, wssessions.GetAllWsSessions)
 
-	c := v1.Group("/chats")
-	c.Get("/", ApiKeyValidation, chats.GetAllChats)
+	c := v1.Group("/rooms")
+	c.Get("/", ApiKeyValidation, rooms.GetAllRooms)
 
 	s := v1.Group("/stats")
 	s.Get("/", ApiKeyValidation, stats.GetStats)