--- a/mobile/android/base/android-services.mozbuild	2015-01-06 05:07:54.000000000 +0000
+++ b/mobile/android/base/android-services.mozbuild	2015-02-02 02:59:30.180709918 +0000
@@ -567,7 +567,7 @@
     'fxa/authenticator/FxAccountAuthenticatorService.java',
     'fxa/authenticator/FxAccountLoginDelegate.java',
     'fxa/authenticator/FxAccountLoginException.java',
-    'fxa/FirefoxAccounts.java',
+    'fxa/IceCatAccounts.java',
     'fxa/login/BaseRequestDelegate.java',
     'fxa/login/Cohabiting.java',
     'fxa/login/Doghouse.java',
@@ -709,8 +709,8 @@
     'sync/repositories/android/CachedSQLiteOpenHelper.java',
     'sync/repositories/android/ClientsDatabase.java',
     'sync/repositories/android/ClientsDatabaseAccessor.java',
-    'sync/repositories/android/FennecTabsRepository.java',
     'sync/repositories/android/FormHistoryRepositorySession.java',
+    'sync/repositories/android/IceCatMobileTabsRepository.java',
     'sync/repositories/android/PasswordsRepositorySession.java',
     'sync/repositories/android/RepoUtils.java',
     'sync/repositories/BookmarkNeedsReparentingException.java',
@@ -803,11 +803,11 @@
     'sync/stage/CompletedStage.java',
     'sync/stage/EnsureClusterURLStage.java',
     'sync/stage/EnsureCrypto5KeysStage.java',
-    'sync/stage/FennecTabsServerSyncStage.java',
     'sync/stage/FetchInfoCollectionsStage.java',
     'sync/stage/FetchMetaGlobalStage.java',
     'sync/stage/FormHistoryServerSyncStage.java',
     'sync/stage/GlobalSyncStage.java',
+    'sync/stage/IceCatMobileTabsServerSyncStage.java',
     'sync/stage/NoSuchStageException.java',
     'sync/stage/NoSyncIDException.java',
     'sync/stage/PasswordsServerSyncStage.java',