diff --git a/src/lib/stores.js b/src/lib/stores.js
index 583a339..6df6f81 100644
--- a/src/lib/stores.js
+++ b/src/lib/stores.js
@@ -8,7 +8,7 @@ export const urls = {
     register: "/register"
 }
 export const alerts = writable([])
-export const globals = writable({
+export const globalstore = writable({
     server: {
         url: '',
         caps: {
@@ -19,4 +19,4 @@ export const globals = writable({
     }
 });
 
-export const sessionvars = localStorageStore('vars', [], {storage: 'session'})
\ No newline at end of file
+export const sessionstore = localStorageStore('vars', [], {storage: 'session'})
\ No newline at end of file
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index f817c8d..3b0f32e 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -7,7 +7,7 @@
 	// Most of your app wide CSS should be put in this file
 	import '../app.postcss';
 
-    import {alerts, globals} from "$lib/stores.js";
+    import {alerts, globalstore} from "$lib/stores.js";
     import { autoModeWatcher } from '@skeletonlabs/skeleton';
 
     let alertsvar;
@@ -23,7 +23,7 @@
     alerts.subscribe((value) => {
         alertsvar = value;
     });
-    globals.subscribe(value => {
+    globalstore.subscribe(value => {
         globalvars = value;
     });
 </script>
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 0a76f4c..d3f82e4 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,9 +1,9 @@
 <script>
-    import {globals} from "$lib/stores.js";
+    import {globalstore} from "$lib/stores.js";
 
     let globalvars;
 
-    globals.subscribe(value => {
+    globalstore.subscribe(value => {
         globalvars = value;
     });
 </script>
diff --git a/src/routes/account/+layout.svelte b/src/routes/account/+layout.svelte
index bd64867..5686997 100644
--- a/src/routes/account/+layout.svelte
+++ b/src/routes/account/+layout.svelte
@@ -36,7 +36,7 @@
 </style>
 
 <script lang="js">
-    import {alerts, globals} from "$lib/stores.js";
+    import {alerts, globalstore} from "$lib/stores.js";
 
     let alertsvar;
     let globalvars;
@@ -52,7 +52,7 @@
         alertsvar = value;
     });
 
-    globals.subscribe(value => {
+    globalstore.subscribe(value => {
         globalvars = value;
     });
 </script>
\ No newline at end of file
diff --git a/src/routes/account/login/+page.svelte b/src/routes/account/login/+page.svelte
index 1a42b02..16c56a5 100644
--- a/src/routes/account/login/+page.svelte
+++ b/src/routes/account/login/+page.svelte
@@ -8,11 +8,11 @@
 <script>
     import Server from "./Server.svelte";
     import Login from "./Login.svelte";
-    import {globals} from "$lib/stores.js";
+    import {globalstore} from "$lib/stores.js";
 
     let globalvars;
 
-    globals.subscribe(value => {
+    globalstore.subscribe(value => {
         globalvars = value;
     });
 </script>
\ No newline at end of file
diff --git a/src/routes/account/login/Login.svelte b/src/routes/account/login/Login.svelte
index 87c7328..bdc4cb2 100644
--- a/src/routes/account/login/Login.svelte
+++ b/src/routes/account/login/Login.svelte
@@ -28,8 +28,7 @@
 </style>
 
 <script lang="js">
-    import { urls, alerts, globals, sessionvars } from "$lib/stores.js";
-    import { browser } from "$app/environment";
+    import { urls, alerts, globalstore, sessionstore } from "$lib/stores.js";
     import { requestor, setBaseUrl } from "../../../serverrequest.js";
     import { goto } from "$app/navigation";
 
@@ -38,14 +37,14 @@
 
     let globalvars;
 
-    globals.subscribe(value => {
+    globalstore.subscribe(value => {
         globalvars = value;
     });
 
-    let sessions;
+    let sessionvars;
 
-    sessionvars.subscribe(value => {
-        sessions = value;
+    sessionstore.subscribe(value => {
+        sessionvars = value;
     });
 
     setBaseUrl(globalvars.server.url);
@@ -61,8 +60,8 @@
                 throw(message)
             }
             if(!responsedata.success) return alerts.update(data => [...data, {text: 'Login failed: ' + responsedata.message , class: 'error'}]);
-            globals.update((globalobj) => ({ ...globalobj, ...{user: responsedata.user }}));
-            sessions.update((sessionobj) => ({ ...sessionobj, ...{authorization: responsedata.authorization }}));
+            globalstore.update((globalobj) => ({ ...globalobj, ...{user: responsedata.user }}));
+            sessionstore.update((sessionobj) => ({ ...sessionobj, ...{authorization: responsedata.authorization }}));
             goto('/')
         } catch (error) {
             return alerts.update(data => [...data, {text: error, class: 'error'}]);
@@ -70,9 +69,9 @@
     }
 
     function handleGoToServerSelect() {
-        if(typeof sessions.serverurl !== 'undefined') {
-            sessionvars.update(data => { delete data.serverurl; return data;});
-            globals.update((data) => ({ ...data, ...{server: {url: '', caps: {}}} }));
+        if(typeof sessionstore.serverurl !== 'undefined') {
+            sessionstore.update(data => { delete data.serverurl; return data;});
+            globalstore.update((data) => ({ ...data, ...{server: {url: '', caps: {}}} }));
         }
     }
 </script>
\ No newline at end of file
diff --git a/src/routes/account/login/Server.svelte b/src/routes/account/login/Server.svelte
index f0c28ae..1595a37 100644
--- a/src/routes/account/login/Server.svelte
+++ b/src/routes/account/login/Server.svelte
@@ -16,21 +16,21 @@
 </style>
 
 <script lang="js">
-    import {urls, alerts, globals, sessionvars } from "$lib/stores.js";
+    import {urls, alerts, globalstore, sessionstore } from "$lib/stores.js";
     import {onMount} from 'svelte';
     import { requestor, setBaseUrl } from "../../../serverrequest.js";
 
     var loginserver;
 
-    let sessions;
+    let sessionvars;
 
-    sessionvars.subscribe(value => {
-        sessions = value;
+    sessionstore.subscribe(value => {
+        sessionvars = value;
     });
 
     onMount(() => {
-        if(typeof sessions.serverurl !== 'undefined') {
-            loginserver = sessions.serverurl;
+        if(typeof sessionvars.serverurl !== 'undefined') {
+            loginserver = sessionvars.serverurl;
             handleSelectServer();
         }
     })
@@ -51,8 +51,8 @@
             let response = await requestor.get(urls.capabilities);
             let caps = JSON.parse(response.data);
             if(!caps.login) return alerts.update(data => [...data, {text: loginserver + ' is unavailable for login currently', class: 'error'}]);
-            globals.update(data => ({ ...data, ...{server: {url: loginserver, caps: caps}}}));
-            sessionvars.update((sessionobj) => ({ ...sessionobj, ...{serverurl: loginserver }}));
+            globalstore.update(data => ({ ...data, ...{server: {url: loginserver, caps: caps}}}));
+            sessionstore.update((data) => ({ ...data, ...{serverurl: loginserver }}));
         } catch (error) {
             return alerts.update(data => [...data, {text: loginserver + ' is not a Blackbird Chess server', class: 'error'}]);
         }
diff --git a/src/routes/account/register/+page.svelte b/src/routes/account/register/+page.svelte
index 7c1246f..54813dd 100644
--- a/src/routes/account/register/+page.svelte
+++ b/src/routes/account/register/+page.svelte
@@ -29,7 +29,7 @@
 </style>
 
 <script lang="js">
-    import {alerts, globals, urls} from "$lib/stores.js";
+    import {alerts, globalstore, urls} from "$lib/stores.js";
     import { requestor, setBaseUrl } from "../../../serverrequest.js";
     import {onMount} from "svelte";
     import {goto} from "$app/navigation";
@@ -40,20 +40,20 @@
     let password = '';
     let password2 = '';
 
-    globals.subscribe(value => {
+    globalstore.subscribe(value => {
         globalvars = value;
     });
 
     setBaseUrl(globalvars.server.url);
 
     onMount(async () => {
-        if(globalvars.server.url == '' ) {
+        if(globalstore.server.url == '' ) {
             alerts.update(data => data.filter(alert => alert.type !== 'noregister'));
             alerts.update(data => [...data,{text: 'You cannot register without selecting a server', type: 'noregister', class: 'error'}]);
             goto('/account/login');
             return;
         }
-        if(globalvars.server.caps.register == false ) {
+        if(globalstore.server.caps.register == false ) {
             alerts.update(data => data.filter(alert => alert.type !== 'noregister'));
             alerts.update(data => [...data,{text: 'You cannot register on this server', type: 'noregister', class: 'error'}]);
         }