diff --git a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html
index 462dd37fd..9cae03e2c 100644
--- a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html
+++ b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html
@@ -86,7 +86,7 @@
           <ion-icon name="swap-vertical-outline" />
           <div class="d-none d-sm-block ml-2" i18n>Activities</div>
         </ng-template>
-        <gf-activities-table-lazy
+        <gf-activities-table
           [baseCurrency]="user?.settings?.baseCurrency"
           [dataSource]="dataSource"
           [deviceType]="data.deviceType"
diff --git a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.module.ts b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.module.ts
index 8465be470..569f0c888 100644
--- a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.module.ts
+++ b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.module.ts
@@ -8,7 +8,7 @@ import { GfDialogHeaderModule } from '@ghostfolio/client/components/dialog-heade
 import { GfHoldingsTableModule } from '@ghostfolio/ui/holdings-table/holdings-table.module';
 import { GfInvestmentChartModule } from '@ghostfolio/client/components/investment-chart/investment-chart.module';
 import { GfAccountBalancesModule } from '@ghostfolio/ui/account-balances/account-balances.module';
-import { GfActivitiesTableLazyModule } from '@ghostfolio/ui/activities-table-lazy/activities-table-lazy.module';
+import { GfActivitiesTableModule } from '@ghostfolio/ui/activities-table/activities-table.module';
 import { GfValueModule } from '@ghostfolio/ui/value';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 
