diff --git a/Backend/Api/Auth/AddProfileImage.go b/Backend/Api/Auth/AddProfileImage.go
index af88ced..af2a8ce 100644
--- a/Backend/Api/Auth/AddProfileImage.go
+++ b/Backend/Api/Auth/AddProfileImage.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Util"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Util"
 )
 
 // AddProfileImage adds a profile image
diff --git a/Backend/Api/Auth/AddProfileImage_test.go b/Backend/Api/Auth/AddProfileImage_test.go
index c0d0dc3..02daea1 100644
--- a/Backend/Api/Auth/AddProfileImage_test.go
+++ b/Backend/Api/Auth/AddProfileImage_test.go
@@ -8,10 +8,10 @@ import (
 	"os"
 	"testing"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database/Seeder"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Tests"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database/Seeder"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Tests"
 )
 
 func Test_AddProfileImage(t *testing.T) {
diff --git a/Backend/Api/Auth/ChangePassword.go b/Backend/Api/Auth/ChangePassword.go
index 6e04bb5..5972a64 100644
--- a/Backend/Api/Auth/ChangePassword.go
+++ b/Backend/Api/Auth/ChangePassword.go
@@ -5,8 +5,8 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 )
 
 type rawChangePassword struct {
diff --git a/Backend/Api/Auth/ChangePassword_test.go b/Backend/Api/Auth/ChangePassword_test.go
index 29c1e42..18ebb5d 100644
--- a/Backend/Api/Auth/ChangePassword_test.go
+++ b/Backend/Api/Auth/ChangePassword_test.go
@@ -6,9 +6,9 @@ import (
 	"net/http"
 	"testing"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Api/Auth"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Tests"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Api/Auth"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Tests"
 )
 
 func Test_ChangePassword(t *testing.T) {
diff --git a/Backend/Api/Auth/ChangeUserMessageExpiry.go b/Backend/Api/Auth/ChangeUserMessageExpiry.go
index 4805519..1ae0fc6 100644
--- a/Backend/Api/Auth/ChangeUserMessageExpiry.go
+++ b/Backend/Api/Auth/ChangeUserMessageExpiry.go
@@ -5,8 +5,8 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 )
 
 type rawChangeMessageExpiry struct {
diff --git a/Backend/Api/Auth/ChangeUserMessageExpiry_test.go b/Backend/Api/Auth/ChangeUserMessageExpiry_test.go
index ca13511..a68475e 100644
--- a/Backend/Api/Auth/ChangeUserMessageExpiry_test.go
+++ b/Backend/Api/Auth/ChangeUserMessageExpiry_test.go
@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"testing"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Tests"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Tests"
 )
 
 func Test_ChangeUserMessageExpiry(t *testing.T) {
diff --git a/Backend/Api/Auth/Login.go b/Backend/Api/Auth/Login.go
index 7c72e07..d217493 100644
--- a/Backend/Api/Auth/Login.go
+++ b/Backend/Api/Auth/Login.go
@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"time"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 )
 
 type credentials struct {
diff --git a/Backend/Api/Auth/Login_test.go b/Backend/Api/Auth/Login_test.go
index 7eef436..b6bb982 100644
--- a/Backend/Api/Auth/Login_test.go
+++ b/Backend/Api/Auth/Login_test.go
@@ -6,9 +6,9 @@ import (
 	"net/http"
 	"testing"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Tests"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Tests"
 )
 
 func Test_Login(t *testing.T) {
diff --git a/Backend/Api/Auth/Logout.go b/Backend/Api/Auth/Logout.go
index 484fcc7..0e0fd24 100644
--- a/Backend/Api/Auth/Logout.go
+++ b/Backend/Api/Auth/Logout.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
 )
 
 // Logout logs out from system
diff --git a/Backend/Api/Auth/Logout_test.go b/Backend/Api/Auth/Logout_test.go
index ca43f0c..b5d5150 100644
--- a/Backend/Api/Auth/Logout_test.go
+++ b/Backend/Api/Auth/Logout_test.go
@@ -4,9 +4,9 @@ import (
 	"net/http"
 	"testing"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Tests"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Tests"
 )
 
 func Test_Logout(t *testing.T) {
diff --git a/Backend/Api/Auth/Session.go b/Backend/Api/Auth/Session.go
index 4c4c5a1..7334a6c 100644
--- a/Backend/Api/Auth/Session.go
+++ b/Backend/Api/Auth/Session.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"net/http"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 )
 
 func CheckCookie(r *http.Request) (Models.Session, error) {
diff --git a/Backend/Api/Auth/Signup.go b/Backend/Api/Auth/Signup.go
index 90252a9..bfae9d0 100644
--- a/Backend/Api/Auth/Signup.go
+++ b/Backend/Api/Auth/Signup.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 )
 
 type signup struct {
diff --git a/Backend/Api/Auth/Signup_test.go b/Backend/Api/Auth/Signup_test.go
index c57b125..02016dd 100644
--- a/Backend/Api/Auth/Signup_test.go
+++ b/Backend/Api/Auth/Signup_test.go
@@ -10,10 +10,10 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Api"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database/Seeder"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Api"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database/Seeder"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 	"github.com/gorilla/mux"
 )
 
diff --git a/Backend/Api/Friends/AcceptFriendRequest.go b/Backend/Api/Friends/AcceptFriendRequest.go
index 9b68bdd..aa9e233 100644
--- a/Backend/Api/Friends/AcceptFriendRequest.go
+++ b/Backend/Api/Friends/AcceptFriendRequest.go
@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"time"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 	"github.com/gorilla/mux"
 )
 
diff --git a/Backend/Api/Friends/AcceptFriendRequest_test.go b/Backend/Api/Friends/AcceptFriendRequest_test.go
index ff5c642..6f44d19 100644
--- a/Backend/Api/Friends/AcceptFriendRequest_test.go
+++ b/Backend/Api/Friends/AcceptFriendRequest_test.go
@@ -8,10 +8,10 @@ import (
 	"net/http"
 	"testing"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database/Seeder"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Tests"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database/Seeder"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Tests"
 )
 
 func Test_AcceptFriendRequest(t *testing.T) {
diff --git a/Backend/Api/Friends/CreateFriendRequest.go b/Backend/Api/Friends/CreateFriendRequest.go
index d7f0b53..a1db196 100644
--- a/Backend/Api/Friends/CreateFriendRequest.go
+++ b/Backend/Api/Friends/CreateFriendRequest.go
@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"time"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 )
 
 // CreateFriendRequest creates a FriendRequest from post data
diff --git a/Backend/Api/Friends/CreateFriendRequest_test.go b/Backend/Api/Friends/CreateFriendRequest_test.go
index 49b152e..2367d60 100644
--- a/Backend/Api/Friends/CreateFriendRequest_test.go
+++ b/Backend/Api/Friends/CreateFriendRequest_test.go
@@ -7,10 +7,10 @@ import (
 	"net/http"
 	"testing"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database/Seeder"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Tests"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database/Seeder"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Tests"
 )
 
 func Test_CreateFriendRequest(t *testing.T) {
diff --git a/Backend/Api/Friends/Friends.go b/Backend/Api/Friends/Friends.go
index 3bd58ba..26850d3 100644
--- a/Backend/Api/Friends/Friends.go
+++ b/Backend/Api/Friends/Friends.go
@@ -6,9 +6,9 @@ import (
 	"net/url"
 	"strconv"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Api/Auth"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Api/Auth"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 )
 
 // FriendRequestList gets friend request list
diff --git a/Backend/Api/Friends/Friends_test.go b/Backend/Api/Friends/Friends_test.go
index ee177b8..c58d7f6 100644
--- a/Backend/Api/Friends/Friends_test.go
+++ b/Backend/Api/Friends/Friends_test.go
@@ -9,10 +9,10 @@ import (
 	"testing"
 	"time"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database/Seeder"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Tests"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database/Seeder"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Tests"
 )
 
 func Test_FriendRequestList(t *testing.T) {
diff --git a/Backend/Api/Friends/RejectFriendRequest.go b/Backend/Api/Friends/RejectFriendRequest.go
index 8ba5829..e341858 100644
--- a/Backend/Api/Friends/RejectFriendRequest.go
+++ b/Backend/Api/Friends/RejectFriendRequest.go
@@ -3,8 +3,8 @@ package Friends
 import (
 	"net/http"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 
 	"github.com/gorilla/mux"
 )
diff --git a/Backend/Api/Messages/AddConversationImage.go b/Backend/Api/Messages/AddConversationImage.go
index 31c36e9..1da2866 100644
--- a/Backend/Api/Messages/AddConversationImage.go
+++ b/Backend/Api/Messages/AddConversationImage.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Util"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Util"
 	"github.com/gorilla/mux"
 )
 
diff --git a/Backend/Api/Messages/ChangeConversationMessageExpiry.go b/Backend/Api/Messages/ChangeConversationMessageExpiry.go
index b589590..1dd4218 100644
--- a/Backend/Api/Messages/ChangeConversationMessageExpiry.go
+++ b/Backend/Api/Messages/ChangeConversationMessageExpiry.go
@@ -5,8 +5,8 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 	"github.com/gorilla/mux"
 )
 
diff --git a/Backend/Api/Messages/Conversations.go b/Backend/Api/Messages/Conversations.go
index 03da54e..47cebb5 100644
--- a/Backend/Api/Messages/Conversations.go
+++ b/Backend/Api/Messages/Conversations.go
@@ -8,9 +8,9 @@ import (
 	"strconv"
 	"strings"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Api/Auth"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Api/Auth"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 )
 
 // ConversationList returns an encrypted list of all Conversations
diff --git a/Backend/Api/Messages/Conversations_test.go b/Backend/Api/Messages/Conversations_test.go
index 49f3654..a289d70 100644
--- a/Backend/Api/Messages/Conversations_test.go
+++ b/Backend/Api/Messages/Conversations_test.go
@@ -8,10 +8,10 @@ import (
 	"net/http"
 	"testing"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database/Seeder"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Tests"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database/Seeder"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Tests"
 )
 
 func Test_ConversationsList(t *testing.T) {
diff --git a/Backend/Api/Messages/CreateConversation.go b/Backend/Api/Messages/CreateConversation.go
index 3bb62f2..9fafdf9 100644
--- a/Backend/Api/Messages/CreateConversation.go
+++ b/Backend/Api/Messages/CreateConversation.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/gofrs/uuid"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 )
 
 // RawCreateConversationData for holding POST payload
diff --git a/Backend/Api/Messages/CreateConversation_test.go b/Backend/Api/Messages/CreateConversation_test.go
index 5659dff..04b30d1 100644
--- a/Backend/Api/Messages/CreateConversation_test.go
+++ b/Backend/Api/Messages/CreateConversation_test.go
@@ -7,10 +7,10 @@ import (
 	"net/http"
 	"testing"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database/Seeder"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Tests"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database/Seeder"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Tests"
 	"github.com/gofrs/uuid"
 )
 
diff --git a/Backend/Api/Messages/CreateMessage.go b/Backend/Api/Messages/CreateMessage.go
index faf6dad..552159b 100644
--- a/Backend/Api/Messages/CreateMessage.go
+++ b/Backend/Api/Messages/CreateMessage.go
@@ -6,9 +6,9 @@ import (
 	"net/http"
 	"time"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Util"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Util"
 )
 
 type rawMessageData struct {
diff --git a/Backend/Api/Messages/CreateMessage_test.go b/Backend/Api/Messages/CreateMessage_test.go
index 81666c5..74d694f 100644
--- a/Backend/Api/Messages/CreateMessage_test.go
+++ b/Backend/Api/Messages/CreateMessage_test.go
@@ -8,10 +8,10 @@ import (
 	"testing"
 	"time"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database/Seeder"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Tests"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database/Seeder"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Tests"
 	"github.com/gofrs/uuid"
 )
 
diff --git a/Backend/Api/Messages/MessageThread.go b/Backend/Api/Messages/MessageThread.go
index 1135c20..a7a8911 100644
--- a/Backend/Api/Messages/MessageThread.go
+++ b/Backend/Api/Messages/MessageThread.go
@@ -6,8 +6,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 
 	"github.com/gorilla/mux"
 )
diff --git a/Backend/Api/Messages/MessageThread_test.go b/Backend/Api/Messages/MessageThread_test.go
index bf4325e..1b2463a 100644
--- a/Backend/Api/Messages/MessageThread_test.go
+++ b/Backend/Api/Messages/MessageThread_test.go
@@ -7,10 +7,10 @@ import (
 	"net/http"
 	"testing"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database/Seeder"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Tests"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database/Seeder"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Tests"
 )
 
 func Test_Messages(t *testing.T) {
diff --git a/Backend/Api/Messages/UpdateConversation.go b/Backend/Api/Messages/UpdateConversation.go
index 67d2a2c..4900ba8 100644
--- a/Backend/Api/Messages/UpdateConversation.go
+++ b/Backend/Api/Messages/UpdateConversation.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/gofrs/uuid"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 )
 
 type rawUpdateConversationData struct {
diff --git a/Backend/Api/Messages/UpdateConversation_test.go b/Backend/Api/Messages/UpdateConversation_test.go
index cdc3684..5f61bd8 100644
--- a/Backend/Api/Messages/UpdateConversation_test.go
+++ b/Backend/Api/Messages/UpdateConversation_test.go
@@ -7,10 +7,10 @@ import (
 	"net/http"
 	"testing"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database/Seeder"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Tests"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database/Seeder"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Tests"
 )
 
 func createConversation(key Seeder.AesKey) (Models.ConversationDetail, Models.UserConversation, Models.ConversationDetailUser, error) {
diff --git a/Backend/Api/Routes.go b/Backend/Api/Routes.go
index 5fd7ab6..6c6e2a4 100644
--- a/Backend/Api/Routes.go
+++ b/Backend/Api/Routes.go
@@ -4,10 +4,10 @@ import (
 	"log"
 	"net/http"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Api/Auth"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Api/Friends"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Api/Messages"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Api/Users"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Api/Auth"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Api/Friends"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Api/Messages"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Api/Users"
 
 	"github.com/gorilla/mux"
 )
diff --git a/Backend/Api/Users/SearchUsers.go b/Backend/Api/Users/SearchUsers.go
index a073749..0ee71db 100644
--- a/Backend/Api/Users/SearchUsers.go
+++ b/Backend/Api/Users/SearchUsers.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 	"net/url"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 )
 
 // SearchUsers searches a for a user by username
diff --git a/Backend/Api/Users/SearchUsers_test.go b/Backend/Api/Users/SearchUsers_test.go
index 1b018f3..b54cae7 100644
--- a/Backend/Api/Users/SearchUsers_test.go
+++ b/Backend/Api/Users/SearchUsers_test.go
@@ -7,8 +7,8 @@ import (
 	"net/http"
 	"testing"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Tests"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Tests"
 )
 
 func Test_SearchUsers(t *testing.T) {
diff --git a/Backend/Database/Attachments.go b/Backend/Database/Attachments.go
index bda1415..3097a04 100644
--- a/Backend/Database/Attachments.go
+++ b/Backend/Database/Attachments.go
@@ -1,7 +1,7 @@
 package Database
 
 import (
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
diff --git a/Backend/Database/ConversationDetailUsers.go b/Backend/Database/ConversationDetailUsers.go
index 9215c0f..6396acb 100644
--- a/Backend/Database/ConversationDetailUsers.go
+++ b/Backend/Database/ConversationDetailUsers.go
@@ -1,7 +1,7 @@
 package Database
 
 import (
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
diff --git a/Backend/Database/ConversationDetails.go b/Backend/Database/ConversationDetails.go
index 7de9fe5..269b9ef 100644
--- a/Backend/Database/ConversationDetails.go
+++ b/Backend/Database/ConversationDetails.go
@@ -1,7 +1,7 @@
 package Database
 
 import (
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
diff --git a/Backend/Database/FriendRequests.go b/Backend/Database/FriendRequests.go
index 951a7a1..f387f4b 100644
--- a/Backend/Database/FriendRequests.go
+++ b/Backend/Database/FriendRequests.go
@@ -1,7 +1,7 @@
 package Database
 
 import (
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
diff --git a/Backend/Database/Init.go b/Backend/Database/Init.go
index 982a7d4..27613c8 100644
--- a/Backend/Database/Init.go
+++ b/Backend/Database/Init.go
@@ -3,7 +3,7 @@ package Database
 import (
 	"log"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
diff --git a/Backend/Database/MessageData.go b/Backend/Database/MessageData.go
index 4198f2a..80c6515 100644
--- a/Backend/Database/MessageData.go
+++ b/Backend/Database/MessageData.go
@@ -1,7 +1,7 @@
 package Database
 
 import (
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
diff --git a/Backend/Database/Messages.go b/Backend/Database/Messages.go
index 37d0c14..277948a 100644
--- a/Backend/Database/Messages.go
+++ b/Backend/Database/Messages.go
@@ -1,7 +1,7 @@
 package Database
 
 import (
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
diff --git a/Backend/Database/Seeder/FriendSeeder.go b/Backend/Database/Seeder/FriendSeeder.go
index cc5edee..1ae87fe 100644
--- a/Backend/Database/Seeder/FriendSeeder.go
+++ b/Backend/Database/Seeder/FriendSeeder.go
@@ -6,8 +6,8 @@ import (
 	"os"
 	"time"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 )
 
 func seedFriend(userRequestTo, userRequestFrom Models.User, accepted bool) error {
diff --git a/Backend/Database/Seeder/MessageSeeder.go b/Backend/Database/Seeder/MessageSeeder.go
index 5ccabad..00376f1 100644
--- a/Backend/Database/Seeder/MessageSeeder.go
+++ b/Backend/Database/Seeder/MessageSeeder.go
@@ -3,8 +3,8 @@ package Seeder
 import (
 	"encoding/base64"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 
 	"github.com/gofrs/uuid"
 )
diff --git a/Backend/Database/Seeder/UserSeeder.go b/Backend/Database/Seeder/UserSeeder.go
index eae651f..c4f8a40 100644
--- a/Backend/Database/Seeder/UserSeeder.go
+++ b/Backend/Database/Seeder/UserSeeder.go
@@ -3,9 +3,9 @@ package Seeder
 import (
 	"encoding/base64"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Api/Auth"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Api/Auth"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 )
 
 var userNames = []string{
diff --git a/Backend/Database/Sessions.go b/Backend/Database/Sessions.go
index afee878..877d11b 100644
--- a/Backend/Database/Sessions.go
+++ b/Backend/Database/Sessions.go
@@ -1,7 +1,7 @@
 package Database
 
 import (
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 
 	"gorm.io/gorm/clause"
 )
diff --git a/Backend/Database/UserConversations.go b/Backend/Database/UserConversations.go
index cc876c7..26a95d9 100644
--- a/Backend/Database/UserConversations.go
+++ b/Backend/Database/UserConversations.go
@@ -1,7 +1,7 @@
 package Database
 
 import (
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
diff --git a/Backend/Database/Users.go b/Backend/Database/Users.go
index c27ba2c..2df6a73 100644
--- a/Backend/Database/Users.go
+++ b/Backend/Database/Users.go
@@ -3,7 +3,7 @@ package Database
 import (
 	"errors"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
diff --git a/Backend/Dockerfile b/Backend/Dockerfile
index 71c43c5..3e1bbd5 100644
--- a/Backend/Dockerfile
+++ b/Backend/Dockerfile
@@ -1,10 +1,10 @@
 FROM golang:1.19-alpine
 
-RUN mkdir -p /go/src/git.tovijaeschke.xyz/Capsule/Backend
+RUN mkdir -p /go/src/git.tovijaeschke.xyz/Envelope/Backend
 
-COPY ./ /go/src/git.tovijaeschke.xyz/Capsule/Backend
+COPY ./ /go/src/git.tovijaeschke.xyz/Envelope/Backend
 
-WORKDIR /go/src/git.tovijaeschke.xyz/Capsule/Backend
+WORKDIR /go/src/git.tovijaeschke.xyz/Envelope/Backend
 
 # For "go test" and development
 RUN apk add gcc libc-dev inotify-tools
diff --git a/Backend/Dockerfile.prod b/Backend/Dockerfile.prod
index 9fea42e..766942f 100644
--- a/Backend/Dockerfile.prod
+++ b/Backend/Dockerfile.prod
@@ -1,10 +1,10 @@
 FROM golang:1.19-alpine
 
-RUN mkdir -p /go/src/git.tovijaeschke.xyz/Capsule/Backend
+RUN mkdir -p /go/src/git.tovijaeschke.xyz/Envelope/Backend
 
-COPY ./ /go/src/git.tovijaeschke.xyz/Capsule/Backend
+COPY ./ /go/src/git.tovijaeschke.xyz/Envelope/Backend
 
-WORKDIR /go/src/git.tovijaeschke.xyz/Capsule/Backend
+WORKDIR /go/src/git.tovijaeschke.xyz/Envelope/Backend
 
 # For "go test"
 RUN apk add gcc libc-dev
diff --git a/Backend/Tests/Init.go b/Backend/Tests/Init.go
index dde5c4f..457cf3f 100644
--- a/Backend/Tests/Init.go
+++ b/Backend/Tests/Init.go
@@ -10,11 +10,11 @@ import (
 	"net/url"
 	"time"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Api"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Api/Auth"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database/Seeder"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Api"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Api/Auth"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database/Seeder"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 
 	"github.com/gorilla/mux"
 )
diff --git a/Backend/Util/UserHelper.go b/Backend/Util/UserHelper.go
index 47b2569..32616a6 100644
--- a/Backend/Util/UserHelper.go
+++ b/Backend/Util/UserHelper.go
@@ -5,8 +5,8 @@ import (
 	"log"
 	"net/http"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Models"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Models"
 
 	"github.com/gorilla/mux"
 )
diff --git a/Backend/go.mod b/Backend/go.mod
index 9db656c..dcaeeec 100644
--- a/Backend/go.mod
+++ b/Backend/go.mod
@@ -1,4 +1,4 @@
-module git.tovijaeschke.xyz/tovi/Capsule/Backend
+module git.tovijaeschke.xyz/tovi/Envelope/Backend
 
 go 1.18
 
diff --git a/Backend/main.go b/Backend/main.go
index 8001402..e9dc701 100644
--- a/Backend/main.go
+++ b/Backend/main.go
@@ -5,9 +5,9 @@ import (
 	"log"
 	"net/http"
 
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Api"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database"
-	"git.tovijaeschke.xyz/tovi/Capsule/Backend/Database/Seeder"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Api"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database"
+	"git.tovijaeschke.xyz/tovi/Envelope/Backend/Database/Seeder"
 
 	"github.com/gorilla/mux"
 )
diff --git a/README.md b/README.md
index 2fff85b..ceeddaa 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Capsule
+# Envelope
 
 Encrypted messaging app
 
@@ -8,10 +8,10 @@ Encrypted messaging app
 - Add friends profile picture
 - Add conversation pagination
 - Add message pagination
-- Add message pagination
 - Finish off conversation settings page
 - Finish message expiry
 - Add back button to QR scanner
 - Add more padding at message send text box
 - Fix error when creating existing conversation between friends
 - Sort conversation based on latest message
+- Fix admin bool on conversation object frontend
diff --git a/docker-compose.yml b/docker-compose.yml
index 05a879a..324cc93 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
     ports:
       - "8080:8080"
     volumes:
-      - "./Backend:/go/src/git.tovijaeschke.xyz/Capsule/Backend"
+      - "./Backend:/go/src/git.tovijaeschke.xyz/Envelope/Backend"
     links:
       - postgres
       - postgres-testing
diff --git a/mobile/android/app/src/main/AndroidManifest.xml b/mobile/android/app/src/main/AndroidManifest.xml
index 26cb9e0..c3bfaaa 100644
--- a/mobile/android/app/src/main/AndroidManifest.xml
+++ b/mobile/android/app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
     package="com.example.mobile">
    <uses-permission android:name="android.permission.INTERNET"/>
    <application
-        android:label="Capsule"
+        android:label="Envelope"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
diff --git a/mobile/lib/components/qr_reader.dart b/mobile/lib/components/qr_reader.dart
index 25ea239..cc133cc 100644
--- a/mobile/lib/components/qr_reader.dart
+++ b/mobile/lib/components/qr_reader.dart
@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:Envelope/components/custom_title_bar.dart';
 import 'package:flutter/material.dart';
 import 'package:pointycastle/impl.dart';
 import 'package:qr_code_scanner/qr_code_scanner.dart';
@@ -46,6 +47,18 @@ class _QrReaderState extends State<QrReader> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      appBar: CustomTitleBar(
+        title: Text(
+          'Add Friend',
+          style: TextStyle(
+            fontSize: 16,
+            fontWeight: FontWeight.w600,
+            color: Theme.of(context).appBarTheme.toolbarTextStyle?.color
+          )
+        ),
+        showBack: true,
+        backgroundColor: Colors.transparent,
+      ),
       body: Column(
         children: <Widget>[
           Expanded(
diff --git a/mobile/lib/components/view_image.dart b/mobile/lib/components/view_image.dart
index cbf1319..2fe3fcf 100644
--- a/mobile/lib/components/view_image.dart
+++ b/mobile/lib/components/view_image.dart
@@ -1,5 +1,5 @@
-import 'package:Capsule/components/custom_title_bar.dart';
-import 'package:Capsule/models/image_message.dart';
+import 'package:Envelope/components/custom_title_bar.dart';
+import 'package:Envelope/models/image_message.dart';
 import 'package:flutter/material.dart';
 
 class ViewImage extends StatelessWidget {
diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index 9d571c6..ce2ea93 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -13,7 +13,7 @@ void main() async {
 class MyApp extends StatelessWidget {
   const MyApp({Key? key}) : super(key: key);
 
-  static const String _title = 'Capsule';
+  static const String _title = 'Envelope';
 
   @override
   Widget build(BuildContext context) {
diff --git a/mobile/lib/models/conversation_users.dart b/mobile/lib/models/conversation_users.dart
index 5d2614c..04ca747 100644
--- a/mobile/lib/models/conversation_users.dart
+++ b/mobile/lib/models/conversation_users.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
 import 'dart:typed_data';
 
-import 'package:Capsule/utils/encryption/aes_helper.dart';
-import 'package:Capsule/utils/encryption/crypto_utils.dart';
+import 'package:Envelope/utils/encryption/aes_helper.dart';
+import 'package:Envelope/utils/encryption/crypto_utils.dart';
 import 'package:pointycastle/impl.dart';
 
 import '/models/conversations.dart';
diff --git a/mobile/lib/models/conversations.dart b/mobile/lib/models/conversations.dart
index 9286aae..c2a05ca 100644
--- a/mobile/lib/models/conversations.dart
+++ b/mobile/lib/models/conversations.dart
@@ -2,8 +2,8 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:Capsule/models/messages.dart';
-import 'package:Capsule/models/text_messages.dart';
+import 'package:Envelope/models/messages.dart';
+import 'package:Envelope/models/text_messages.dart';
 import 'package:mime/mime.dart';
 import 'package:pointycastle/export.dart';
 import 'package:sqflite/sqflite.dart';
diff --git a/mobile/lib/models/image_message.dart b/mobile/lib/models/image_message.dart
index 8d27d5f..ff11a8a 100644
--- a/mobile/lib/models/image_message.dart
+++ b/mobile/lib/models/image_message.dart
@@ -2,9 +2,9 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:Capsule/models/my_profile.dart';
-import 'package:Capsule/utils/storage/get_file.dart';
-import 'package:Capsule/utils/storage/write_file.dart';
+import 'package:Envelope/models/my_profile.dart';
+import 'package:Envelope/utils/storage/get_file.dart';
+import 'package:Envelope/utils/storage/write_file.dart';
 import 'package:mime/mime.dart';
 import 'package:pointycastle/pointycastle.dart';
 import 'package:uuid/uuid.dart';
diff --git a/mobile/lib/models/my_profile.dart b/mobile/lib/models/my_profile.dart
index cbf97ed..add753a 100644
--- a/mobile/lib/models/my_profile.dart
+++ b/mobile/lib/models/my_profile.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:Capsule/utils/storage/get_file.dart';
+import 'package:Envelope/utils/storage/get_file.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:pointycastle/impl.dart';
 import 'package:shared_preferences/shared_preferences.dart';
diff --git a/mobile/lib/utils/storage/conversations.dart b/mobile/lib/utils/storage/conversations.dart
index 44a3148..3165332 100644
--- a/mobile/lib/utils/storage/conversations.dart
+++ b/mobile/lib/utils/storage/conversations.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 
-import 'package:Capsule/exceptions/update_data_exception.dart';
-import 'package:Capsule/utils/storage/get_file.dart';
+import 'package:Envelope/exceptions/update_data_exception.dart';
+import 'package:Envelope/utils/storage/get_file.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart' as http;
 import 'package:pointycastle/export.dart';
diff --git a/mobile/lib/utils/storage/messages.dart b/mobile/lib/utils/storage/messages.dart
index d2f8486..be07ca1 100644
--- a/mobile/lib/utils/storage/messages.dart
+++ b/mobile/lib/utils/storage/messages.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:Capsule/models/messages.dart';
-import 'package:Capsule/utils/storage/write_file.dart';
+import 'package:Envelope/models/messages.dart';
+import 'package:Envelope/utils/storage/write_file.dart';
 import 'package:http/http.dart' as http;
 import 'package:sqflite/sqflite.dart';
 import 'package:uuid/uuid.dart';
diff --git a/mobile/lib/views/authentication/login.dart b/mobile/lib/views/authentication/login.dart
index 44788b3..1609aa9 100644
--- a/mobile/lib/views/authentication/login.dart
+++ b/mobile/lib/views/authentication/login.dart
@@ -177,7 +177,7 @@ class _LoginWidgetState extends State<LoginWidget> {
                         }).catchError((error) {
                           print(error);
                           showMessage(
-                            'Could not login to Capsule, please try again later.',
+                            'Could not login to Envelope, please try again later.',
                             context,
                           );
                         });
diff --git a/mobile/lib/views/authentication/signup.dart b/mobile/lib/views/authentication/signup.dart
index 22ac9ab..2a190e0 100644
--- a/mobile/lib/views/authentication/signup.dart
+++ b/mobile/lib/views/authentication/signup.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
 import 'dart:typed_data';
 
-import 'package:Capsule/components/flash_message.dart';
-import 'package:Capsule/models/my_profile.dart';
+import 'package:Envelope/components/flash_message.dart';
+import 'package:Envelope/models/my_profile.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart' as http;
 
@@ -176,7 +176,7 @@ class _SignupWidgetState extends State<SignupWidget> {
                         .then((dynamic) {
                           Navigator.of(context).popUntil((route) => route.isFirst);
                         }).catchError((error) {
-                          showMessage('Failed to signup to Capsule, please try again later', context);
+                          showMessage('Failed to signup to Envelope, please try again later', context);
                         });
                     },
                     child: const Text('Submit'),
diff --git a/mobile/lib/views/authentication/unauthenticated_landing.dart b/mobile/lib/views/authentication/unauthenticated_landing.dart
index 3a7e432..6bcd086 100644
--- a/mobile/lib/views/authentication/unauthenticated_landing.dart
+++ b/mobile/lib/views/authentication/unauthenticated_landing.dart
@@ -46,7 +46,7 @@ class _UnauthenticatedLandingWidgetState extends State<UnauthenticatedLandingWid
                                     ),
                                     const SizedBox(width: 15),
                                     Text(
-                                        'Capsule',
+                                        'Envelope',
                                         style: TextStyle(
                                             fontSize: 40,
                                             color: Theme.of(context).colorScheme.onBackground,
diff --git a/mobile/lib/views/main/conversation/create_add_users_list.dart b/mobile/lib/views/main/conversation/create_add_users_list.dart
index 5d39201..fec37f6 100644
--- a/mobile/lib/views/main/conversation/create_add_users_list.dart
+++ b/mobile/lib/views/main/conversation/create_add_users_list.dart
@@ -1,5 +1,5 @@
-import 'package:Capsule/components/custom_circle_avatar.dart';
-import 'package:Capsule/models/friends.dart';
+import 'package:Envelope/components/custom_circle_avatar.dart';
+import 'package:Envelope/models/friends.dart';
 import 'package:flutter/material.dart';
 
 class ConversationAddFriendItem extends StatefulWidget{
diff --git a/mobile/lib/views/main/conversation/detail.dart b/mobile/lib/views/main/conversation/detail.dart
index 61658ff..9f71f55 100644
--- a/mobile/lib/views/main/conversation/detail.dart
+++ b/mobile/lib/views/main/conversation/detail.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:Capsule/views/main/conversation/message.dart';
+import 'package:Envelope/views/main/conversation/message.dart';
 import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
 
@@ -25,6 +25,7 @@ class ConversationDetail extends StatefulWidget{
 
 class _ConversationDetailState extends State<ConversationDetail> {
   List<Message> messages = [];
+
   MyProfile profile = MyProfile(
     id: '',
     username: '',
@@ -36,6 +37,8 @@ class _ConversationDetailState extends State<ConversationDetail> {
   bool showFilePicker = false;
   List<File> selectedImages = [];
 
+  bool sendDisabled = false;
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -81,6 +84,9 @@ class _ConversationDetailState extends State<ConversationDetail> {
 
   @override
   void initState() {
+    print(widget.conversation.admin);
+    print(widget.conversation.adminSendMessages);
+    sendDisabled = widget.conversation.adminSendMessages && !widget.conversation.admin;
     super.initState();
     fetchMessages();
   }
@@ -202,6 +208,10 @@ class _ConversationDetailState extends State<ConversationDetail> {
                 GestureDetector(
                   onTap: (){
                     setState(() {
+                      if (sendDisabled) {
+                        return;
+                      }
+
                       showFilePicker = !showFilePicker;
                     });
                   },
@@ -224,8 +234,11 @@ class _ConversationDetailState extends State<ConversationDetail> {
 
                 Expanded(
                   child: TextField(
+                    enabled: !sendDisabled,
                     decoration: InputDecoration(
-                      hintText: 'Write message...',
+                      hintText: sendDisabled ?
+                        'Messages disabled for non-admins' :
+                        'Write message...',
                       hintStyle: TextStyle(
                         color: Theme.of(context).hintColor,
                       ),
@@ -244,7 +257,7 @@ class _ConversationDetailState extends State<ConversationDetail> {
                     child: FittedBox(
                       child: FloatingActionButton(
                         onPressed: () async {
-                          if (msgController.text == '' && selectedImages.isEmpty) {
+                          if ((msgController.text == '' && selectedImages.isEmpty) || sendDisabled) {
                             return;
                           }
                           await sendMessage(
diff --git a/mobile/lib/views/main/conversation/edit_details.dart b/mobile/lib/views/main/conversation/edit_details.dart
index e197498..9106dac 100644
--- a/mobile/lib/views/main/conversation/edit_details.dart
+++ b/mobile/lib/views/main/conversation/edit_details.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:Capsule/components/file_picker.dart';
+import 'package:Envelope/components/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
 
diff --git a/mobile/lib/views/main/conversation/list.dart b/mobile/lib/views/main/conversation/list.dart
index 8b88896..be4b494 100644
--- a/mobile/lib/views/main/conversation/list.dart
+++ b/mobile/lib/views/main/conversation/list.dart
@@ -1,8 +1,8 @@
 import 'dart:io';
 
-import 'package:Capsule/components/custom_title_bar.dart';
-import 'package:Capsule/models/friends.dart';
-import 'package:Capsule/utils/storage/conversations.dart';
+import 'package:Envelope/components/custom_title_bar.dart';
+import 'package:Envelope/models/friends.dart';
+import 'package:Envelope/utils/storage/conversations.dart';
 import 'package:flutter/material.dart';
 
 import '/models/conversations.dart';
diff --git a/mobile/lib/views/main/conversation/message.dart b/mobile/lib/views/main/conversation/message.dart
index 6c63f98..5bdc982 100644
--- a/mobile/lib/views/main/conversation/message.dart
+++ b/mobile/lib/views/main/conversation/message.dart
@@ -1,7 +1,7 @@
-import 'package:Capsule/components/view_image.dart';
-import 'package:Capsule/models/image_message.dart';
-import 'package:Capsule/models/my_profile.dart';
-import 'package:Capsule/utils/time.dart';
+import 'package:Envelope/components/view_image.dart';
+import 'package:Envelope/models/image_message.dart';
+import 'package:Envelope/models/my_profile.dart';
+import 'package:Envelope/utils/time.dart';
 import 'package:flutter/material.dart';
 
 import '/models/messages.dart';
diff --git a/mobile/lib/views/main/conversation/permissions.dart b/mobile/lib/views/main/conversation/permissions.dart
index 16304db..6524fdb 100644
--- a/mobile/lib/views/main/conversation/permissions.dart
+++ b/mobile/lib/views/main/conversation/permissions.dart
@@ -1,7 +1,7 @@
-import 'package:Capsule/components/flash_message.dart';
-import 'package:Capsule/exceptions/update_data_exception.dart';
-import 'package:Capsule/utils/storage/conversations.dart';
-import 'package:Capsule/utils/storage/database.dart';
+import 'package:Envelope/components/flash_message.dart';
+import 'package:Envelope/exceptions/update_data_exception.dart';
+import 'package:Envelope/utils/storage/conversations.dart';
+import 'package:Envelope/utils/storage/database.dart';
 import 'package:flutter/material.dart';
 
 import '/components/custom_title_bar.dart';
diff --git a/mobile/lib/views/main/conversation/settings.dart b/mobile/lib/views/main/conversation/settings.dart
index c891820..3aa41f9 100644
--- a/mobile/lib/views/main/conversation/settings.dart
+++ b/mobile/lib/views/main/conversation/settings.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:Capsule/utils/storage/session_cookie.dart';
-import 'package:Capsule/views/main/conversation/permissions.dart';
+import 'package:Envelope/utils/storage/session_cookie.dart';
+import 'package:Envelope/views/main/conversation/permissions.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart' as http;
 
diff --git a/mobile/lib/views/main/friend/list.dart b/mobile/lib/views/main/friend/list.dart
index 8917f52..8f19a61 100644
--- a/mobile/lib/views/main/friend/list.dart
+++ b/mobile/lib/views/main/friend/list.dart
@@ -1,7 +1,7 @@
-import 'package:Capsule/components/custom_title_bar.dart';
-import 'package:Capsule/components/qr_reader.dart';
-import 'package:Capsule/views/main/friend/add_search.dart';
-import 'package:Capsule/views/main/friend/request_list_item.dart';
+import 'package:Envelope/components/custom_title_bar.dart';
+import 'package:Envelope/components/qr_reader.dart';
+import 'package:Envelope/views/main/friend/add_search.dart';
+import 'package:Envelope/views/main/friend/request_list_item.dart';
 import 'package:flutter/material.dart';
 
 import '/models/friends.dart';
diff --git a/mobile/lib/views/main/friend/list_item.dart b/mobile/lib/views/main/friend/list_item.dart
index 03665cb..dc411ba 100644
--- a/mobile/lib/views/main/friend/list_item.dart
+++ b/mobile/lib/views/main/friend/list_item.dart
@@ -1,9 +1,9 @@
-import 'package:Capsule/components/custom_circle_avatar.dart';
-import 'package:Capsule/models/conversations.dart';
-import 'package:Capsule/models/friends.dart';
-import 'package:Capsule/utils/storage/conversations.dart';
-import 'package:Capsule/utils/strings.dart';
-import 'package:Capsule/views/main/conversation/detail.dart';
+import 'package:Envelope/components/custom_circle_avatar.dart';
+import 'package:Envelope/models/conversations.dart';
+import 'package:Envelope/models/friends.dart';
+import 'package:Envelope/utils/storage/conversations.dart';
+import 'package:Envelope/utils/strings.dart';
+import 'package:Envelope/views/main/conversation/detail.dart';
 import 'package:flutter/material.dart';
 
 class FriendListItem extends StatefulWidget{
diff --git a/mobile/lib/views/main/home.dart b/mobile/lib/views/main/home.dart
index b590798..58e9f8e 100644
--- a/mobile/lib/views/main/home.dart
+++ b/mobile/lib/views/main/home.dart
@@ -118,8 +118,8 @@ class _HomeState extends State<Home> {
 
   @override
   void initState() {
-    updateData();
     super.initState();
+    updateData();
   }
 
   Widget loading() {
diff --git a/mobile/lib/views/main/profile/change_server_url.dart b/mobile/lib/views/main/profile/change_server_url.dart
index c1e2f14..813397b 100644
--- a/mobile/lib/views/main/profile/change_server_url.dart
+++ b/mobile/lib/views/main/profile/change_server_url.dart
@@ -111,7 +111,7 @@ WARNING: Do not use this feature unless you know what you\'re doing!
 ''';
 
     String warning2 = '''
-Changing the server url will disconnect you from all friends and conversations on this server, and connect you to a fresh environment. This feature is intended to be used by people that are willing to host their own Capsule server, which you can find by going to \nhttps://github.com/SomeUsername/SomeRepo.\n\n
+Changing the server url will disconnect you from all friends and conversations on this server, and connect you to a fresh environment. This feature is intended to be used by people that are willing to host their own Envelope server, which you can find by going to \nhttps://github.com/SomeUsername/SomeRepo.\n\n
 You can revert this by entering \nhttps://envelope-messenger.com\n on the login screen.
 ''';
 
diff --git a/mobile/lib/views/main/profile/profile.dart b/mobile/lib/views/main/profile/profile.dart
index 63bd867..d4e91c5 100644
--- a/mobile/lib/views/main/profile/profile.dart
+++ b/mobile/lib/views/main/profile/profile.dart
@@ -2,11 +2,11 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:Capsule/components/file_picker.dart';
-import 'package:Capsule/components/flash_message.dart';
-import 'package:Capsule/utils/encryption/aes_helper.dart';
-import 'package:Capsule/utils/storage/session_cookie.dart';
-import 'package:Capsule/utils/storage/write_file.dart';
+import 'package:Envelope/components/file_picker.dart';
+import 'package:Envelope/components/flash_message.dart';
+import 'package:Envelope/utils/encryption/aes_helper.dart';
+import 'package:Envelope/utils/storage/session_cookie.dart';
+import 'package:Envelope/utils/storage/write_file.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:image_picker/image_picker.dart';
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 7874976..0147a82 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -1,4 +1,4 @@
-name: Capsule
+name: Envelope
 description: An encrypted messaging app
 
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev