diff --git a/cmd/server/main.go b/cmd/server/main.go
index 5d0b3a0..46dc46f 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -21,14 +21,14 @@ func Start() {
 	showVersionFlag := flag.Bool("version", false, "Output version")
 	flag.Parse()
 
-	shared.Message.ProtocolVersion = strings.Split(metadata.GoTomatoVersion, ".")[0]
+	shared.Message.GoTomatoVersion = strings.Split(metadata.GoTomatoVersion, ".")[0]
 	if *showVersionFlag {
 		fmt.Printf("App-Version: %s\n", metadata.GoTomatoVersion)
-		fmt.Printf("Protocol-Version: %s\n", shared.Message.ProtocolVersion)
+		fmt.Printf("Protocol-Version: %s\n", shared.Message.GoTomatoVersion)
 		os.Exit(0)
 	}
 
-	serverConfig := models.ServerConfig{
+	serverConfig := models.GoTomatoServerConfig{
 		ListenAddress: *listenAddress,
 		ListenPort:    *listenPort,
 	}
diff --git a/internal/pomodoro/pomodoro.go b/internal/pomodoro/pomodoro.go
index be39e6e..5f0af99 100644
--- a/internal/pomodoro/pomodoro.go
+++ b/internal/pomodoro/pomodoro.go
@@ -29,7 +29,7 @@ func RunPomodoro() {
 	shared.Message.Paused = false
 	mu.Unlock()
 
-	pomodoroConfig := shared.Message.Settings
+	pomodoroConfig := shared.Message.PomodoroSettings
 
 	for session := 1; session <= pomodoroConfig.Sessions; session++ {
 		timer = timer.Init()
@@ -66,7 +66,7 @@ func RunPomodoro() {
 
 	shared.Message.Mode = "Idle"
 	shared.Message.Session = 0
-	shared.Message.TimeLeft = shared.Message.Settings.Work
+	shared.Message.TimeLeft = shared.Message.PomodoroSettings.Work
 }
 
 func ResetPomodoro() {
diff --git a/internal/shared/configDefaults.go b/internal/shared/configDefaults.go
index a3840e0..b4b82ff 100644
--- a/internal/shared/configDefaults.go
+++ b/internal/shared/configDefaults.go
@@ -4,12 +4,12 @@ import (
 	"git.smsvc.net/pomodoro/GoTomato/pkg/models"
 )
 
-var DefaultServerConfig = models.ServerConfig{
+var DefaultServerConfig = models.GoTomatoServerConfig{
 	ListenAddress: "0.0.0.0",
 	ListenPort:    8080,
 }
 
-var DefaultPomodoroConfig = models.PomodoroConfig{
+var DefaultPomodoroConfig = models.GoTomatoPomodoroConfig{
 	Work:       25 * 60,
 	ShortBreak: 5 * 60,
 	LongBreak:  15 * 60,
diff --git a/internal/shared/state.go b/internal/shared/state.go
index 1f8c670..04c6949 100644
--- a/internal/shared/state.go
+++ b/internal/shared/state.go
@@ -5,12 +5,12 @@ import (
 )
 
 var Message = models.ServerMessage{
-	Mode:     "Idle",
-	Settings: DefaultPomodoroConfig,
-	Session:  0,
-	TimeLeft: DefaultPomodoroConfig.Work,
-	Ongoing:  false,
-	Paused:   false,
+	Mode:             "Idle",
+	PomodoroSettings: DefaultPomodoroConfig,
+	Session:          0,
+	TimeLeft:         DefaultPomodoroConfig.Work,
+	Ongoing:          false,
+	Paused:           false,
 }
 
 var PomodoroPassword string
diff --git a/internal/websocket/client_commands.go b/internal/websocket/client_commands.go
index cafcd67..4a0cbd1 100644
--- a/internal/websocket/client_commands.go
+++ b/internal/websocket/client_commands.go
@@ -49,9 +49,9 @@ func handleClientCommands(ws *websocket.Conn) {
 				}
 			case "updateSettings":
 				if !pomodoro.IsPomodoroOngoing() {
-					if clientCommand.Settings != (models.PomodoroConfig{}) {
-						shared.Message.Settings = clientCommand.Settings
-						shared.Message.TimeLeft = clientCommand.Settings.Work
+					if clientCommand.PomodoroSettings != (models.GoTomatoPomodoroConfig{}) {
+						shared.Message.PomodoroSettings = clientCommand.PomodoroSettings
+						shared.Message.TimeLeft = clientCommand.PomodoroSettings.Work
 					}
 
 				}
diff --git a/pkg/models/client.go b/pkg/models/client.go
index 8116d8b..6862cb1 100644
--- a/pkg/models/client.go
+++ b/pkg/models/client.go
@@ -8,9 +8,9 @@ import (
 
 // ClientCommand represents a command from the client (start/stop).
 type ClientCommand struct {
-	Command  string         `json:"command"`  // comman send to the server
-	Password string         `json:"password"` // pomodoro control password
-	Settings PomodoroConfig `json:"settings"` // pomodoro config
+	Command          string                 `json:"command"`  // comman send to the server
+	Password         string                 `json:"password"` // pomodoro control password
+	PomodoroSettings GoTomatoPomodoroConfig `json:"settings"` // pomodoro config
 }
 
 type Client struct {
diff --git a/pkg/models/config.go b/pkg/models/config.go
index 50c7923..af51d23 100644
--- a/pkg/models/config.go
+++ b/pkg/models/config.go
@@ -1,13 +1,13 @@
 package models
 
-type PomodoroConfig struct {
+type GoTomatoPomodoroConfig struct {
 	Work       int `json:"work"`       // Length of work sessions in seconds
 	ShortBreak int `json:"shortBreak"` // Length of short break in seconds
 	LongBreak  int `json:"longBreak"`  // Length if ling break in seconds
 	Sessions   int `json:"sessions"`   // Number of total sessions
 }
 
-type ServerConfig struct {
+type GoTomatoServerConfig struct {
 	ListenAddress string `json:"listenAddress"` // Server listen address
 	ListenPort    int    `json:"listenPort"`    // Server listen port
 }
diff --git a/pkg/models/server.go b/pkg/models/server.go
index 092c557..c95d5f2 100644
--- a/pkg/models/server.go
+++ b/pkg/models/server.go
@@ -2,11 +2,11 @@ package models
 
 // ServerMessage represents the data sent to the client via WebSocket.
 type ServerMessage struct {
-	Mode            string         `json:"mode"`      // "Idle", "Work", "ShortBreak", "LongBreak" or "End"
-	Settings        PomodoroConfig `json:"settings"`  // The currrent pomodoro settings
-	Session         int            `json:"session"`   // Current session number
-	TimeLeft        int            `json:"time_left"` // Remaining time in seconds
-	Ongoing         bool           `json:"ongoing"`   // Ongoing pomodoro
-	Paused          bool           `json:"paused"`    // Is timer paused
-	ProtocolVersion string         `json:"version"`   // Version of the server
+	Mode             string                 `json:"mode"`      // "Idle", "Work", "ShortBreak", "LongBreak" or "End"
+	PomodoroSettings GoTomatoPomodoroConfig `json:"settings"`  // The currrent pomodoro settings
+	Session          int                    `json:"session"`   // Current session number
+	TimeLeft         int                    `json:"time_left"` // Remaining time in seconds
+	Ongoing          bool                   `json:"ongoing"`   // Ongoing pomodoro
+	Paused           bool                   `json:"paused"`    // Is timer paused
+	GoTomatoVersion  string                 `json:"version"`   // Version of the server
 }