diff --git a/Components/Repo/Repo.tsx b/Components/Repo/Repo.tsx
index c206ad2..d7d92a3 100644
--- a/Components/Repo/Repo.tsx
+++ b/Components/Repo/Repo.tsx
@@ -116,7 +116,7 @@ export default function Repo(props: RepoProps) {
               </thead>
               <tbody>
                 <tr>
-                  <th>{props.repositoryName} #{props.id}</th>
+                  <th>{props.repositoryName}</th>
                   <th>{props.storageSize} GB</th>
                   <th style={{ padding: '0 4% 0 4%' }}>
                     <StorageBar storageUsed={props.storageUsed} storageSize={props.storageSize} />
diff --git a/Containers/RepoManage/RepoManage.tsx b/Containers/RepoManage/RepoManage.tsx
index 6bd4f8b..97a067c 100644
--- a/Containers/RepoManage/RepoManage.tsx
+++ b/Containers/RepoManage/RepoManage.tsx
@@ -121,7 +121,7 @@ export default function RepoManage(props: RepoManageProps) {
       const publicKeyPrefix = sshPublicKey.split(' ').slice(0, 2).join(' ');
 
       const response = await fetch('/api/v1/repositories', { method: 'GET' });
-      const data = await response.json();
+      const data: { repoList: Repository[] } = await response.json();
 
       const conflictingRepo = data.repoList.find((repo: { sshPublicKey: string; id: number }) => {
         const repoPublicKeyPrefix = repo.sshPublicKey.split(' ').slice(0, 2).join(' ');
@@ -132,7 +132,7 @@ export default function RepoManage(props: RepoManageProps) {
 
       if (conflictingRepo) {
         toast.error(
-          `The SSH key is already used in repository #${conflictingRepo.id}. Please use another key or delete the key from the other repository.`,
+          `The SSH key is already used in repository ${conflictingRepo.repositoryName}. Please use another key or delete the key from the other repository.`,
           toastOptions
         );
         return false;
@@ -257,15 +257,15 @@ export default function RepoManage(props: RepoManageProps) {
                     color: 'rgba(99, 115, 129, 0.38)',
                   }}
                 >
-                  #{targetRepo?.id}
+                  {targetRepo?.repositoryName}
                 </span>{' '}
                 ?
               </h1>
             </div>
             <div className={classes.deleteDialogMessage}>
               <div style={{ marginBottom: '5px' }}>
-                You are about to permanently delete the repository <b>#{targetRepo?.id}</b> and all
-                the backups it contains.
+                You are about to permanently delete the repository{' '}
+                <b>{targetRepo?.repositoryName}</b> and all the backups it contains.
               </div>
               <div>The data will not be recoverable and it will not be possible to go back.</div>
             </div>
@@ -300,7 +300,7 @@ export default function RepoManage(props: RepoManageProps) {
                     color: 'rgba(99, 115, 129, 0.38)',
                   }}
                 >
-                  #{targetRepo?.id}
+                  {targetRepo?.repositoryName}
                 </span>
               </h2>
             )}
diff --git a/Containers/SetupWizard/SetupWizard.tsx b/Containers/SetupWizard/SetupWizard.tsx
index 4a48745..b070668 100644
--- a/Containers/SetupWizard/SetupWizard.tsx
+++ b/Containers/SetupWizard/SetupWizard.tsx
@@ -68,8 +68,8 @@ function SetupWizard(props: SetupWizardProps) {
 
   //Options for react-select
   const options: Optional<Array<SelectedRepoWizard>> = repoList?.map((repo) => ({
-    label: `${repo.alias} - #${repo.id}`,
-    value: `${repo.alias} - #${repo.id}`,
+    label: `${repo.alias} - ${repo.repositoryName}`,
+    value: `${repo.alias} - ${repo.repositoryName}`,
     id: repo.id.toString(),
     repositoryName: repo.repositoryName,
     lanCommand: repo.lanCommand ? repo.lanCommand : false,