diff --git a/.eslintignore b/.eslintignore
index 7575b319f..5ec61c91a 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -30,4 +30,4 @@ ts/**/*.js
 # Libloki specific files
 libloki/test/components.js
 libloki/modules/mnemonic.js
-loki-file-server/**
+session-file-server/**
diff --git a/.gitmodules b/.gitmodules
index e4b4af515..4b46b6302 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "loki-file-server"]
-	path = loki-file-server
-	url = https://github.com/neuroscr/loki-file-server/
+[submodule "session-file-server"]
+	path = session-file-server
+	url = https://github.com/loki-project/session-file-server/
diff --git a/.prettierignore b/.prettierignore
index 67f277d23..dbdc281c0 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -54,4 +54,4 @@ stylesheets/_intlTelInput.scss
 # Coverage
 coverage/**
 .nyc_output/**
-loki-file-server/**
+session-file-server/**
diff --git a/integration_test/common.js b/integration_test/common.js
index de265c1ba..1e8e95271 100644
--- a/integration_test/common.js
+++ b/integration_test/common.js
@@ -571,9 +571,9 @@ module.exports = {
 
   async startLocalFileServer() {
     if (!this.fileServer) {
-      // be sure to run `git submodule update --init && cd loki-file-server && yarn install; cd -`
+      // be sure to run `git submodule update --init && cd session-file-server && yarn install; cd -`
       // eslint-disable-next-line global-require
-      this.fileServer = require('../loki-file-server/app');
+      this.fileServer = require('../session-file-server/app');
     }
   },
 
diff --git a/loki-file-server b/loki-file-server
deleted file mode 160000
index 296899d56..000000000
--- a/loki-file-server
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 296899d562b871b806ef5b452dc001ed94d14a97
diff --git a/session-file-server b/session-file-server
new file mode 160000
index 000000000..b4e2f787f
--- /dev/null
+++ b/session-file-server
@@ -0,0 +1 @@
+Subproject commit b4e2f787f4b95592ad0d3bcc008dd01125385a3f