diff --git a/app/src/main/java/io/xpipe/app/ext/DataStoreProvider.java b/app/src/main/java/io/xpipe/app/ext/DataStoreProvider.java
index 0d7a5badd..2098d12a4 100644
--- a/app/src/main/java/io/xpipe/app/ext/DataStoreProvider.java
+++ b/app/src/main/java/io/xpipe/app/ext/DataStoreProvider.java
@@ -71,7 +71,7 @@ public interface DataStoreProvider {
         return null;
     }
 
-    default String browserDisplayName(DataStoreEntry entry) {
+    default String displayName(DataStoreEntry entry) {
         return entry.getName();
     }
 
diff --git a/app/src/main/java/io/xpipe/app/storage/DataStorage.java b/app/src/main/java/io/xpipe/app/storage/DataStorage.java
index 2b116e836..fb1b3eea1 100644
--- a/app/src/main/java/io/xpipe/app/storage/DataStorage.java
+++ b/app/src/main/java/io/xpipe/app/storage/DataStorage.java
@@ -879,7 +879,7 @@ public abstract class DataStorage {
             return "?";
         }
 
-        return entry.getProvider().browserDisplayName(entry);
+        return entry.getProvider().displayName(entry);
     }
 
     public Optional<DataStoreEntry> getStoreEntryIfPresent(UUID id) {
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptStore.java b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptStore.java
index 9cb2740c3..0c406c800 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptStore.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/script/ScriptStore.java
@@ -87,7 +87,7 @@ public abstract class ScriptStore extends JacksonizedValue implements DataStore,
             }
             return pc;
         } catch (StackOverflowError t) {
-            throw new RuntimeException("Unable to set up scripts. Is there a circular script dependency?", t);
+            throw ErrorEvent.expected(new RuntimeException("Unable to set up scripts. Is there a circular script dependency?", t));
         } catch (Throwable t) {
             throw new RuntimeException("Unable to set up scripts", t);
         }
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceStoreProvider.java
index d0a8093be..8a542168e 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceStoreProvider.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/service/AbstractServiceStoreProvider.java
@@ -23,7 +23,7 @@ import java.util.List;
 
 public abstract class AbstractServiceStoreProvider implements SingletonSessionStoreProvider, DataStoreProvider {
 
-    public String browserDisplayName(DataStoreEntry entry) {
+    public String displayName(DataStoreEntry entry) {
         AbstractServiceStore s = entry.getStore().asNeeded();
         return DataStorage.get().getStoreEntryDisplayName(s.getHost().get()) + " - Port " + s.getRemotePort();
     }
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/MappedServiceStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/service/MappedServiceStoreProvider.java
index ea5641424..66bbc3a43 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/service/MappedServiceStoreProvider.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/service/MappedServiceStoreProvider.java
@@ -10,7 +10,7 @@ import java.util.List;
 
 public class MappedServiceStoreProvider extends FixedServiceStoreProvider {
 
-    public String browserDisplayName(DataStoreEntry entry) {
+    public String displayName(DataStoreEntry entry) {
         MappedServiceStore s = entry.getStore().asNeeded();
         return DataStorage.get().getStoreEntryDisplayName(s.getHost().get()) + " - Port " + s.getContainerPort();
     }