diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
index a28a1ea8d6c..710fdb817c1 100644
--- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
+++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
@@ -59,7 +59,7 @@ import { LoggerService } from 'vs/platform/log/node/loggerService';
 import { UserDataSyncLogService } from 'vs/platform/userDataSync/common/userDataSyncLog';
 import { ICredentialsService } from 'vs/platform/credentials/common/credentials';
 import { KeytarCredentialsService } from 'vs/platform/credentials/node/credentialsService';
-import { UserDataAutoSync } from 'vs/platform/userDataSync/electron-browser/userDataAutoSync';
+import { UserDataAutoSyncService } from 'vs/platform/userDataSync/electron-browser/userDataAutoSyncService';
 import { SettingsSynchroniser } from 'vs/platform/userDataSync/common/settingsSync';
 import { UserDataAuthTokenService } from 'vs/platform/userDataSync/common/userDataAuthTokenService';
 
@@ -219,7 +219,7 @@ async function main(server: Server, initData: ISharedProcessInitData, configurat
 			const userDataSyncChannel = new UserDataSyncChannel(userDataSyncService);
 			server.registerChannel('userDataSync', userDataSyncChannel);
 
-			const userDataAutoSync = instantiationService2.createInstance(UserDataAutoSync);
+			const userDataAutoSync = instantiationService2.createInstance(UserDataAutoSyncService);
 			const userDataAutoSyncChannel = new UserDataAutoSyncChannel(userDataAutoSync);
 			server.registerChannel('userDataAutoSync', userDataAutoSyncChannel);
 
diff --git a/src/vs/platform/userDataSync/common/userDataAutoSync.ts b/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts
similarity index 98%
rename from src/vs/platform/userDataSync/common/userDataAutoSync.ts
rename to src/vs/platform/userDataSync/common/userDataAutoSyncService.ts
index 636aab43f50..bbe40077d65 100644
--- a/src/vs/platform/userDataSync/common/userDataAutoSync.ts
+++ b/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts
@@ -9,7 +9,7 @@ import { Disposable } from 'vs/base/common/lifecycle';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IUserDataSyncLogService, IUserDataSyncService, SyncStatus, IUserDataAuthTokenService, IUserDataAutoSyncService, IUserDataSyncUtilService, UserDataSyncError, UserDataSyncErrorCode, SyncSource } from 'vs/platform/userDataSync/common/userDataSync';
 
