diff --git a/apps/mobile_app/lib/config/env/questia_env_config.dart b/apps/mobile_app/lib/config/env/save_family_env_config.dart
similarity index 81%
rename from apps/mobile_app/lib/config/env/questia_env_config.dart
rename to apps/mobile_app/lib/config/env/save_family_env_config.dart
index 100d251b..881f48f1 100644
--- a/apps/mobile_app/lib/config/env/questia_env_config.dart
+++ b/apps/mobile_app/lib/config/env/save_family_env_config.dart
@@ -1,7 +1,7 @@
 import 'package:sf_infrastructure/sf_infrastructure.dart';
 import 'environment.dart';
 
-class QuestiaEnvConfig implements EnvConfig {
+class SaveFamilyEnvConfig implements EnvConfig {
   @override
   String get apiBaseUrl => Environment.apiBaseUrl;
   @override
diff --git a/apps/mobile_app/lib/core/init_app.dart b/apps/mobile_app/lib/core/init_app.dart
index 69291204..ab6e23cb 100644
--- a/apps/mobile_app/lib/core/init_app.dart
+++ b/apps/mobile_app/lib/core/init_app.dart
@@ -6,7 +6,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:design_system/design_system.dart';
 import 'package:sca_treezor/sca_treezor.dart';
 import 'package:sf_app_platform/config/env/environment_enum.dart';
-import 'package:sf_app_platform/config/env/questia_env_config.dart';
+import 'package:sf_app_platform/config/env/save_family_env_config.dart';
 import 'package:sf_app_platform/core/config/app_mode.dart';
 import 'package:sf_app_platform/navigation/app_router.dart';
 import 'package:sf_app_platform/save_family_app.dart';
@@ -29,7 +29,7 @@ Future<void> initApp(EnvironmentEnum env) async {
   // await initSentry(env);
 
   await configureDependencies(
-    QuestiaEnvConfig(),
+    SaveFamilyEnvConfig(),
     log: env.isDevelopment || kDebugMode,
     // Treezor-specific detection (message + 500) runs in both modes;
     // only the destination route differs based on the active app mode.
diff --git a/apps/mobile_app/lib/providers/legacy_heartbeat_service.dart b/apps/mobile_app/lib/providers/legacy_heartbeat_service.dart
index 6229135e..3b0991ab 100644
--- a/apps/mobile_app/lib/providers/legacy_heartbeat_service.dart
+++ b/apps/mobile_app/lib/providers/legacy_heartbeat_service.dart
@@ -6,12 +6,12 @@ import 'package:sf_infrastructure/sf_infrastructure.dart';
 
 class LegacyHeartbeatService {
   LegacyHeartbeatService({
-    required QuestiaRepository repository,
+    required SaveFamilyRepository repository,
     required void Function() onUnauthorized,
   }) : _repository = repository,
        _onUnauthorized = onUnauthorized;
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
   final void Function() _onUnauthorized;
   Timer? _timer;
 
diff --git a/apps/mobile_app/lib/save_family_app.dart b/apps/mobile_app/lib/save_family_app.dart
index cc579cb0..eeee8a65 100644
--- a/apps/mobile_app/lib/save_family_app.dart
+++ b/apps/mobile_app/lib/save_family_app.dart
@@ -43,7 +43,7 @@ class SaveFamilyAppState extends ConsumerState<SaveFamilyApp>
 
     if (isLegacyMode) {
       _legacyHeartbeat = LegacyHeartbeatService(
-        repository: GetIt.I<QuestiaRepository>(),
+        repository: GetIt.I<SaveFamilyRepository>(),
         onUnauthorized: () {
           clearSessionData();
           appRouter.go(AppRoutes.legacyLogin);
diff --git a/modules/legacy/modules/account/lib/src/core/data/datasource/change_password_remote_datasource_impl.dart b/modules/legacy/modules/account/lib/src/core/data/datasource/change_password_remote_datasource_impl.dart
index 8647095e..f67fcd16 100644
--- a/modules/legacy/modules/account/lib/src/core/data/datasource/change_password_remote_datasource_impl.dart
+++ b/modules/legacy/modules/account/lib/src/core/data/datasource/change_password_remote_datasource_impl.dart
@@ -10,7 +10,7 @@ class ChangePasswordRemoteDatasourceImpl
     implements ChangePasswordRemoteDatasource {
   ChangePasswordRemoteDatasourceImpl(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   @override
   Future<void> changePassword({
diff --git a/modules/legacy/modules/account/lib/src/core/data/datasource/devices_remote_datasource_impl.dart b/modules/legacy/modules/account/lib/src/core/data/datasource/devices_remote_datasource_impl.dart
index 6f0f2337..14fd6a88 100644
--- a/modules/legacy/modules/account/lib/src/core/data/datasource/devices_remote_datasource_impl.dart
+++ b/modules/legacy/modules/account/lib/src/core/data/datasource/devices_remote_datasource_impl.dart
@@ -9,7 +9,7 @@ import 'devices_remote_datasource.dart';
 class DevicesRemoteDatasourceImpl implements DevicesRemoteDatasource {
   DevicesRemoteDatasourceImpl(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   @override
   Future<void> deleteDevice({required String deviceId}) async {
diff --git a/modules/legacy/modules/account/lib/src/core/data/datasource/users_remote_datasource_impl.dart b/modules/legacy/modules/account/lib/src/core/data/datasource/users_remote_datasource_impl.dart
index c3473b76..da3d7cb0 100644
--- a/modules/legacy/modules/account/lib/src/core/data/datasource/users_remote_datasource_impl.dart
+++ b/modules/legacy/modules/account/lib/src/core/data/datasource/users_remote_datasource_impl.dart
@@ -10,7 +10,7 @@ import 'package:sf_shared/sf_shared.dart';
 class UsersRemoteDatasourceImpl implements UsersRemoteDatasource {
   UsersRemoteDatasourceImpl(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   @override
   Future<List<UserEntity>> getUsers({required String userId}) async {
diff --git a/modules/legacy/modules/account/lib/src/core/providers/change_password_remote_datasource_provider.dart b/modules/legacy/modules/account/lib/src/core/providers/change_password_remote_datasource_provider.dart
index 72d04c22..73d08a07 100644
--- a/modules/legacy/modules/account/lib/src/core/providers/change_password_remote_datasource_provider.dart
+++ b/modules/legacy/modules/account/lib/src/core/providers/change_password_remote_datasource_provider.dart
@@ -6,6 +6,6 @@ import '../data/datasource/change_password_remote_datasource_impl.dart';
 
 final changePasswordRemoteDatasourceProvider =
     Provider<ChangePasswordRemoteDatasource>((ref) {
-      final questiaRepository = getIt<QuestiaRepository>();
-      return ChangePasswordRemoteDatasourceImpl(questiaRepository);
+      final saveFamilyRepository = getIt<SaveFamilyRepository>();
+      return ChangePasswordRemoteDatasourceImpl(saveFamilyRepository);
     });
diff --git a/modules/legacy/modules/account/lib/src/core/providers/devices_remote_datasource_provider.dart b/modules/legacy/modules/account/lib/src/core/providers/devices_remote_datasource_provider.dart
index 5d5f6a0b..02025f90 100644
--- a/modules/legacy/modules/account/lib/src/core/providers/devices_remote_datasource_provider.dart
+++ b/modules/legacy/modules/account/lib/src/core/providers/devices_remote_datasource_provider.dart
@@ -7,6 +7,6 @@ import '../data/datasource/devices_remote_datasource_impl.dart';
 final devicesRemoteDatasourceProvider = Provider<DevicesRemoteDatasource>((
   ref,
 ) {
-  final questiaRepository = getIt<QuestiaRepository>();
-  return DevicesRemoteDatasourceImpl(questiaRepository);
+  final saveFamilyRepository = getIt<SaveFamilyRepository>();
+  return DevicesRemoteDatasourceImpl(saveFamilyRepository);
 });
diff --git a/modules/legacy/modules/account/lib/src/core/providers/users_remote_datasource_provider.dart b/modules/legacy/modules/account/lib/src/core/providers/users_remote_datasource_provider.dart
index 6300df7e..52caccbd 100644
--- a/modules/legacy/modules/account/lib/src/core/providers/users_remote_datasource_provider.dart
+++ b/modules/legacy/modules/account/lib/src/core/providers/users_remote_datasource_provider.dart
@@ -5,6 +5,6 @@ import '../data/datasource/users_remote_datasource.dart';
 import '../data/datasource/users_remote_datasource_impl.dart';
 
 final usersRemoteDatasourceProvider = Provider<UsersRemoteDatasource>((ref) {
-  final questiaRepository = getIt<QuestiaRepository>();
-  return UsersRemoteDatasourceImpl(questiaRepository);
+  final saveFamilyRepository = getIt<SaveFamilyRepository>();
+  return UsersRemoteDatasourceImpl(saveFamilyRepository);
 });
diff --git a/modules/legacy/modules/control_panel/lib/src/core/data/datasource/control_panel_remote_datasource_impl.dart b/modules/legacy/modules/control_panel/lib/src/core/data/datasource/control_panel_remote_datasource_impl.dart
index d1a8083c..fdd55f98 100644
--- a/modules/legacy/modules/control_panel/lib/src/core/data/datasource/control_panel_remote_datasource_impl.dart
+++ b/modules/legacy/modules/control_panel/lib/src/core/data/datasource/control_panel_remote_datasource_impl.dart
@@ -8,7 +8,7 @@ import 'package:sf_infrastructure/sf_infrastructure.dart';
 class ControlPanelRemoteDatasourceImpl implements ControlPanelRemoteDatasource {
   ControlPanelRemoteDatasourceImpl(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   @override
   Future<List<PositionEntity>> getLatestPositions({
diff --git a/modules/legacy/modules/control_panel/lib/src/core/providers/control_panel_remote_datasource_provider.dart b/modules/legacy/modules/control_panel/lib/src/core/providers/control_panel_remote_datasource_provider.dart
index db7aba39..dbb91354 100644
--- a/modules/legacy/modules/control_panel/lib/src/core/providers/control_panel_remote_datasource_provider.dart
+++ b/modules/legacy/modules/control_panel/lib/src/core/providers/control_panel_remote_datasource_provider.dart
@@ -5,6 +5,6 @@ import 'package:sf_infrastructure/sf_infrastructure.dart';
 
 final controlPanelRemoteDatasourceProvider =
     Provider<ControlPanelRemoteDatasource>((ref) {
-      final questiaRepository = getIt<QuestiaRepository>();
-      return ControlPanelRemoteDatasourceImpl(questiaRepository);
+      final saveFamilyRepository = getIt<SaveFamilyRepository>();
+      return ControlPanelRemoteDatasourceImpl(saveFamilyRepository);
     });
diff --git a/modules/legacy/modules/device_management/lib/src/core/data/datasources/app_usage_times_remote_datasource_impl.dart b/modules/legacy/modules/device_management/lib/src/core/data/datasources/app_usage_times_remote_datasource_impl.dart
index eb3958f5..30eed2ac 100644
--- a/modules/legacy/modules/device_management/lib/src/core/data/datasources/app_usage_times_remote_datasource_impl.dart
+++ b/modules/legacy/modules/device_management/lib/src/core/data/datasources/app_usage_times_remote_datasource_impl.dart
@@ -9,7 +9,7 @@ class AppUsageTimesRemoteDatasourceImpl
     implements AppUsageTimesRemoteDatasource {
   AppUsageTimesRemoteDatasourceImpl(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   @override
   Future<GetAppUsageTimesResponseModel> getAppUsageTimes({
diff --git a/modules/legacy/modules/device_management/lib/src/core/data/datasources/background_image_remote_datasource_impl.dart b/modules/legacy/modules/device_management/lib/src/core/data/datasources/background_image_remote_datasource_impl.dart
index 60182d8c..e400b9df 100644
--- a/modules/legacy/modules/device_management/lib/src/core/data/datasources/background_image_remote_datasource_impl.dart
+++ b/modules/legacy/modules/device_management/lib/src/core/data/datasources/background_image_remote_datasource_impl.dart
@@ -10,7 +10,7 @@ class BackgroundImageRemoteDatasourceImpl
     implements BackgroundImageRemoteDatasource {
   BackgroundImageRemoteDatasourceImpl(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   @override
   Future<GetBackgroundImageResponseModel> getBackgroundImage() async {
diff --git a/modules/legacy/modules/device_management/lib/src/core/data/datasources/contacts_remote_datasource_impl.dart b/modules/legacy/modules/device_management/lib/src/core/data/datasources/contacts_remote_datasource_impl.dart
index 1160cabc..bef65dc2 100644
--- a/modules/legacy/modules/device_management/lib/src/core/data/datasources/contacts_remote_datasource_impl.dart
+++ b/modules/legacy/modules/device_management/lib/src/core/data/datasources/contacts_remote_datasource_impl.dart
@@ -10,7 +10,7 @@ import 'contacts_remote_datasource.dart';
 class ContactsRemoteDatasourceImpl implements ContactsRemoteDatasource {
   ContactsRemoteDatasourceImpl(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   @override
   Future<GetContactsResponseModel> getContacts({required String userId}) async {
diff --git a/modules/legacy/modules/device_management/lib/src/core/data/datasources/health_remote_datasource_impl.dart b/modules/legacy/modules/device_management/lib/src/core/data/datasources/health_remote_datasource_impl.dart
index ae439264..7e1a806d 100644
--- a/modules/legacy/modules/device_management/lib/src/core/data/datasources/health_remote_datasource_impl.dart
+++ b/modules/legacy/modules/device_management/lib/src/core/data/datasources/health_remote_datasource_impl.dart
@@ -9,7 +9,7 @@ import 'health_remote_datasource.dart';
 class HealthRemoteDatasourceImpl implements HealthRemoteDatasource {
   HealthRemoteDatasourceImpl(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   @override
   Future<GetHeartbeatsResponseModel> getHeartbeats({
diff --git a/modules/legacy/modules/device_management/lib/src/core/data/datasources/pictures_remote_datasource_impl.dart b/modules/legacy/modules/device_management/lib/src/core/data/datasources/pictures_remote_datasource_impl.dart
index 82a867de..8a6753c9 100644
--- a/modules/legacy/modules/device_management/lib/src/core/data/datasources/pictures_remote_datasource_impl.dart
+++ b/modules/legacy/modules/device_management/lib/src/core/data/datasources/pictures_remote_datasource_impl.dart
@@ -8,7 +8,7 @@ import 'package:sf_infrastructure/sf_infrastructure.dart';
 class PicturesRemoteDatasourceImpl implements PicturesRemoteDatasource {
   PicturesRemoteDatasourceImpl(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   @override
   Future<List<PictureEntity>> getPictures({required String deviceId}) async {
diff --git a/modules/legacy/modules/device_management/lib/src/core/data/datasources/scheduled_activities_remote_datasource_impl.dart b/modules/legacy/modules/device_management/lib/src/core/data/datasources/scheduled_activities_remote_datasource_impl.dart
index 37d8efe9..494df188 100644
--- a/modules/legacy/modules/device_management/lib/src/core/data/datasources/scheduled_activities_remote_datasource_impl.dart
+++ b/modules/legacy/modules/device_management/lib/src/core/data/datasources/scheduled_activities_remote_datasource_impl.dart
@@ -11,7 +11,7 @@ class ScheduledActivitiesRemoteDatasourceImpl
     implements ScheduledActivitiesRemoteDatasource {
   ScheduledActivitiesRemoteDatasourceImpl(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   @override
   Future<GetScheduledActivitiesResponseModel> getActivities({
diff --git a/modules/legacy/modules/device_management/lib/src/core/data/datasources/steps_remote_datasource_impl.dart b/modules/legacy/modules/device_management/lib/src/core/data/datasources/steps_remote_datasource_impl.dart
index 5a65c63e..e99562d2 100644
--- a/modules/legacy/modules/device_management/lib/src/core/data/datasources/steps_remote_datasource_impl.dart
+++ b/modules/legacy/modules/device_management/lib/src/core/data/datasources/steps_remote_datasource_impl.dart
@@ -8,7 +8,7 @@ import 'steps_remote_datasource.dart';
 class StepsRemoteDatasourceImpl implements StepsRemoteDatasource {
   StepsRemoteDatasourceImpl(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   @override
   Future<GetStepsResponseModel> getSteps({
diff --git a/modules/legacy/modules/device_management/lib/src/core/providers/app_usage_times_remote_datasource_provider.dart b/modules/legacy/modules/device_management/lib/src/core/providers/app_usage_times_remote_datasource_provider.dart
index c40d2220..ac7b0566 100644
--- a/modules/legacy/modules/device_management/lib/src/core/providers/app_usage_times_remote_datasource_provider.dart
+++ b/modules/legacy/modules/device_management/lib/src/core/providers/app_usage_times_remote_datasource_provider.dart
@@ -6,6 +6,6 @@ import '../data/datasources/app_usage_times_remote_datasource_impl.dart';
 
 final appUsageTimesRemoteDatasourceProvider =
     Provider<AppUsageTimesRemoteDatasource>((ref) {
-      final questiaRepository = getIt<QuestiaRepository>();
-      return AppUsageTimesRemoteDatasourceImpl(questiaRepository);
+      final saveFamilyRepository = getIt<SaveFamilyRepository>();
+      return AppUsageTimesRemoteDatasourceImpl(saveFamilyRepository);
     });
diff --git a/modules/legacy/modules/device_management/lib/src/core/providers/background_image_remote_datasource_provider.dart b/modules/legacy/modules/device_management/lib/src/core/providers/background_image_remote_datasource_provider.dart
index a8991b20..6e951589 100644
--- a/modules/legacy/modules/device_management/lib/src/core/providers/background_image_remote_datasource_provider.dart
+++ b/modules/legacy/modules/device_management/lib/src/core/providers/background_image_remote_datasource_provider.dart
@@ -6,6 +6,6 @@ import '../data/datasources/background_image_remote_datasource_impl.dart';
 
 final backgroundImageRemoteDatasourceProvider =
     Provider<BackgroundImageRemoteDatasource>((ref) {
-      final questiaRepository = getIt<QuestiaRepository>();
-      return BackgroundImageRemoteDatasourceImpl(questiaRepository);
+      final saveFamilyRepository = getIt<SaveFamilyRepository>();
+      return BackgroundImageRemoteDatasourceImpl(saveFamilyRepository);
     });
diff --git a/modules/legacy/modules/device_management/lib/src/core/providers/contacts_remote_datasource_provider.dart b/modules/legacy/modules/device_management/lib/src/core/providers/contacts_remote_datasource_provider.dart
index 7b63d12d..55eef0e5 100644
--- a/modules/legacy/modules/device_management/lib/src/core/providers/contacts_remote_datasource_provider.dart
+++ b/modules/legacy/modules/device_management/lib/src/core/providers/contacts_remote_datasource_provider.dart
@@ -7,6 +7,6 @@ import '../data/datasources/contacts_remote_datasource_impl.dart';
 final contactsRemoteDatasourceProvider = Provider<ContactsRemoteDatasource>((
   ref,
 ) {
-  final questiaRepository = getIt<QuestiaRepository>();
-  return ContactsRemoteDatasourceImpl(questiaRepository);
+  final saveFamilyRepository = getIt<SaveFamilyRepository>();
+  return ContactsRemoteDatasourceImpl(saveFamilyRepository);
 });
diff --git a/modules/legacy/modules/device_management/lib/src/core/providers/health_remote_datasource_provider.dart b/modules/legacy/modules/device_management/lib/src/core/providers/health_remote_datasource_provider.dart
index 14942abe..384f276f 100644
--- a/modules/legacy/modules/device_management/lib/src/core/providers/health_remote_datasource_provider.dart
+++ b/modules/legacy/modules/device_management/lib/src/core/providers/health_remote_datasource_provider.dart
@@ -5,6 +5,6 @@ import '../data/datasources/health_remote_datasource.dart';
 import '../data/datasources/health_remote_datasource_impl.dart';
 
 final healthRemoteDatasourceProvider = Provider<HealthRemoteDatasource>((ref) {
-  final questiaRepository = getIt<QuestiaRepository>();
-  return HealthRemoteDatasourceImpl(questiaRepository);
+  final saveFamilyRepository = getIt<SaveFamilyRepository>();
+  return HealthRemoteDatasourceImpl(saveFamilyRepository);
 });
diff --git a/modules/legacy/modules/device_management/lib/src/core/providers/pictures_remote_datasource_provider.dart b/modules/legacy/modules/device_management/lib/src/core/providers/pictures_remote_datasource_provider.dart
index f6bd8496..41b8e5ec 100644
--- a/modules/legacy/modules/device_management/lib/src/core/providers/pictures_remote_datasource_provider.dart
+++ b/modules/legacy/modules/device_management/lib/src/core/providers/pictures_remote_datasource_provider.dart
@@ -7,6 +7,6 @@ import '../data/datasources/pictures_remote_datasource_impl.dart';
 final picturesRemoteDatasourceProvider = Provider<PicturesRemoteDatasource>((
   ref,
 ) {
-  final questiaRepository = getIt<QuestiaRepository>();
-  return PicturesRemoteDatasourceImpl(questiaRepository);
+  final saveFamilyRepository = getIt<SaveFamilyRepository>();
+  return PicturesRemoteDatasourceImpl(saveFamilyRepository);
 });
diff --git a/modules/legacy/modules/device_management/lib/src/core/providers/scheduled_activities_remote_datasource_provider.dart b/modules/legacy/modules/device_management/lib/src/core/providers/scheduled_activities_remote_datasource_provider.dart
index eac16f54..b034be67 100644
--- a/modules/legacy/modules/device_management/lib/src/core/providers/scheduled_activities_remote_datasource_provider.dart
+++ b/modules/legacy/modules/device_management/lib/src/core/providers/scheduled_activities_remote_datasource_provider.dart
@@ -6,6 +6,6 @@ import '../data/datasources/scheduled_activities_remote_datasource_impl.dart';
 
 final scheduledActivitiesRemoteDatasourceProvider =
     Provider<ScheduledActivitiesRemoteDatasource>((ref) {
-      final questiaRepository = getIt<QuestiaRepository>();
-      return ScheduledActivitiesRemoteDatasourceImpl(questiaRepository);
+      final saveFamilyRepository = getIt<SaveFamilyRepository>();
+      return ScheduledActivitiesRemoteDatasourceImpl(saveFamilyRepository);
     });
diff --git a/modules/legacy/modules/device_management/lib/src/core/providers/steps_remote_datasource_provider.dart b/modules/legacy/modules/device_management/lib/src/core/providers/steps_remote_datasource_provider.dart
index c3b6a29f..c5c1a444 100644
--- a/modules/legacy/modules/device_management/lib/src/core/providers/steps_remote_datasource_provider.dart
+++ b/modules/legacy/modules/device_management/lib/src/core/providers/steps_remote_datasource_provider.dart
@@ -5,6 +5,6 @@ import '../data/datasources/steps_remote_datasource.dart';
 import '../data/datasources/steps_remote_datasource_impl.dart';
 
 final stepsRemoteDatasourceProvider = Provider<StepsRemoteDatasource>((ref) {
-  final questiaRepository = getIt<QuestiaRepository>();
-  return StepsRemoteDatasourceImpl(questiaRepository);
+  final saveFamilyRepository = getIt<SaveFamilyRepository>();
+  return StepsRemoteDatasourceImpl(saveFamilyRepository);
 });
diff --git a/modules/legacy/modules/device_management/lib/src/features/call_history/data/call_history_datasource.dart b/modules/legacy/modules/device_management/lib/src/features/call_history/data/call_history_datasource.dart
index 176d9d13..55ceed3f 100644
--- a/modules/legacy/modules/device_management/lib/src/features/call_history/data/call_history_datasource.dart
+++ b/modules/legacy/modules/device_management/lib/src/features/call_history/data/call_history_datasource.dart
@@ -8,7 +8,7 @@ import 'call_history_response_model.dart';
 class CallHistoryDatasource {
   CallHistoryDatasource(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   Future<List<CallHistoryEntity>> getCallHistory({
     required String deviceIdentificator,
diff --git a/modules/legacy/modules/device_management/lib/src/features/call_history/data/call_history_datasource_provider.dart b/modules/legacy/modules/device_management/lib/src/features/call_history/data/call_history_datasource_provider.dart
index 0d34742d..d3f64a65 100644
--- a/modules/legacy/modules/device_management/lib/src/features/call_history/data/call_history_datasource_provider.dart
+++ b/modules/legacy/modules/device_management/lib/src/features/call_history/data/call_history_datasource_provider.dart
@@ -5,5 +5,5 @@ import 'package:sf_infrastructure/sf_infrastructure.dart';
 import 'call_history_datasource.dart';
 
 final callHistoryDatasourceProvider = Provider<CallHistoryDatasource>((ref) {
-  return CallHistoryDatasource(GetIt.I<QuestiaRepository>());
+  return CallHistoryDatasource(GetIt.I<SaveFamilyRepository>());
 });
diff --git a/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/auth_remote_datasource_impl.dart b/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/auth_remote_datasource_impl.dart
index 73822b37..ba7240eb 100644
--- a/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/auth_remote_datasource_impl.dart
+++ b/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/auth_remote_datasource_impl.dart
@@ -7,7 +7,7 @@ import 'auth_remote_datasource.dart';
 class LegacyAuthRemoteDatasourceImpl implements LegacyAuthRemoteDatasource {
   LegacyAuthRemoteDatasourceImpl(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   @override
   Future<void> requestPhoneCode({required String phone}) => safeCall(
diff --git a/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/device_setup_remote_datasource_impl.dart b/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/device_setup_remote_datasource_impl.dart
index de7374c1..3a57855e 100644
--- a/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/device_setup_remote_datasource_impl.dart
+++ b/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/device_setup_remote_datasource_impl.dart
@@ -6,7 +6,7 @@ class LegacyDeviceSetupRemoteDatasourceImpl
     implements LegacyDeviceSetupRemoteDatasource {
   LegacyDeviceSetupRemoteDatasourceImpl(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   @override
   Future<void> generateActivationKey({required String identificator}) async {
diff --git a/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/login_remote_datasource_impl.dart b/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/login_remote_datasource_impl.dart
index 2d181d34..6db4d517 100644
--- a/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/login_remote_datasource_impl.dart
+++ b/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/login_remote_datasource_impl.dart
@@ -6,7 +6,7 @@ import 'package:legacy_shared/legacy_shared.dart';
 class LegacyLoginRemoteDatasourceImpl implements LegacyLoginRemoteDatasource {
   const LegacyLoginRemoteDatasourceImpl(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   @override
   Future<LegacyLoginResponseModel> login({
diff --git a/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/sign_up_remote_datasource_impl.dart b/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/sign_up_remote_datasource_impl.dart
index 011cc198..21c9c861 100644
--- a/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/sign_up_remote_datasource_impl.dart
+++ b/modules/legacy/modules/legacy_auth/lib/src/core/data/datasource/sign_up_remote_datasource_impl.dart
@@ -8,7 +8,7 @@ import 'sign_up_remote_datasource.dart';
 class LegacySignUpRemoteDatasourceImpl implements LegacySignUpRemoteDatasource {
   const LegacySignUpRemoteDatasourceImpl(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   @override
   Future<LegacySignUpResponseModel> signUp({
diff --git a/modules/legacy/modules/legacy_auth/lib/src/core/providers/auth_remote_datasource_provider.dart b/modules/legacy/modules/legacy_auth/lib/src/core/providers/auth_remote_datasource_provider.dart
index f3a9a6ec..83c99285 100644
--- a/modules/legacy/modules/legacy_auth/lib/src/core/providers/auth_remote_datasource_provider.dart
+++ b/modules/legacy/modules/legacy_auth/lib/src/core/providers/auth_remote_datasource_provider.dart
@@ -5,7 +5,7 @@ import 'package:sf_infrastructure/sf_infrastructure.dart';
 
 final legacyAuthRemoteDatasourceProvider = Provider<LegacyAuthRemoteDatasource>(
   (ref) {
-    final questiaRepository = getIt<QuestiaRepository>();
-    return LegacyAuthRemoteDatasourceImpl(questiaRepository);
+    final saveFamilyRepository = getIt<SaveFamilyRepository>();
+    return LegacyAuthRemoteDatasourceImpl(saveFamilyRepository);
   },
 );
diff --git a/modules/legacy/modules/legacy_auth/lib/src/core/providers/device_setup_remote_datasource_provider.dart b/modules/legacy/modules/legacy_auth/lib/src/core/providers/device_setup_remote_datasource_provider.dart
index 0df23430..3c49a0d4 100644
--- a/modules/legacy/modules/legacy_auth/lib/src/core/providers/device_setup_remote_datasource_provider.dart
+++ b/modules/legacy/modules/legacy_auth/lib/src/core/providers/device_setup_remote_datasource_provider.dart
@@ -5,6 +5,6 @@ import 'package:legacy_auth/src/core/data/datasource/device_setup_remote_datasou
 
 final legacyDeviceSetupRemoteDatasourceProvider =
     Provider<LegacyDeviceSetupRemoteDatasource>((ref) {
-      final questiaRepository = getIt<QuestiaRepository>();
-      return LegacyDeviceSetupRemoteDatasourceImpl(questiaRepository);
+      final saveFamilyRepository = getIt<SaveFamilyRepository>();
+      return LegacyDeviceSetupRemoteDatasourceImpl(saveFamilyRepository);
     });
diff --git a/modules/legacy/modules/legacy_auth/lib/src/core/providers/login_remote_datasource_provider.dart b/modules/legacy/modules/legacy_auth/lib/src/core/providers/login_remote_datasource_provider.dart
index 2bc00a1b..b0d14d88 100644
--- a/modules/legacy/modules/legacy_auth/lib/src/core/providers/login_remote_datasource_provider.dart
+++ b/modules/legacy/modules/legacy_auth/lib/src/core/providers/login_remote_datasource_provider.dart
@@ -5,6 +5,6 @@ import 'package:legacy_auth/src/core/data/datasource/login_remote_datasource_imp
 
 final legacyLoginRemoteDatasourceProvider =
     Provider<LegacyLoginRemoteDatasource>((ref) {
-      final questiaRepository = getIt<QuestiaRepository>();
-      return LegacyLoginRemoteDatasourceImpl(questiaRepository);
+      final saveFamilyRepository = getIt<SaveFamilyRepository>();
+      return LegacyLoginRemoteDatasourceImpl(saveFamilyRepository);
     });
diff --git a/modules/legacy/modules/legacy_auth/lib/src/core/providers/sign_up_remote_datasource_provider.dart b/modules/legacy/modules/legacy_auth/lib/src/core/providers/sign_up_remote_datasource_provider.dart
index f32e3b03..b51c0ac3 100644
--- a/modules/legacy/modules/legacy_auth/lib/src/core/providers/sign_up_remote_datasource_provider.dart
+++ b/modules/legacy/modules/legacy_auth/lib/src/core/providers/sign_up_remote_datasource_provider.dart
@@ -5,6 +5,6 @@ import 'package:sf_infrastructure/sf_infrastructure.dart';
 
 final legacySignUpRemoteDatasourceProvider =
     Provider<LegacySignUpRemoteDatasource>((ref) {
-      final questiaRepository = getIt<QuestiaRepository>();
-      return LegacySignUpRemoteDatasourceImpl(questiaRepository);
+      final saveFamilyRepository = getIt<SaveFamilyRepository>();
+      return LegacySignUpRemoteDatasourceImpl(saveFamilyRepository);
     });
diff --git a/modules/legacy/modules/location/lib/src/core/data/datasource/location_remote_datasource_impl.dart b/modules/legacy/modules/location/lib/src/core/data/datasource/location_remote_datasource_impl.dart
index f63edd14..7ef4567f 100644
--- a/modules/legacy/modules/location/lib/src/core/data/datasource/location_remote_datasource_impl.dart
+++ b/modules/legacy/modules/location/lib/src/core/data/datasource/location_remote_datasource_impl.dart
@@ -22,7 +22,7 @@ import 'package:sf_infrastructure/sf_infrastructure.dart';
 class LocationRemoteDatasourceImpl implements LocationRemoteDatasource {
   LocationRemoteDatasourceImpl(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   @override
   Future<List<GeofenceEntity>> getGeofences({required String deviceId}) async {
diff --git a/modules/legacy/modules/location/lib/src/core/providers/location_remote_datasource_provider.dart b/modules/legacy/modules/location/lib/src/core/providers/location_remote_datasource_provider.dart
index 974c844a..4faa967e 100644
--- a/modules/legacy/modules/location/lib/src/core/providers/location_remote_datasource_provider.dart
+++ b/modules/legacy/modules/location/lib/src/core/providers/location_remote_datasource_provider.dart
@@ -6,6 +6,6 @@ import 'package:sf_infrastructure/sf_infrastructure.dart';
 final locationRemoteDatasourceProvider = Provider<LocationRemoteDatasource>((
   ref,
 ) {
-  final questiaRepository = getIt<QuestiaRepository>();
-  return LocationRemoteDatasourceImpl(questiaRepository);
+  final saveFamilyRepository = getIt<SaveFamilyRepository>();
+  return LocationRemoteDatasourceImpl(saveFamilyRepository);
 });
diff --git a/modules/legacy/modules/settings/lib/src/core/data/datasources/alarm_remote_datasource_impl.dart b/modules/legacy/modules/settings/lib/src/core/data/datasources/alarm_remote_datasource_impl.dart
index db51e808..de69e8fd 100644
--- a/modules/legacy/modules/settings/lib/src/core/data/datasources/alarm_remote_datasource_impl.dart
+++ b/modules/legacy/modules/settings/lib/src/core/data/datasources/alarm_remote_datasource_impl.dart
@@ -9,7 +9,7 @@ import 'package:sf_infrastructure/sf_infrastructure.dart';
 class AlarmRemoteDatasourceImpl implements AlarmRemoteDatasource {
   AlarmRemoteDatasourceImpl(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   @override
   Future<GetAlarmsResponseModel> getAlarms({required String deviceId}) async {
diff --git a/modules/legacy/modules/settings/lib/src/core/data/datasources/contact_lists_remote_datasource_impl.dart b/modules/legacy/modules/settings/lib/src/core/data/datasources/contact_lists_remote_datasource_impl.dart
index e8e51b60..79151a12 100644
--- a/modules/legacy/modules/settings/lib/src/core/data/datasources/contact_lists_remote_datasource_impl.dart
+++ b/modules/legacy/modules/settings/lib/src/core/data/datasources/contact_lists_remote_datasource_impl.dart
@@ -10,7 +10,7 @@ import 'contact_lists_remote_datasource.dart';
 class ContactListsRemoteDatasourceImpl implements ContactListsRemoteDatasource {
   ContactListsRemoteDatasourceImpl(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   @override
   Future<GetContactListsResponseModel> getContactLists({
diff --git a/modules/legacy/modules/settings/lib/src/core/data/datasources/settings_remote_datasource_impl.dart b/modules/legacy/modules/settings/lib/src/core/data/datasources/settings_remote_datasource_impl.dart
index b95b8b10..023f183f 100644
--- a/modules/legacy/modules/settings/lib/src/core/data/datasources/settings_remote_datasource_impl.dart
+++ b/modules/legacy/modules/settings/lib/src/core/data/datasources/settings_remote_datasource_impl.dart
@@ -5,5 +5,5 @@ class SettingsRemoteDatasourceImpl implements SettingsRemoteDatasource {
   SettingsRemoteDatasourceImpl(this._repository);
 
   // ignore: unused_field
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 }
diff --git a/modules/legacy/modules/settings/lib/src/core/data/datasources/wifi_remote_datasource_impl.dart b/modules/legacy/modules/settings/lib/src/core/data/datasources/wifi_remote_datasource_impl.dart
index 8240028d..c67349c1 100644
--- a/modules/legacy/modules/settings/lib/src/core/data/datasources/wifi_remote_datasource_impl.dart
+++ b/modules/legacy/modules/settings/lib/src/core/data/datasources/wifi_remote_datasource_impl.dart
@@ -9,7 +9,7 @@ import 'wifi_remote_datasource.dart';
 class WifiRemoteDatasourceImpl implements WifiRemoteDatasource {
   WifiRemoteDatasourceImpl(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   @override
   Future<GetWifiNetworksResponseModel> getWifiNetworks({
diff --git a/modules/legacy/modules/settings/lib/src/core/providers/alarm_remote_datasource_provider.dart b/modules/legacy/modules/settings/lib/src/core/providers/alarm_remote_datasource_provider.dart
index dc6391e0..5fd3d323 100644
--- a/modules/legacy/modules/settings/lib/src/core/providers/alarm_remote_datasource_provider.dart
+++ b/modules/legacy/modules/settings/lib/src/core/providers/alarm_remote_datasource_provider.dart
@@ -4,6 +4,6 @@ import 'package:settings/src/core/data/datasources/alarm_remote_datasource_impl.
 import 'package:sf_infrastructure/sf_infrastructure.dart';
 
 final alarmRemoteDatasourceProvider = Provider<AlarmRemoteDatasource>((ref) {
-  final questiaRepository = getIt<QuestiaRepository>();
-  return AlarmRemoteDatasourceImpl(questiaRepository);
+  final saveFamilyRepository = getIt<SaveFamilyRepository>();
+  return AlarmRemoteDatasourceImpl(saveFamilyRepository);
 });
diff --git a/modules/legacy/modules/settings/lib/src/core/providers/contact_lists_remote_datasource_provider.dart b/modules/legacy/modules/settings/lib/src/core/providers/contact_lists_remote_datasource_provider.dart
index f9968deb..70c9e83c 100644
--- a/modules/legacy/modules/settings/lib/src/core/providers/contact_lists_remote_datasource_provider.dart
+++ b/modules/legacy/modules/settings/lib/src/core/providers/contact_lists_remote_datasource_provider.dart
@@ -5,6 +5,6 @@ import 'package:sf_infrastructure/sf_infrastructure.dart';
 
 final contactListsRemoteDatasourceProvider =
     Provider<ContactListsRemoteDatasource>((ref) {
-      final questiaRepository = getIt<QuestiaRepository>();
-      return ContactListsRemoteDatasourceImpl(questiaRepository);
+      final saveFamilyRepository = getIt<SaveFamilyRepository>();
+      return ContactListsRemoteDatasourceImpl(saveFamilyRepository);
     });
diff --git a/modules/legacy/modules/settings/lib/src/core/providers/settings_remote_datasource_provider.dart b/modules/legacy/modules/settings/lib/src/core/providers/settings_remote_datasource_provider.dart
index 3af260e4..e2d39746 100644
--- a/modules/legacy/modules/settings/lib/src/core/providers/settings_remote_datasource_provider.dart
+++ b/modules/legacy/modules/settings/lib/src/core/providers/settings_remote_datasource_provider.dart
@@ -6,6 +6,6 @@ import 'package:sf_infrastructure/sf_infrastructure.dart';
 final settingsRemoteDatasourceProvider = Provider<SettingsRemoteDatasource>((
   ref,
 ) {
-  final questiaRepository = getIt<QuestiaRepository>();
-  return SettingsRemoteDatasourceImpl(questiaRepository);
+  final saveFamilyRepository = getIt<SaveFamilyRepository>();
+  return SettingsRemoteDatasourceImpl(saveFamilyRepository);
 });
diff --git a/modules/legacy/modules/settings/lib/src/core/providers/wifi_remote_datasource_provider.dart b/modules/legacy/modules/settings/lib/src/core/providers/wifi_remote_datasource_provider.dart
index c0215f09..f4b51da8 100644
--- a/modules/legacy/modules/settings/lib/src/core/providers/wifi_remote_datasource_provider.dart
+++ b/modules/legacy/modules/settings/lib/src/core/providers/wifi_remote_datasource_provider.dart
@@ -6,5 +6,5 @@ import '../data/datasources/wifi_remote_datasource.dart';
 import '../data/datasources/wifi_remote_datasource_impl.dart';
 
 final wifiRemoteDatasourceProvider = Provider<WifiRemoteDatasource>((ref) {
-  return WifiRemoteDatasourceImpl(GetIt.I<QuestiaRepository>());
+  return WifiRemoteDatasourceImpl(GetIt.I<SaveFamilyRepository>());
 });
diff --git a/modules/legacy/packages/legacy_shared/lib/src/data/datasources/commands_remote_datasource_impl.dart b/modules/legacy/packages/legacy_shared/lib/src/data/datasources/commands_remote_datasource_impl.dart
index 77d0db72..789ef5d7 100644
--- a/modules/legacy/packages/legacy_shared/lib/src/data/datasources/commands_remote_datasource_impl.dart
+++ b/modules/legacy/packages/legacy_shared/lib/src/data/datasources/commands_remote_datasource_impl.dart
@@ -7,7 +7,7 @@ import 'commands_remote_datatsource.dart';
 class CommandsRemoteDatasourceImpl implements CommandsRemoteDatasource {
   const CommandsRemoteDatasourceImpl(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   @override
   Future<void> send({required SendCommandRequestModel request}) async {
diff --git a/modules/legacy/packages/legacy_shared/lib/src/data/datasources/device_settings_update_datasource.dart b/modules/legacy/packages/legacy_shared/lib/src/data/datasources/device_settings_update_datasource.dart
index f51b94d1..1de9f2bf 100644
--- a/modules/legacy/packages/legacy_shared/lib/src/data/datasources/device_settings_update_datasource.dart
+++ b/modules/legacy/packages/legacy_shared/lib/src/data/datasources/device_settings_update_datasource.dart
@@ -7,7 +7,7 @@ import '../../utils/dio_error_mapper.dart';
 class DeviceSettingsUpdateDatasource {
   DeviceSettingsUpdateDatasource(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   Future<void> updateDeviceSettings({
     required DeviceEntity device,
diff --git a/modules/legacy/packages/legacy_shared/lib/src/data/datasources/devices_remote_datasource_impl.dart b/modules/legacy/packages/legacy_shared/lib/src/data/datasources/devices_remote_datasource_impl.dart
index d2268aa1..97ad1dc5 100644
--- a/modules/legacy/packages/legacy_shared/lib/src/data/datasources/devices_remote_datasource_impl.dart
+++ b/modules/legacy/packages/legacy_shared/lib/src/data/datasources/devices_remote_datasource_impl.dart
@@ -7,7 +7,7 @@ import 'devices_remote_datasource.dart';
 class DevicesRemoteDatasourceImpl implements DevicesRemoteDatasource {
   DevicesRemoteDatasourceImpl(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   @override
   Future<List<DeviceEntity>> getDevices() async {
diff --git a/modules/legacy/packages/legacy_shared/lib/src/providers/commands_remote_datasource_provider.dart b/modules/legacy/packages/legacy_shared/lib/src/providers/commands_remote_datasource_provider.dart
index 79145ad4..2bbb93b9 100644
--- a/modules/legacy/packages/legacy_shared/lib/src/providers/commands_remote_datasource_provider.dart
+++ b/modules/legacy/packages/legacy_shared/lib/src/providers/commands_remote_datasource_provider.dart
@@ -7,6 +7,6 @@ import '../data/datasources/commands_remote_datatsource.dart';
 final commandsRemoteDatasourceProvider = Provider<CommandsRemoteDatasource>((
   ref,
 ) {
-  final questiaRepository = getIt<QuestiaRepository>();
-  return CommandsRemoteDatasourceImpl(questiaRepository);
+  final saveFamilyRepository = getIt<SaveFamilyRepository>();
+  return CommandsRemoteDatasourceImpl(saveFamilyRepository);
 });
diff --git a/modules/legacy/packages/legacy_shared/lib/src/providers/device_settings_update_provider.dart b/modules/legacy/packages/legacy_shared/lib/src/providers/device_settings_update_provider.dart
index 217069ce..7dd80d93 100644
--- a/modules/legacy/packages/legacy_shared/lib/src/providers/device_settings_update_provider.dart
+++ b/modules/legacy/packages/legacy_shared/lib/src/providers/device_settings_update_provider.dart
@@ -7,5 +7,5 @@ import '../data/datasources/device_settings_update_datasource.dart';
 final deviceSettingsUpdateProvider = Provider<DeviceSettingsUpdateDatasource>((
   ref,
 ) {
-  return DeviceSettingsUpdateDatasource(GetIt.I<QuestiaRepository>());
+  return DeviceSettingsUpdateDatasource(GetIt.I<SaveFamilyRepository>());
 });
diff --git a/modules/legacy/packages/legacy_shared/lib/src/providers/devices_remote_datasource_repository_provider.dart b/modules/legacy/packages/legacy_shared/lib/src/providers/devices_remote_datasource_repository_provider.dart
index e2ba7a9b..9ad14d1d 100644
--- a/modules/legacy/packages/legacy_shared/lib/src/providers/devices_remote_datasource_repository_provider.dart
+++ b/modules/legacy/packages/legacy_shared/lib/src/providers/devices_remote_datasource_repository_provider.dart
@@ -7,6 +7,6 @@ import '../data/datasources/devices_remote_datasource_impl.dart';
 final devicesRemoteDatasourceProvider = Provider<DevicesRemoteDatasource>((
   ref,
 ) {
-  final questiaRepository = getIt<QuestiaRepository>();
-  return DevicesRemoteDatasourceImpl(questiaRepository);
+  final saveFamilyRepository = getIt<SaveFamilyRepository>();
+  return DevicesRemoteDatasourceImpl(saveFamilyRepository);
 });
diff --git a/modules/payment/modules/auth/lib/src/core/data/datasource/auth_remote_datasource_impl.dart b/modules/payment/modules/auth/lib/src/core/data/datasource/auth_remote_datasource_impl.dart
index 02ad06b2..842898da 100644
--- a/modules/payment/modules/auth/lib/src/core/data/datasource/auth_remote_datasource_impl.dart
+++ b/modules/payment/modules/auth/lib/src/core/data/datasource/auth_remote_datasource_impl.dart
@@ -14,7 +14,7 @@ import 'auth_remote_datasource.dart';
 class AuthRemoteDatasourceImpl implements AuthRemoteDatasource {
   AuthRemoteDatasourceImpl(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   @override
   Future<void> requestPhoneCode({required String phone}) async {
diff --git a/modules/payment/modules/auth/lib/src/core/providers/auth_remote_datasource_provider.dart b/modules/payment/modules/auth/lib/src/core/providers/auth_remote_datasource_provider.dart
index e4404b71..b8757f57 100644
--- a/modules/payment/modules/auth/lib/src/core/providers/auth_remote_datasource_provider.dart
+++ b/modules/payment/modules/auth/lib/src/core/providers/auth_remote_datasource_provider.dart
@@ -4,6 +4,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:sf_infrastructure/sf_infrastructure.dart';
 
 final authRemoteDatasourceProvider = Provider<AuthRemoteDatasource>((ref) {
-  final questiaRepository = getIt<QuestiaRepository>();
-  return AuthRemoteDatasourceImpl(questiaRepository);
+  final saveFamilyRepository = getIt<SaveFamilyRepository>();
+  return AuthRemoteDatasourceImpl(saveFamilyRepository);
 });
diff --git a/modules/splash/lib/src/splash_builder.dart b/modules/splash/lib/src/splash_builder.dart
index eda63fec..933e8641 100644
--- a/modules/splash/lib/src/splash_builder.dart
+++ b/modules/splash/lib/src/splash_builder.dart
@@ -18,7 +18,7 @@ class SplashBuilder {
 
   Page<void> buildPage(BuildContext context, GoRouterState state) {
     final navigationContract = GetIt.I<NavigationContract>();
-    final remote = UserRemoteDatasourceImpl(GetIt.I<QuestiaRepository>());
+    final remote = UserRemoteDatasourceImpl(GetIt.I<SaveFamilyRepository>());
     final userRepository = UserRepositoryImpl(remote);
     final checkSessionUseCase = CheckSessionUseCaseImpl(userRepository);
 
diff --git a/packages/payments/lib/src/core/data/datasource/hipay_remote_datasource_impl.dart b/packages/payments/lib/src/core/data/datasource/hipay_remote_datasource_impl.dart
index b0840dec..568a4920 100644
--- a/packages/payments/lib/src/core/data/datasource/hipay_remote_datasource_impl.dart
+++ b/packages/payments/lib/src/core/data/datasource/hipay_remote_datasource_impl.dart
@@ -10,7 +10,7 @@ import 'hipay_remote_datasource.dart';
 class HiPayRemoteDatasourceImpl implements HiPayRemoteDatasource {
   HiPayRemoteDatasourceImpl(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   @override
   Future<TopupCardsResponseModel> topupCards() async {
diff --git a/packages/payments/lib/src/core/providers/hipay_remote_datasource_provider.dart b/packages/payments/lib/src/core/providers/hipay_remote_datasource_provider.dart
index 0046dc62..f045aebd 100644
--- a/packages/payments/lib/src/core/providers/hipay_remote_datasource_provider.dart
+++ b/packages/payments/lib/src/core/providers/hipay_remote_datasource_provider.dart
@@ -4,6 +4,6 @@ import 'package:payments/src/core/data/datasource/hipay_remote_datasource_impl.d
 import 'package:sf_infrastructure/sf_infrastructure.dart';
 
 final hipayRemoteDatasourceProvider = Provider<HiPayRemoteDatasource>((ref) {
-  final questiaRepository = getIt<QuestiaRepository>();
-  return HiPayRemoteDatasourceImpl(questiaRepository);
+  final saveFamilyRepository = getIt<SaveFamilyRepository>();
+  return HiPayRemoteDatasourceImpl(saveFamilyRepository);
 });
diff --git a/packages/sf_infrastructure/lib/configure_dependencies.dart b/packages/sf_infrastructure/lib/configure_dependencies.dart
index 7001162f..e2450dc1 100644
--- a/packages/sf_infrastructure/lib/configure_dependencies.dart
+++ b/packages/sf_infrastructure/lib/configure_dependencies.dart
@@ -6,11 +6,11 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'src/network/dio_client.dart';
 import 'src/network/treezor_token_interceptor.dart';
 import 'src/env/env_contract.dart';
-import 'src/api/questia_api.dart';
-import 'src/repositories/questia_repository_impl.dart';
-import 'src/repositories/questia_repository.dart';
+import 'src/api/save_family_api.dart';
+import 'src/repositories/save_family_repository_impl.dart';
+import 'src/repositories/save_family_repository.dart';
 
-export 'src/repositories/questia_repository.dart';
+export 'src/repositories/save_family_repository.dart';
 
 final getIt = GetIt.instance;
 
@@ -40,9 +40,9 @@ Future<void> configureDependencies(
 
   getIt.registerLazySingleton<CookieJar>(() => cookieJar);
   getIt.registerLazySingleton<Dio>(() => dio);
-  getIt.registerLazySingleton<QuestiaApi>(() => QuestiaApi(getIt<Dio>()));
-  getIt.registerLazySingleton<QuestiaRepository>(
-    () => QuestiaRepositoryImpl(getIt<QuestiaApi>()),
+  getIt.registerLazySingleton<SaveFamilyApi>(() => SaveFamilyApi(getIt<Dio>()));
+  getIt.registerLazySingleton<SaveFamilyRepository>(
+    () => SaveFamilyRepositoryImpl(getIt<SaveFamilyApi>()),
   );
 }
 
diff --git a/packages/sf_infrastructure/lib/src/api/questia_api.dart b/packages/sf_infrastructure/lib/src/api/save_family_api.dart
similarity index 97%
rename from packages/sf_infrastructure/lib/src/api/questia_api.dart
rename to packages/sf_infrastructure/lib/src/api/save_family_api.dart
index dd63b9aa..70a005f2 100644
--- a/packages/sf_infrastructure/lib/src/api/questia_api.dart
+++ b/packages/sf_infrastructure/lib/src/api/save_family_api.dart
@@ -1,10 +1,10 @@
 import 'package:dio/dio.dart';
 import 'dart:developer' show log;
 
-class QuestiaApi {
+class SaveFamilyApi {
   final Dio _dio;
 
-  QuestiaApi(this._dio);
+  SaveFamilyApi(this._dio);
 
   Future<Response<T>> get<T>(
     String path, {
diff --git a/packages/sf_infrastructure/lib/src/repositories/questia_repository.dart b/packages/sf_infrastructure/lib/src/repositories/save_family_repository.dart
similarity index 92%
rename from packages/sf_infrastructure/lib/src/repositories/questia_repository.dart
rename to packages/sf_infrastructure/lib/src/repositories/save_family_repository.dart
index fb0b6727..c44173c4 100644
--- a/packages/sf_infrastructure/lib/src/repositories/questia_repository.dart
+++ b/packages/sf_infrastructure/lib/src/repositories/save_family_repository.dart
@@ -1,6 +1,6 @@
 import 'package:dio/dio.dart';
 
-abstract class QuestiaRepository {
+abstract class SaveFamilyRepository {
   Future<Response<T>> get<T>(
     String path, {
     Map<String, dynamic>? queryParameters,
diff --git a/packages/sf_infrastructure/lib/src/repositories/questia_repository_impl.dart b/packages/sf_infrastructure/lib/src/repositories/save_family_repository_impl.dart
similarity index 80%
rename from packages/sf_infrastructure/lib/src/repositories/questia_repository_impl.dart
rename to packages/sf_infrastructure/lib/src/repositories/save_family_repository_impl.dart
index 15fcdebb..a90ff6c5 100644
--- a/packages/sf_infrastructure/lib/src/repositories/questia_repository_impl.dart
+++ b/packages/sf_infrastructure/lib/src/repositories/save_family_repository_impl.dart
@@ -1,12 +1,12 @@
 import 'package:dio/dio.dart';
 
-import '../api/questia_api.dart';
-import 'questia_repository.dart';
+import '../api/save_family_api.dart';
+import 'save_family_repository.dart';
 
-class QuestiaRepositoryImpl implements QuestiaRepository {
-  final QuestiaApi _api;
+class SaveFamilyRepositoryImpl implements SaveFamilyRepository {
+  final SaveFamilyApi _api;
 
-  QuestiaRepositoryImpl(this._api);
+  SaveFamilyRepositoryImpl(this._api);
 
   @override
   Future<Response<T>> get<T>(
diff --git a/packages/sf_shared/lib/src/data/datasource/treezor_remote_data_source_impl.dart b/packages/sf_shared/lib/src/data/datasource/treezor_remote_data_source_impl.dart
index 362b837e..e915493f 100644
--- a/packages/sf_shared/lib/src/data/datasource/treezor_remote_data_source_impl.dart
+++ b/packages/sf_shared/lib/src/data/datasource/treezor_remote_data_source_impl.dart
@@ -19,7 +19,7 @@ import 'treezor_remote_data_source.dart';
 class TreezorRemoteDatasourceImpl implements TreezorRemoteDatasource {
   TreezorRemoteDatasourceImpl(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   @override
   Future<ScaWalletsResponseModel> scaWallets() async {
diff --git a/packages/sf_shared/lib/src/data/datasource/user_remote_datasource_impl.dart b/packages/sf_shared/lib/src/data/datasource/user_remote_datasource_impl.dart
index 3189dd76..4ba4057e 100644
--- a/packages/sf_shared/lib/src/data/datasource/user_remote_datasource_impl.dart
+++ b/packages/sf_shared/lib/src/data/datasource/user_remote_datasource_impl.dart
@@ -10,7 +10,7 @@ import 'user_remote_datasource.dart';
 class UserRemoteDatasourceImpl implements UserRemoteDatasource {
   UserRemoteDatasourceImpl(this._repository);
 
-  final QuestiaRepository _repository;
+  final SaveFamilyRepository _repository;
 
   @override
   Future<UserModel> getUserInfo() async {
diff --git a/packages/sf_shared/lib/src/providers/treezor_remote_datasource_provider.dart b/packages/sf_shared/lib/src/providers/treezor_remote_datasource_provider.dart
index a246c93f..1b669fb8 100644
--- a/packages/sf_shared/lib/src/providers/treezor_remote_datasource_provider.dart
+++ b/packages/sf_shared/lib/src/providers/treezor_remote_datasource_provider.dart
@@ -6,6 +6,6 @@ import 'package:sf_shared/src/data/datasource/treezor_remote_data_source_impl.da
 final treezorRemoteDatasourceProvider = Provider<TreezorRemoteDatasource>((
   ref,
 ) {
-  final questiaRepository = getIt<QuestiaRepository>();
-  return TreezorRemoteDatasourceImpl(questiaRepository);
+  final saveFamilyRepository = getIt<SaveFamilyRepository>();
+  return TreezorRemoteDatasourceImpl(saveFamilyRepository);
 });
diff --git a/packages/sf_shared/lib/src/providers/user_repository_provider.dart b/packages/sf_shared/lib/src/providers/user_repository_provider.dart
index 8f184b7c..f9c3d5dd 100644
--- a/packages/sf_shared/lib/src/providers/user_repository_provider.dart
+++ b/packages/sf_shared/lib/src/providers/user_repository_provider.dart
@@ -6,7 +6,7 @@ import 'package:sf_shared/src/data/repositories/user_repository_impl.dart';
 import 'package:sf_shared/src/domain/repositories/user_repository.dart';
 
 final userRepositoryProvider = Provider<UserRepository>((ref) {
-  final questiaRepository = GetIt.I<QuestiaRepository>();
-  final remote = UserRemoteDatasourceImpl(questiaRepository);
+  final saveFamilyRepository = GetIt.I<SaveFamilyRepository>();
+  final remote = UserRemoteDatasourceImpl(saveFamilyRepository);
   return UserRepositoryImpl(remote);
 });