diff --git a/public/scripts/browser-tabs-connector.js b/public/scripts/browser-tabs-connector.js
index 92cc89a..da9c43e 100644
--- a/public/scripts/browser-tabs-connector.js
+++ b/public/scripts/browser-tabs-connector.js
@@ -19,42 +19,42 @@ class BrowserTabsConnector {
     }
 
     static peerIsSameBrowser(peerId) {
-        let peerIdsBrowser = JSON.parse(localStorage.getItem("peer_ids_browser"));
+        let peerIdsBrowser = JSON.parse(localStorage.getItem('peer_ids_browser'));
         return peerIdsBrowser
             ? peerIdsBrowser.indexOf(peerId) !== -1
             : false;
     }
 
     static async addPeerIdToLocalStorage() {
-        const peerId = sessionStorage.getItem("peer_id");
+        const peerId = sessionStorage.getItem('peer_id');
         if (!peerId) return false;
 
         let peerIdsBrowser = [];
-        let peerIdsBrowserOld = JSON.parse(localStorage.getItem("peer_ids_browser"));
+        let peerIdsBrowserOld = JSON.parse(localStorage.getItem('peer_ids_browser'));
 
         if (peerIdsBrowserOld) peerIdsBrowser.push(...peerIdsBrowserOld);
         peerIdsBrowser.push(peerId);
         peerIdsBrowser = peerIdsBrowser.filter(onlyUnique);
-        localStorage.setItem("peer_ids_browser", JSON.stringify(peerIdsBrowser));
+        localStorage.setItem('peer_ids_browser', JSON.stringify(peerIdsBrowser));
 
         return peerIdsBrowser;
     }
 
     static async removePeerIdFromLocalStorage(peerId) {
-        let peerIdsBrowser = JSON.parse(localStorage.getItem("peer_ids_browser"));
+        let peerIdsBrowser = JSON.parse(localStorage.getItem('peer_ids_browser'));
         const index = peerIdsBrowser.indexOf(peerId);
         peerIdsBrowser.splice(index, 1);
-        localStorage.setItem("peer_ids_browser", JSON.stringify(peerIdsBrowser));
+        localStorage.setItem('peer_ids_browser', JSON.stringify(peerIdsBrowser));
         return peerId;
     }
 
 
     static async removeOtherPeerIdsFromLocalStorage() {
-        const peerId = sessionStorage.getItem("peer_id");
+        const peerId = sessionStorage.getItem('peer_id');
         if (!peerId) return false;
 
         let peerIdsBrowser = [peerId];
-        localStorage.setItem("peer_ids_browser", JSON.stringify(peerIdsBrowser));
+        localStorage.setItem('peer_ids_browser', JSON.stringify(peerIdsBrowser));
         return peerIdsBrowser;
     }
 }