-export class UserDataAutoSync extends Disposable implements IUserDataAutoSyncService {
+export class UserDataAutoSyncService extends Disposable implements IUserDataAutoSyncService {
 
 	_serviceBrand: any;
 
diff --git a/src/vs/platform/userDataSync/electron-browser/userDataAutoSync.ts b/src/vs/platform/userDataSync/electron-browser/userDataAutoSyncService.ts
similarity index 88%
rename from src/vs/platform/userDataSync/electron-browser/userDataAutoSync.ts
rename to src/vs/platform/userDataSync/electron-browser/userDataAutoSyncService.ts
index 6ca2e9085e3..2b5fdcaba9e 100644
--- a/src/vs/platform/userDataSync/electron-browser/userDataAutoSync.ts
+++ b/src/vs/platform/userDataSync/electron-browser/userDataAutoSyncService.ts
@@ -6,10 +6,10 @@
 import { IUserDataSyncService, IUserDataSyncLogService, IUserDataAuthTokenService, IUserDataSyncUtilService } from 'vs/platform/userDataSync/common/userDataSync';
 import { Event } from 'vs/base/common/event';
 import { IElectronService } from 'vs/platform/electron/node/electron';
-import { UserDataAutoSync as BaseUserDataAutoSync } from 'vs/platform/userDataSync/common/userDataAutoSync';
+import { UserDataAutoSyncService as BaseUserDataAutoSyncService } from 'vs/platform/userDataSync/common/userDataAutoSyncService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 
-export class UserDataAutoSync extends BaseUserDataAutoSync {
+export class UserDataAutoSyncService extends BaseUserDataAutoSyncService {
 
 	constructor(
 		@IUserDataSyncService userDataSyncService: IUserDataSyncService,
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataAutoSync.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataAutoSyncService.ts
similarity index 89%
rename from src/vs/workbench/contrib/userDataSync/browser/userDataAutoSync.ts
rename to src/vs/workbench/contrib/userDataSync/browser/userDataAutoSyncService.ts
index 2fd6b1ea03b..5e5b10448cd 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataAutoSync.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataAutoSyncService.ts
@@ -6,12 +6,12 @@
 import { IUserDataSyncService, IUserDataSyncLogService, IUserDataAuthTokenService, IUserDataSyncUtilService } from 'vs/platform/userDataSync/common/userDataSync';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { Event } from 'vs/base/common/event';
-import { UserDataAutoSync as BaseUserDataAutoSync } from 'vs/platform/userDataSync/common/userDataAutoSync';
+import { UserDataAutoSyncService as BaseUserDataAutoSyncService } from 'vs/platform/userDataSync/common/userDataAutoSyncService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { UserDataSyncTrigger } from 'vs/workbench/contrib/userDataSync/browser/userDataSyncTrigger';
 import { IHostService } from 'vs/workbench/services/host/browser/host';
 
-export class UserDataAutoSync extends BaseUserDataAutoSync {
+export class UserDataAutoSyncService extends BaseUserDataAutoSyncService {
 
 	constructor(
 		@IUserDataSyncService userDataSyncService: IUserDataSyncService,
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
index 287f31dee48..20246b2d1ac 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
@@ -23,7 +23,7 @@ import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { isWeb } from 'vs/base/common/platform';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { UserDataAutoSync } from 'vs/workbench/contrib/userDataSync/browser/userDataAutoSync';
+import { UserDataAutoSyncService } from 'vs/workbench/contrib/userDataSync/browser/userDataAutoSyncService';
 import { UserDataSyncTrigger } from 'vs/workbench/contrib/userDataSync/browser/userDataSyncTrigger';
 import { timeout } from 'vs/base/common/async';
 import { IOutputService } from 'vs/workbench/contrib/output/common/output';
@@ -119,7 +119,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 			this.registerActions();
 			this.initializeActiveAccount().then(_ => {
 				if (isWeb) {
-					this._register(instantiationService.createInstance(UserDataAutoSync));
+					this._register(instantiationService.createInstance(UserDataAutoSyncService));
 				} else {
 					this._register(instantiationService.createInstance(UserDataSyncTrigger).onDidTriggerSync(() => userDataAutoSyncService.triggerAutoSync()));
 				}
diff --git a/src/vs/workbench/workbench.web.main.ts b/src/vs/workbench/workbench.web.main.ts
index 0719b361e00..28e0750d950 100644
--- a/src/vs/workbench/workbench.web.main.ts
+++ b/src/vs/workbench/workbench.web.main.ts
@@ -69,7 +69,7 @@ import { UserDataSyncStoreService } from 'vs/platform/userDataSync/common/userDa
 import { UserDataSyncService } from 'vs/platform/userDataSync/common/userDataSyncService';
 import { SettingsSynchroniser } from 'vs/platform/userDataSync/common/settingsSync';
 import { UserDataAuthTokenService } from 'vs/platform/userDataSync/common/userDataAuthTokenService';
-import { UserDataAutoSync } from 'vs/platform/userDataSync/common/userDataAutoSync';
+import { UserDataAutoSyncService } from 'vs/platform/userDataSync/common/userDataAutoSyncService';
 import { AccessibilityService } from 'vs/platform/accessibility/common/accessibilityService';
 
 registerSingleton(IExtensionManagementService, ExtensionManagementService);
@@ -82,7 +82,7 @@ registerSingleton(IAuthenticationService, AuthenticationService);
 registerSingleton(IUserDataSyncLogService, UserDataSyncLogService);
 registerSingleton(IUserDataSyncStoreService, UserDataSyncStoreService);
 registerSingleton(IUserDataAuthTokenService, UserDataAuthTokenService);
-registerSingleton(IUserDataAutoSyncService, UserDataAutoSync);
+registerSingleton(IUserDataAutoSyncService, UserDataAutoSyncService);
 registerSingleton(ISettingsSyncService, SettingsSynchroniser);
 registerSingleton(IUserDataSyncService, UserDataSyncService);