diff --git a/.gitignore b/.gitignore
index 3b2d42667..09bf8886e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,7 @@ debug
 __debug_bin
 files
 octo*.db
+focalboard*.db
 .eslintcache
 .vscode/settings.json
 .prettierrc.json
diff --git a/mac/Focalboard/ViewController.swift b/mac/Focalboard/ViewController.swift
index 2a00bb934..cf3f85bf4 100644
--- a/mac/Focalboard/ViewController.swift
+++ b/mac/Focalboard/ViewController.swift
@@ -65,14 +65,14 @@ class ViewController:
 		let dateFormatter = DateFormatter()
 		dateFormatter.dateFormat = "yyyy-M-d"
 		let dateString = dateFormatter.string(from: Date())
-		let filename = "archive-\(dateString).octo"
+		let filename = "archive-\(dateString).focalboard"
 
 		// Save file
 		let savePanel = NSSavePanel()
 		savePanel.canCreateDirectories = true
 		savePanel.nameFieldStringValue = filename
 		// BUGBUG: Specifying the allowedFileTypes causes Catalina to hang / error out
-		//savePanel.allowedFileTypes = [".octo"]
+		//savePanel.allowedFileTypes = [".focalboard"]
 		savePanel.begin { (result) in
 			if result.rawValue == NSApplication.ModalResponse.OK.rawValue,
 			   let fileUrl = savePanel.url {
@@ -97,7 +97,7 @@ class ViewController:
 		savePanel.canCreateDirectories = true
 		savePanel.nameFieldStringValue = filename
 		// BUGBUG: Specifying the allowedFileTypes causes Catalina to hang / error out
-		//savePanel.allowedFileTypes = [".octo"]
+		//savePanel.allowedFileTypes = [".focalboard"]
 		savePanel.begin { (result) in
 			if result.rawValue == NSApplication.ModalResponse.OK.rawValue,
 			   let fileUrl = savePanel.url {
diff --git a/webapp/src/archiver.ts b/webapp/src/archiver.ts
index 495090ea1..d9b592a58 100644
--- a/webapp/src/archiver.ts
+++ b/webapp/src/archiver.ts
@@ -38,7 +38,7 @@ class Archiver {
         const content = JSON.stringify(archive)
 
         const date = new Date()
-        const filename = `archive-${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}.octo`
+        const filename = `archive-${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}.focalboard`
         const link = document.createElement('a')
         link.style.display = 'none'
 
@@ -56,7 +56,7 @@ class Archiver {
     static importFullArchive(onComplete?: () => void): void {
         const input = document.createElement('input')
         input.type = 'file'
-        input.accept = '.octo'
+        input.accept = '.focalboard'
         input.onchange = async () => {
             const file = input.files && input.files[0]
             const contents = await (new Response(file)).text()