\ No newline at end of file
diff --git a/public/scripts/localization.js b/public/scripts/localization.js
index 405bc2e..c018703 100644
--- a/public/scripts/localization.js
+++ b/public/scripts/localization.js
@@ -9,7 +9,7 @@ class Localization {
 
         Localization.systemLocale = Localization.getSupportedOrDefault(navigator.languages);
 
-        let storedLanguageCode = localStorage.getItem("language-code");
+        let storedLanguageCode = localStorage.getItem('language_code');
 
         Localization.initialLocale = storedLanguageCode && Localization.isSupported(storedLanguageCode)
             ? storedLanguageCode
@@ -82,7 +82,7 @@ class Localization {
     }
 
     static isSystemLocale() {
-        return !localStorage.getItem('language-code');
+        return !localStorage.getItem('language_code');
     }
 
     static async fetchTranslationsFor(newLocale) {
diff --git a/public/scripts/persistent-storage.js b/public/scripts/persistent-storage.js
index 1e98e33..c3ff869 100644
--- a/public/scripts/persistent-storage.js
+++ b/public/scripts/persistent-storage.js
@@ -4,7 +4,7 @@ class PersistentStorage {
             PersistentStorage.logBrowserNotCapable();
             return;
         }
-        const DBOpenRequest = window.indexedDB.open('pairdrop_store', 4);
+        const DBOpenRequest = window.indexedDB.open('pairdrop_store', 5);
         DBOpenRequest.onerror = e => {
             PersistentStorage.logBrowserNotCapable();
             console.log('Error initializing database: ');
@@ -13,7 +13,7 @@ class PersistentStorage {
         DBOpenRequest.onsuccess = _ => {
             console.log('Database initialised.');
         };
-        DBOpenRequest.onupgradeneeded = e => {
+        DBOpenRequest.onupgradeneeded = async e => {
             const db = e.target.result;
             const txn = e.target.transaction;
 
@@ -42,6 +42,14 @@ class PersistentStorage {
                 roomSecretsObjectStore4.createIndex('display_name', 'display_name');
                 roomSecretsObjectStore4.createIndex('auto_accept', 'auto_accept');
             }
+            if (e.oldVersion <= 4) {
+                // migrate to v5
+                const editedDisplayNameOld = await PersistentStorage.get('editedDisplayName');
+                if (editedDisplayNameOld) {
+                    await PersistentStorage.set('edited_display_name', editedDisplayNameOld);
+                    await PersistentStorage.delete('editedDisplayName');
+                }
+            }
         }
     }
 
diff --git a/public/scripts/ui-main.js b/public/scripts/ui-main.js
index 283eb7f..aa428b2 100644
--- a/public/scripts/ui-main.js
+++ b/public/scripts/ui-main.js
@@ -184,13 +184,13 @@ class FooterUI {
         if (newDisplayName === savedDisplayName) return;
 
         if (newDisplayName) {
-            PersistentStorage.set('editedDisplayName', newDisplayName)
+            PersistentStorage.set('edited_display_name', newDisplayName)
                 .then(_ => {
                     Events.fire('notify-user', Localization.getTranslation("notifications.display-name-changed-permanently"));
                 })
                 .catch(_ => {
                     console.log("This browser does not support IndexedDB. Use localStorage instead.");
-                    localStorage.setItem('editedDisplayName', newDisplayName);
+                    localStorage.setItem('edited_display_name', newDisplayName);
                     Events.fire('notify-user', Localization.getTranslation("notifications.display-name-changed-temporarily"));
                 })
                 .finally(() => {
@@ -199,10 +199,10 @@ class FooterUI {
                 });
         }
         else {
-            PersistentStorage.delete('editedDisplayName')
+            PersistentStorage.delete('edited_display_name')
                 .catch(_ => {
                     console.log("This browser does not support IndexedDB. Use localStorage instead.")
-                    localStorage.removeItem('editedDisplayName');
+                    localStorage.removeItem('edited_display_name');
                 })
                 .finally(() => {
                     Events.fire('notify-user', Localization.getTranslation("notifications.display-name-random-again"));
@@ -214,13 +214,13 @@ class FooterUI {
 
     _getSavedDisplayName() {
         return new Promise((resolve) => {
-            PersistentStorage.get('editedDisplayName')
+            PersistentStorage.get('edited_display_name')
                 .then(displayName => {
                     if (!displayName) displayName = "";
                     resolve(displayName);
                 })
                 .catch(_ => {
-                    let displayName = localStorage.getItem('editedDisplayName');
+                    let displayName = localStorage.getItem('edited_display_name');
                     if (!displayName) displayName = "";
                     resolve(displayName);
                 })
diff --git a/public/scripts/ui.js b/public/scripts/ui.js
index 6ff3a4c..6bf85b6 100644
--- a/public/scripts/ui.js
+++ b/public/scripts/ui.js
@@ -782,10 +782,10 @@ class LanguageSelectDialog extends Dialog {
         let languageCode = e.target.value;
 
         if (languageCode) {
-            localStorage.setItem('language-code', languageCode);
+            localStorage.setItem('language_code', languageCode);
         }
         else {
-            localStorage.removeItem('language-code');
+            localStorage.removeItem('language_code');
         }
 
         Localization.setTranslation(languageCode)
@@ -2052,7 +2052,7 @@ class ShareTextDialog extends Dialog {
         this.$approveMsgBtn.addEventListener('click', _ => this._approveShareText());
 
         // Only show this per default if user sets checkmark
-        this.$checkbox.checked = localStorage.getItem("approve_share_text")
+        this.$checkbox.checked = localStorage.getItem('approve-share-text')
             ? ShareTextDialog.isApproveShareTextSet()
             : false;
 
@@ -2065,11 +2065,11 @@ class ShareTextDialog extends Dialog {
     }
 
     static isApproveShareTextSet() {
-        return localStorage.getItem("approve_share_text") === "true";
+        return localStorage.getItem('approve-share-text') === "true";
     }
 
     _setCheckboxValueToLocalStorage() {
-        localStorage.setItem("approve_share_text", this.$checkbox.checked ? "true" : "false");
+        localStorage.setItem('approve-share-text', this.$checkbox.checked ? "true" : "false");
     }
 
     _onKeyDown(e) {
diff --git a/server/peer.js b/server/peer.js
index 70e87b2..33c99c6 100644
--- a/server/peer.js
+++ b/server/peer.js
@@ -124,8 +124,8 @@ export default class Peer {
 
     _setPeerId(request) {
         const searchParams = new URL(request.url, "http://server").searchParams;
-        let peerId = searchParams.get("peer_id");
-        let peerIdHash = searchParams.get("peer_id_hash");
+        let peerId = searchParams.get('peer_id');
+        let peerIdHash = searchParams.get('peer_id_hash');
         if (peerId && Peer.isValidUuid(peerId) && this.isPeerIdHashValid(peerId, peerIdHash)) {
             this.id = peerId;
         } else {
@@ -135,7 +135,7 @@ export default class Peer {
 
     _setRtcSupported(request) {
         const searchParams = new URL(request.url, "http://server").searchParams;
-        this.rtcSupported = searchParams.get("webrtc_supported") === "true";
+        this.rtcSupported = searchParams.get('webrtc_supported') === "true";
     }
 
     _setName(req) {