@@ -19,7 +19,7 @@ import { AccountDetailDialog } from './account-detail-dialog.component';
   imports: [
     CommonModule,
     GfAccountBalancesModule,
-    GfActivitiesTableLazyModule,
+    GfActivitiesTableModule,
     GfDialogFooterModule,
     GfDialogHeaderModule,
     GfHoldingsTableModule,
diff --git a/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html b/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html
index 2830f37dd..9f88977ac 100644
--- a/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html
+++ b/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html
@@ -249,7 +249,7 @@
     <div class="row" [ngClass]="{ 'd-none': !activities?.length }">
       <div class="col mb-3">
         <div class="h5 mb-0" i18n>Activities</div>
-        <gf-activities-table-lazy
+        <gf-activities-table
           [baseCurrency]="data.baseCurrency"
           [dataSource]="dataSource"
           [deviceType]="data.deviceType"
diff --git a/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.module.ts b/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.module.ts
index bc03e8190..4c9a4a923 100644
--- a/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.module.ts
+++ b/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.module.ts
@@ -5,7 +5,7 @@ import { MatChipsModule } from '@angular/material/chips';
 import { MatDialogModule } from '@angular/material/dialog';
 import { GfDialogFooterModule } from '@ghostfolio/client/components/dialog-footer/dialog-footer.module';
 import { GfDialogHeaderModule } from '@ghostfolio/client/components/dialog-header/dialog-header.module';
-import { GfActivitiesTableLazyModule } from '@ghostfolio/ui/activities-table-lazy/activities-table-lazy.module';
+import { GfActivitiesTableModule } from '@ghostfolio/ui/activities-table/activities-table.module';
 import { GfDataProviderCreditsModule } from '@ghostfolio/ui/data-provider-credits/data-provider-credits.module';
 import { GfLineChartModule } from '@ghostfolio/ui/line-chart/line-chart.module';
 import { GfPortfolioProportionChartModule } from '@ghostfolio/ui/portfolio-proportion-chart/portfolio-proportion-chart.module';
@@ -18,7 +18,7 @@ import { PositionDetailDialog } from './position-detail-dialog.component';
   declarations: [PositionDetailDialog],
   imports: [
     CommonModule,
-    GfActivitiesTableLazyModule,
+    GfActivitiesTableModule,
     GfDataProviderCreditsModule,
     GfDialogFooterModule,
     GfDialogHeaderModule,
diff --git a/apps/client/src/app/pages/portfolio/activities/activities-page.html b/apps/client/src/app/pages/portfolio/activities/activities-page.html
index 9422f0b0d..284893c49 100644
--- a/apps/client/src/app/pages/portfolio/activities/activities-page.html
+++ b/apps/client/src/app/pages/portfolio/activities/activities-page.html
@@ -2,7 +2,7 @@
   <div class="mb-3 row">
     <div class="col">
       <h1 class="d-none d-sm-block h3 mb-3 text-center" i18n>Activities</h1>
-      <gf-activities-table-lazy
+      <gf-activities-table
         [baseCurrency]="user?.settings?.baseCurrency"
         [dataSource]="dataSource"
         [deviceType]="deviceType"
diff --git a/apps/client/src/app/pages/portfolio/activities/activities-page.module.ts b/apps/client/src/app/pages/portfolio/activities/activities-page.module.ts
index cec6e7e89..28d4437a9 100644
--- a/apps/client/src/app/pages/portfolio/activities/activities-page.module.ts
+++ b/apps/client/src/app/pages/portfolio/activities/activities-page.module.ts
@@ -4,7 +4,7 @@ import { MatButtonModule } from '@angular/material/button';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { RouterModule } from '@angular/router';
 import { ImportActivitiesService } from '@ghostfolio/client/services/import-activities.service';
-import { GfActivitiesTableLazyModule } from '@ghostfolio/ui/activities-table-lazy/activities-table-lazy.module';
+import { GfActivitiesTableModule } from '@ghostfolio/ui/activities-table/activities-table.module';
 
 import { ActivitiesPageRoutingModule } from './activities-page-routing.module';
 import { ActivitiesPageComponent } from './activities-page.component';
@@ -16,7 +16,7 @@ import { GfImportActivitiesDialogModule } from './import-activities-dialog/impor
   imports: [
     ActivitiesPageRoutingModule,
     CommonModule,
-    GfActivitiesTableLazyModule,
+    GfActivitiesTableModule,
     GfCreateOrUpdateActivityDialogModule,
     GfImportActivitiesDialogModule,
     MatButtonModule,
diff --git a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html
index 1abb74cf5..224974deb 100644
--- a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html
+++ b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html
@@ -116,7 +116,7 @@
       </ng-template>
       <div class="pt-3">
         <ng-container *ngIf="errorMessages?.length === 0; else errorMessage">
-          <gf-activities-table-lazy
+          <gf-activities-table
             *ngIf="importStep === 1"
             [baseCurrency]="data?.user?.settings?.baseCurrency"
             [dataSource]="dataSource"
diff --git a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.module.ts b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.module.ts
index a40d295ba..23eeda312 100644
--- a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.module.ts
+++ b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.module.ts
@@ -12,7 +12,7 @@ import { GfDialogFooterModule } from '@ghostfolio/client/components/dialog-foote
 import { GfDialogHeaderModule } from '@ghostfolio/client/components/dialog-header/dialog-header.module';
 import { GfFileDropModule } from '@ghostfolio/client/directives/file-drop/file-drop.module';
 import { GfSymbolModule } from '@ghostfolio/client/pipes/symbol/symbol.module';
-import { GfActivitiesTableLazyModule } from '@ghostfolio/ui/activities-table-lazy/activities-table-lazy.module';
+import { GfActivitiesTableModule } from '@ghostfolio/ui/activities-table/activities-table.module';
 
 import { ImportActivitiesDialog } from './import-activities-dialog.component';
 
@@ -21,7 +21,7 @@ import { ImportActivitiesDialog } from './import-activities-dialog.component';
   imports: [
     CommonModule,
     FormsModule,
-    GfActivitiesTableLazyModule,
+    GfActivitiesTableModule,
     GfDialogFooterModule,
     GfDialogHeaderModule,
     GfFileDropModule,
diff --git a/libs/ui/src/lib/activities-table-lazy/activities-table-lazy.component.html b/libs/ui/src/lib/activities-table/activities-table.component.html
similarity index 100%
rename from libs/ui/src/lib/activities-table-lazy/activities-table-lazy.component.html
rename to libs/ui/src/lib/activities-table/activities-table.component.html
diff --git a/libs/ui/src/lib/activities-table-lazy/activities-table-lazy.component.scss b/libs/ui/src/lib/activities-table/activities-table.component.scss
similarity index 100%
rename from libs/ui/src/lib/activities-table-lazy/activities-table-lazy.component.scss
rename to libs/ui/src/lib/activities-table/activities-table.component.scss
diff --git a/libs/ui/src/lib/activities-table-lazy/activities-table-lazy.component.ts b/libs/ui/src/lib/activities-table/activities-table.component.ts
similarity index 97%
rename from libs/ui/src/lib/activities-table-lazy/activities-table-lazy.component.ts
rename to libs/ui/src/lib/activities-table/activities-table.component.ts
index a58651a41..75db32dc1 100644
--- a/libs/ui/src/lib/activities-table-lazy/activities-table-lazy.component.ts
+++ b/libs/ui/src/lib/activities-table/activities-table.component.ts
@@ -26,11 +26,11 @@ import { Subject, Subscription, takeUntil } from 'rxjs';
 
 @Component({
   changeDetection: ChangeDetectionStrategy.OnPush,
-  selector: 'gf-activities-table-lazy',
-  styleUrls: ['./activities-table-lazy.component.scss'],
-  templateUrl: './activities-table-lazy.component.html'
+  selector: 'gf-activities-table',
+  styleUrls: ['./activities-table.component.scss'],
+  templateUrl: './activities-table.component.html'
 })
-export class ActivitiesTableLazyComponent
+export class ActivitiesTableComponent
   implements AfterViewInit, OnChanges, OnDestroy, OnInit
 {
   @Input() baseCurrency: string;
diff --git a/libs/ui/src/lib/activities-table-lazy/activities-table-lazy.module.ts b/libs/ui/src/lib/activities-table/activities-table.module.ts
similarity index 86%
rename from libs/ui/src/lib/activities-table-lazy/activities-table-lazy.module.ts
rename to libs/ui/src/lib/activities-table/activities-table.module.ts
index 22c9f6354..b8076df46 100644
--- a/libs/ui/src/lib/activities-table-lazy/activities-table-lazy.module.ts
+++ b/libs/ui/src/lib/activities-table/activities-table.module.ts
@@ -15,11 +15,11 @@ import { GfNoTransactionsInfoModule } from '@ghostfolio/ui/no-transactions-info'
 import { GfValueModule } from '@ghostfolio/ui/value';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 
-import { ActivitiesTableLazyComponent } from './activities-table-lazy.component';
+import { ActivitiesTableComponent } from './activities-table.component';
 
 @NgModule({
-  declarations: [ActivitiesTableLazyComponent],
-  exports: [ActivitiesTableLazyComponent],
+  declarations: [ActivitiesTableComponent],
+  exports: [ActivitiesTableComponent],
   imports: [
     CommonModule,
     GfActivityTypeModule,
@@ -39,4 +39,4 @@ import { ActivitiesTableLazyComponent } from './activities-table-lazy.component'
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA]
 })
-export class GfActivitiesTableLazyModule {}
+export class GfActivitiesTableModule {}