diff --git a/admin/osx/gen_sym_files.py b/admin/osx/gen_sym_files.py
index 1d9fa2489..beaece4dc 100755
--- a/admin/osx/gen_sym_files.py
+++ b/admin/osx/gen_sym_files.py
@@ -31,7 +31,7 @@ def extractDeps(macho):
         if m:
             path = resolvePath(m.group(0))
             if not os.path.exists(path):
-                logging.warning("Non-existant file found in dependencies, ignoring: [%s]", path)
+                logging.warning("Non-existent file found in dependencies, ignoring: [%s]", path)
                 continue
             deps.append(path)
     return deps
diff --git a/src/common/vfs.cpp b/src/common/vfs.cpp
index 593c4c3bc..e887937f0 100644
--- a/src/common/vfs.cpp
+++ b/src/common/vfs.cpp
@@ -238,7 +238,7 @@ std::unique_ptr<Vfs> OCC::createVfsFromPlugin(Vfs::Mode mode)
     const auto pluginPath = pluginFileName(QStringLiteral("vfs"), name);
 
     if (!isVfsPluginAvailable(mode)) {
-        qCCritical(lcPlugin) << "Could not load plugin: not existant or bad metadata" << pluginPath;
+        qCCritical(lcPlugin) << "Could not load plugin: not existent or bad metadata" << pluginPath;
         return nullptr;
     }
 
diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index 763cb61c1..a5a13a51d 100644
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -1638,7 +1638,7 @@ static QString canonicalPath(const QString &path)
         const auto parentPath = selFile.dir().path();
 
         // It's possible for the parentPath to match the path
-        // (possibly we've arrived at a non-existant drive root on Windows)
+        // (possibly we've arrived at a non-existent drive root on Windows)
         // and recursing would be fatal.
         if (parentPath == path) {
             return path;
diff --git a/test/testsynccfapi.cpp b/test/testsynccfapi.cpp
index 43f021116..db32a5d85 100644
--- a/test/testsynccfapi.cpp
+++ b/test/testsynccfapi.cpp
@@ -991,7 +991,7 @@ private slots:
         QCOMPARE(*vfs->availability("online"), VfsItemAvailability::OnlineOnly);
         QCOMPARE(*vfs->availability("local"), VfsItemAvailability::AlwaysLocal);
 
-        auto r = vfs->availability("nonexistant");
+        auto r = vfs->availability("nonexistent");
         QVERIFY(!r);
         QCOMPARE(r.error(), Vfs::AvailabilityError::NoSuchItem);
     }
