diff --git a/frontend/src/components/domain/onboarding/steps/DataProcessingStep.tsx b/frontend/src/components/domain/onboarding/steps/DataProcessingStep.tsx
index 65fc940e..c53b455e 100644
--- a/frontend/src/components/domain/onboarding/steps/DataProcessingStep.tsx
+++ b/frontend/src/components/domain/onboarding/steps/DataProcessingStep.tsx
@@ -6,7 +6,7 @@ import { useModal } from '../../../../hooks/ui/useModal';
 import { useToast } from '../../../../hooks/ui/useToast';
 import { useOnboarding } from '../../../../hooks/business/onboarding';
 import { useAuthUser, useAuthLoading } from '../../../../stores/auth.store';
-import { useCurrentTenant, useTenantLoading } from '../../../../stores/tenant.store';
+import { useCurrentTenant, useTenantLoading } from '../../../../stores';
 
 type ProcessingStage = 'upload' | 'validating' | 'analyzing' | 'completed' | 'error';
 
diff --git a/frontend/src/components/domain/onboarding/steps/MLTrainingStep.tsx b/frontend/src/components/domain/onboarding/steps/MLTrainingStep.tsx
index be349e96..4504c0b3 100644
--- a/frontend/src/components/domain/onboarding/steps/MLTrainingStep.tsx
+++ b/frontend/src/components/domain/onboarding/steps/MLTrainingStep.tsx
@@ -4,7 +4,7 @@ import { Button, Card, Badge } from '../../../ui';
 import { OnboardingStepProps } from '../OnboardingWizard';
 import { useOnboarding } from '../../../../hooks/business/onboarding';
 import { useAuthUser } from '../../../../stores/auth.store';
-import { useCurrentTenant } from '../../../../stores/tenant.store';
+import { useCurrentTenant } from '../../../../stores';
 
 // Type definitions for training messages (will be moved to API types later)
 interface TrainingProgressMessage {
diff --git a/frontend/src/components/domain/onboarding/steps/SuppliersStep.tsx b/frontend/src/components/domain/onboarding/steps/SuppliersStep.tsx
index 257cf602..21cd5d89 100644
--- a/frontend/src/components/domain/onboarding/steps/SuppliersStep.tsx
+++ b/frontend/src/components/domain/onboarding/steps/SuppliersStep.tsx
@@ -5,7 +5,7 @@ import { OnboardingStepProps } from '../OnboardingWizard';
 import { useModal } from '../../../../hooks/ui/useModal';
 import { useToast } from '../../../../hooks/ui/useToast';
 import { useAuthUser } from '../../../../stores/auth.store';
-import { useCurrentTenant } from '../../../../stores/tenant.store';
+import { useCurrentTenant } from '../../../../stores';
 // TODO: Import procurement service from new API when available
 
 // Frontend supplier interface that matches the form needs
diff --git a/frontend/src/pages/app/settings/subscription/SubscriptionPage.tsx b/frontend/src/pages/app/settings/subscription/SubscriptionPage.tsx
index c48b008d..e504e978 100644
--- a/frontend/src/pages/app/settings/subscription/SubscriptionPage.tsx
+++ b/frontend/src/pages/app/settings/subscription/SubscriptionPage.tsx
@@ -31,7 +31,7 @@ import {
   ExternalLink
 } from 'lucide-react';
 import { useAuthUser } from '../../../../stores/auth.store';
-import { useCurrentTenant } from '../../../../stores/tenant.store';
+import { useCurrentTenant } from '../../../../stores';
 import { useToast } from '../../../../hooks/ui/useToast';
 import { 
   subscriptionService, 
diff --git a/frontend/src/pages/app/settings/subscription/SubscriptionPageOld.tsx b/frontend/src/pages/app/settings/subscription/SubscriptionPageOld.tsx
index ecae98ff..a241dd53 100644
--- a/frontend/src/pages/app/settings/subscription/SubscriptionPageOld.tsx
+++ b/frontend/src/pages/app/settings/subscription/SubscriptionPageOld.tsx
@@ -31,7 +31,7 @@ import {
   ExternalLink
 } from 'lucide-react';
 import { useAuth } from '../../../../hooks/api/useAuth';
-import { useCurrentTenant } from '../../../../stores/tenant.store';
+import { useCurrentTenant } from '../../../../stores';
 import { useToast } from '../../../../hooks/ui/useToast';
 import { 
   subscriptionService,