diff --git a/internal/websocket/handler/handler.go b/internal/websocket/handler/handler.go
index 34f28773..fea76f45 100644
--- a/internal/websocket/handler/handler.go
+++ b/internal/websocket/handler/handler.go
@@ -109,13 +109,13 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) error {
 
 	// Screen Events
 	case event.SCREEN_RESOLUTION:
-		err = h.screenResolution(session)
+		err = h.screenSize(session)
 	case event.SCREEN_CONFIGURATIONS:
 		err = h.screenConfigurations(session)
 	case event.SCREEN_SET:
 		payload := &message.ScreenResolution{}
 		err = utils.Unmarshal(payload, raw, func() error {
-			return h.screenSet(session, payload)
+			return h.screenSizeChange(session, payload)
 		})
 
 	// Boradcast Events
diff --git a/internal/websocket/handler/screen.go b/internal/websocket/handler/screen.go
index 906c7bb8..ebfdf1b4 100644
--- a/internal/websocket/handler/screen.go
+++ b/internal/websocket/handler/screen.go
@@ -6,7 +6,7 @@ import (
 	"demodesk/neko/internal/types/message"
 )
 
-func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.ScreenResolution) error {
+func (h *MessageHandlerCtx) screenSizeChange(session types.Session, payload *message.ScreenResolution) error {
 	if !session.Admin() {
 		h.logger.Debug().Msg("user not admin")
 		return nil
@@ -27,7 +27,7 @@ func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.Sc
 		}, nil)
 }
 
-func (h *MessageHandlerCtx) screenResolution(session types.Session) error {
+func (h *MessageHandlerCtx) screenSize(session types.Session) error {
 	size := h.desktop.GetScreenSize()
 	if size == nil {
 		h.logger.Debug().Msg("could not get screen size")
diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go
index 253269b8..85ff51c6 100644
--- a/internal/websocket/handler/session.go
+++ b/internal/websocket/handler/session.go
@@ -47,8 +47,8 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error {
 		return err
 	}
 
-	// send current screen resolution
-	if err := h.screenResolution(session); err != nil {
+	// send current screen size
+	if err := h.screenSize(session); err != nil {
 		return err
 	}