diff --git a/test/testsyncjournaldb.cpp b/test/testsyncjournaldb.cpp
index 387ec99d0..405ab269d 100644
--- a/test/testsyncjournaldb.cpp
+++ b/test/testsyncjournaldb.cpp
@@ -46,7 +46,7 @@ private slots:
     void testFileRecord()
     {
         SyncJournalFileRecord record;
-        QVERIFY(_db.getFileRecord(QByteArrayLiteral("nonexistant"), &record));
+        QVERIFY(_db.getFileRecord(QByteArrayLiteral("nonexistent"), &record));
         QVERIFY(!record.isValid());
 
         record._path = "foo";
@@ -129,7 +129,7 @@ private slots:
     void testDownloadInfo()
     {
         using Info = SyncJournalDb::DownloadInfo;
-        Info record = _db.getDownloadInfo("nonexistant");
+        Info record = _db.getDownloadInfo("nonexistent");
         QVERIFY(!record._valid);
 
         record._errorCount = 5;
@@ -149,7 +149,7 @@ private slots:
     void testUploadInfo()
     {
         using Info = SyncJournalDb::UploadInfo;
-        Info record = _db.getUploadInfo("nonexistant");
+        Info record = _db.getUploadInfo("nonexistent");
         QVERIFY(!record._valid);
 
         record._errorCount = 5;
@@ -382,31 +382,31 @@ private slots:
         QCOMPARE(get("local"), PinState::AlwaysLocal);
         QCOMPARE(get("online"), PinState::OnlineOnly);
         QCOMPARE(get("inherit"), PinState::AlwaysLocal);
-        QCOMPARE(get("nonexistant"), PinState::AlwaysLocal);
+        QCOMPARE(get("nonexistent"), PinState::AlwaysLocal);
         QCOMPARE(get("online/local"), PinState::AlwaysLocal);
         QCOMPARE(get("local/online"), PinState::OnlineOnly);
         QCOMPARE(get("inherit/local"), PinState::AlwaysLocal);
         QCOMPARE(get("inherit/online"), PinState::OnlineOnly);
         QCOMPARE(get("inherit/inherit"), PinState::AlwaysLocal);
-        QCOMPARE(get("inherit/nonexistant"), PinState::AlwaysLocal);
+        QCOMPARE(get("inherit/nonexistent"), PinState::AlwaysLocal);
 
         // Inheriting checks, level 1
         QCOMPARE(get("local/inherit"), PinState::AlwaysLocal);
-        QCOMPARE(get("local/nonexistant"), PinState::AlwaysLocal);
+        QCOMPARE(get("local/nonexistent"), PinState::AlwaysLocal);
         QCOMPARE(get("online/inherit"), PinState::OnlineOnly);
-        QCOMPARE(get("online/nonexistant"), PinState::OnlineOnly);
+        QCOMPARE(get("online/nonexistent"), PinState::OnlineOnly);
 
         // Inheriting checks, level 2
         QCOMPARE(get("local/inherit/inherit"), PinState::AlwaysLocal);
         QCOMPARE(get("local/local/inherit"), PinState::AlwaysLocal);
-        QCOMPARE(get("local/local/nonexistant"), PinState::AlwaysLocal);
+        QCOMPARE(get("local/local/nonexistent"), PinState::AlwaysLocal);
         QCOMPARE(get("local/online/inherit"), PinState::OnlineOnly);
-        QCOMPARE(get("local/online/nonexistant"), PinState::OnlineOnly);
+        QCOMPARE(get("local/online/nonexistent"), PinState::OnlineOnly);
         QCOMPARE(get("online/inherit/inherit"), PinState::OnlineOnly);
         QCOMPARE(get("online/local/inherit"), PinState::AlwaysLocal);
-        QCOMPARE(get("online/local/nonexistant"), PinState::AlwaysLocal);
+        QCOMPARE(get("online/local/nonexistent"), PinState::AlwaysLocal);
         QCOMPARE(get("online/online/inherit"), PinState::OnlineOnly);
-        QCOMPARE(get("online/online/nonexistant"), PinState::OnlineOnly);
+        QCOMPARE(get("online/online/nonexistent"), PinState::OnlineOnly);
 
         // Spot check the recursive variant
         QCOMPARE(getRecursive(""), PinState::Inherited);
@@ -427,12 +427,12 @@ private slots:
         QCOMPARE(get("local"), PinState::AlwaysLocal);
         QCOMPARE(get("online"), PinState::OnlineOnly);
         QCOMPARE(get("inherit"), PinState::OnlineOnly);
-        QCOMPARE(get("nonexistant"), PinState::OnlineOnly);
+        QCOMPARE(get("nonexistent"), PinState::OnlineOnly);
         make("", PinState::AlwaysLocal);
         QCOMPARE(get("local"), PinState::AlwaysLocal);
         QCOMPARE(get("online"), PinState::OnlineOnly);
         QCOMPARE(get("inherit"), PinState::AlwaysLocal);
-        QCOMPARE(get("nonexistant"), PinState::AlwaysLocal);
+        QCOMPARE(get("nonexistent"), PinState::AlwaysLocal);
 
         // Wiping
         QCOMPARE(getRaw("local/local"), PinState::AlwaysLocal);
diff --git a/test/testsyncvirtualfiles.cpp b/test/testsyncvirtualfiles.cpp
index ada90495e..ea9cded22 100644
--- a/test/testsyncvirtualfiles.cpp
+++ b/test/testsyncvirtualfiles.cpp
@@ -1367,7 +1367,7 @@ private slots:
         QCOMPARE(*vfs->availability("online"), VfsItemAvailability::OnlineOnly);
         QCOMPARE(*vfs->availability("local"), VfsItemAvailability::AlwaysLocal);
 
-        auto r = vfs->availability("nonexistant");
+        auto r = vfs->availability("nonexistent");
         QVERIFY(!r);
         QCOMPARE(r.error(), Vfs::AvailabilityError::NoSuchItem);
     }
diff --git a/test/testsyncxattr.cpp b/test/testsyncxattr.cpp
index 091393057..670478a41 100644
--- a/test/testsyncxattr.cpp
+++ b/test/testsyncxattr.cpp
@@ -962,7 +962,7 @@ private slots:
         QCOMPARE(*vfs->availability("online"), VfsItemAvailability::OnlineOnly);
         QCOMPARE(*vfs->availability("local"), VfsItemAvailability::AlwaysLocal);
 
-        auto r = vfs->availability("nonexistant");
+        auto r = vfs->availability("nonexistent");
         QVERIFY(!r);
         QCOMPARE(r.error(), Vfs::AvailabilityError::NoSuchItem);
     }