diff --git a/CliClient/tests/test-utils.js b/CliClient/tests/test-utils.js
index 71fc20b00e..047a13da82 100644
--- a/CliClient/tests/test-utils.js
+++ b/CliClient/tests/test-utils.js
@@ -17,8 +17,8 @@ const { FileApiDriverLocal } = require('lib/file-api-driver-local.js');
 const { FsDriverNode } = require('lib/fs-driver-node.js');
 const { time } = require('lib/time-utils.js');
 const SyncTargetRegistry = require('lib/SyncTargetRegistry.js');
-const SyncTarget1 = require('lib/SyncTarget1.js');
-const SyncTarget2 = require('lib/SyncTarget2.js');
+const SyncTargetMemory = require('lib/SyncTargetMemory.js');
+const SyncTargetFilesystem = require('lib/SyncTargetFilesystem.js');
 
 let databases_ = [];
 let synchronizers_ = [];
@@ -50,8 +50,8 @@ BaseItem.loadClass('NoteTag', NoteTag);
 Setting.setConstant('appId', 'net.cozic.joplin-cli');
 Setting.setConstant('appType', 'cli');
 
-SyncTargetRegistry.addClass(SyncTarget1);
-SyncTargetRegistry.addClass(SyncTarget2);
+SyncTargetRegistry.addClass(SyncTargetMemory);
+SyncTargetRegistry.addClass(SyncTargetFilesystem);
 
 function syncTargetId() {
 	return syncTargetId_;
diff --git a/ReactNativeClient/lib/BaseApplication.js b/ReactNativeClient/lib/BaseApplication.js
index d762cd96a4..66e1a5fd31 100644
--- a/ReactNativeClient/lib/BaseApplication.js
+++ b/ReactNativeClient/lib/BaseApplication.js
@@ -22,8 +22,8 @@ const os = require('os');
 const fs = require('fs-extra');
 const EventEmitter = require('events');
 const SyncTargetRegistry = require('lib/SyncTargetRegistry.js');
-const SyncTarget2 = require('lib/SyncTarget2.js');
-const SyncTarget3 = require('lib/SyncTarget3.js');
+const SyncTargetFilesystem = require('lib/SyncTargetFilesystem.js');
+const SyncTargetOneDrive = require('lib/SyncTargetOneDrive.js');
 
 class BaseApplication {
 
@@ -325,8 +325,8 @@ class BaseApplication {
 		Setting.setConstant('resourceDir', resourceDir);
 		Setting.setConstant('tempDir', tempDir);
 
-		SyncTargetRegistry.addClass(SyncTarget2);
-		SyncTargetRegistry.addClass(SyncTarget3);
+		SyncTargetRegistry.addClass(SyncTargetFilesystem);
+		SyncTargetRegistry.addClass(SyncTargetOneDrive);
 
 		await fs.mkdirp(profileDir, 0o755);
 		await fs.mkdirp(resourceDir, 0o755);
diff --git a/ReactNativeClient/lib/SyncTarget2.js b/ReactNativeClient/lib/SyncTargetFilesystem.js
similarity index 83%
rename from ReactNativeClient/lib/SyncTarget2.js
rename to ReactNativeClient/lib/SyncTargetFilesystem.js
index e4f692b30a..f9f20d4a05 100644
--- a/ReactNativeClient/lib/SyncTarget2.js
+++ b/ReactNativeClient/lib/SyncTargetFilesystem.js
@@ -5,7 +5,7 @@ const { FileApi } = require('lib/file-api.js');
 const { FileApiDriverLocal } = require('lib/file-api-driver-local.js');
 const { Synchronizer } = require('lib/synchronizer.js');
 
-class SyncTarget2 extends BaseSyncTarget {
+class SyncTargetFilesystem extends BaseSyncTarget {
 
 	static id() {
 		return 2;
@@ -22,7 +22,7 @@ class SyncTarget2 extends BaseSyncTarget {
 	async initFileApi() {
 		const fileApi = new FileApi(Setting.value('sync.2.path'), new FileApiDriverLocal());
 		fileApi.setLogger(this.logger());
-		fileApi.setSyncTargetId(SyncTarget2.id());
+		fileApi.setSyncTargetId(SyncTargetFilesystem.id());
 		return fileApi;
 	}
 
@@ -32,4 +32,4 @@ class SyncTarget2 extends BaseSyncTarget {
 
 }
 
-module.exports = SyncTarget2;
\ No newline at end of file
+module.exports = SyncTargetFilesystem;
\ No newline at end of file
diff --git a/ReactNativeClient/lib/SyncTarget1.js b/ReactNativeClient/lib/SyncTargetMemory.js
similarity index 84%
rename from ReactNativeClient/lib/SyncTarget1.js
rename to ReactNativeClient/lib/SyncTargetMemory.js
index 0453779ad0..ffc1c6128b 100644
--- a/ReactNativeClient/lib/SyncTarget1.js
+++ b/ReactNativeClient/lib/SyncTargetMemory.js
@@ -5,7 +5,7 @@ const { FileApi } = require('lib/file-api.js');
 const { FileApiDriverMemory } = require('lib/file-api-driver-memory.js');
 const { Synchronizer } = require('lib/synchronizer.js');
 
-class SyncTarget1 extends BaseSyncTarget {
+class SyncTargetMemory extends BaseSyncTarget {
 
 	static id() {
 		return 1;
@@ -22,7 +22,7 @@ class SyncTarget1 extends BaseSyncTarget {
 	initFileApi() {
 		const fileApi = new FileApi('/root', new FileApiDriverMemory());
 		fileApi.setLogger(this.logger());
-		fileApi.setSyncTargetId(SyncTarget1.id());
+		fileApi.setSyncTargetId(SyncTargetMemory.id());
 		return fileApi;
 	}
 
@@ -32,4 +32,4 @@ class SyncTarget1 extends BaseSyncTarget {
 
 }
 
-module.exports = SyncTarget1;
\ No newline at end of file
+module.exports = SyncTargetMemory;
\ No newline at end of file
diff --git a/ReactNativeClient/lib/SyncTarget3.js b/ReactNativeClient/lib/SyncTargetOneDrive.js
similarity index 93%
rename from ReactNativeClient/lib/SyncTarget3.js
rename to ReactNativeClient/lib/SyncTargetOneDrive.js
index ca3b315a02..03f2433dea 100644
--- a/ReactNativeClient/lib/SyncTarget3.js
+++ b/ReactNativeClient/lib/SyncTargetOneDrive.js
@@ -7,7 +7,7 @@ const { FileApi } = require('lib/file-api.js');
 const { Synchronizer } = require('lib/synchronizer.js');
 const { FileApiDriverOneDrive } = require('lib/file-api-driver-onedrive.js');
 
-class SyncTarget3 extends BaseSyncTarget {
+class SyncTargetOneDrive extends BaseSyncTarget {
 
 	constructor(db, options = null) {
 		super(db, options);
@@ -70,6 +70,6 @@ class SyncTarget3 extends BaseSyncTarget {
 
 }
 
-const staticSelf = SyncTarget3;
+const staticSelf = SyncTargetOneDrive;
 
-module.exports = SyncTarget3;
\ No newline at end of file
+module.exports = SyncTargetOneDrive;
\ No newline at end of file
diff --git a/ReactNativeClient/root.js b/ReactNativeClient/root.js
index 04615dbcbd..0ceaf4ef9e 100644
--- a/ReactNativeClient/root.js
+++ b/ReactNativeClient/root.js
@@ -38,7 +38,7 @@ const RNFetchBlob = require('react-native-fetch-blob').default;
 const { PoorManIntervals } = require('lib/poor-man-intervals.js');
 const { reducer, defaultState } = require('lib/reducer.js');
 const SyncTargetRegistry = require('lib/SyncTargetRegistry.js');
-const SyncTarget3 = require('lib/SyncTarget3.js');
+const SyncTargetOneDrive = require('lib/SyncTargetOneDrive.js');
 
 const generalMiddleware = store => next => async (action) => {
 	if (action.type !== 'SIDE_MENU_OPEN_PERCENT') reg.logger().info('Reducer action', action.type);
@@ -257,7 +257,7 @@ async function initialize(dispatch, backButtonHandler) {
 
 	reg.setLogger(mainLogger);
 
-	SyncTargetRegistry.addClass(SyncTarget3);
+	SyncTargetRegistry.addClass(SyncTargetOneDrive);
 
 	reg.logger().info('====================================');
 	reg.logger().info('Starting application ' + Setting.value('appId') + ' (' + Setting.value('env') + ')');