diff --git a/lib/screens/metering/event_metering.dart b/lib/screens/metering/event_metering.dart
index 852b5e4..bf3a22d 100644
--- a/lib/screens/metering/event_metering.dart
+++ b/lib/screens/metering/event_metering.dart
@@ -6,7 +6,7 @@ sealed class MeteringEvent {
 }
 
 class EquipmentProfileChangedEvent extends MeteringEvent {
-  final EquipmentProfileData equipmentProfileData;
+  final EquipmentProfile equipmentProfileData;
 
   const EquipmentProfileChangedEvent(this.equipmentProfileData);
 }
diff --git a/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/widget_container_equipment_profile.dart b/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/widget_container_equipment_profile.dart
index b0082d4..e4a9e95 100644
--- a/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/widget_container_equipment_profile.dart
+++ b/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/widget_container_equipment_profile.dart
@@ -8,8 +8,8 @@ import 'package:lightmeter/screens/settings/components/metering/components/equip
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
 
 class EquipmentProfileContainer extends StatefulWidget {
-  final EquipmentProfileData data;
-  final ValueChanged<EquipmentProfileData> onUpdate;
+  final EquipmentProfile data;
+  final ValueChanged<EquipmentProfile> onUpdate;
   final VoidCallback onDelete;
   final VoidCallback onExpand;
 
@@ -27,7 +27,7 @@ class EquipmentProfileContainer extends StatefulWidget {
 
 class EquipmentProfileContainerState extends State<EquipmentProfileContainer>
     with TickerProviderStateMixin {
-  late EquipmentProfileData _equipmentData = EquipmentProfileData(
+  late EquipmentProfile _equipmentData = EquipmentProfile(
     id: widget.data.id,
     name: widget.data.name,
     apertureValues: widget.data.apertureValues,
@@ -45,7 +45,7 @@ class EquipmentProfileContainerState extends State<EquipmentProfileContainer>
   @override
   void didUpdateWidget(EquipmentProfileContainer oldWidget) {
     super.didUpdateWidget(oldWidget);
-    _equipmentData = EquipmentProfileData(
+    _equipmentData = EquipmentProfile(
       id: widget.data.id,
       name: widget.data.name,
       apertureValues: widget.data.apertureValues,
@@ -196,7 +196,7 @@ class _AnimatedArrowButton extends AnimatedWidget {
 }
 
 class _AnimatedEquipmentListTiles extends AnimatedWidget {
-  final EquipmentProfileData equipmentData;
+  final EquipmentProfile equipmentData;
   final ValueChanged<List<ApertureValue>> onApertureValuesSelected;
   final ValueChanged<List<IsoValue>> onIsoValuesSelecred;
   final ValueChanged<List<NdValue>> onNdValuesSelected;
diff --git a/lib/screens/settings/components/metering/components/equipment_profiles/widget_list_tile_equipment_profiles.dart b/lib/screens/settings/components/metering/components/equipment_profiles/widget_list_tile_equipment_profiles.dart
index dd3c57d..29ffae9 100644
--- a/lib/screens/settings/components/metering/components/equipment_profiles/widget_list_tile_equipment_profiles.dart
+++ b/lib/screens/settings/components/metering/components/equipment_profiles/widget_list_tile_equipment_profiles.dart
@@ -17,7 +17,7 @@ class EquipmentProfilesListTile extends StatelessWidget {
       onTap: () {
         if (context.get<Environment>().buildType == BuildType.dev ||
             IAPProducts.isPurchased(context, IAPProductType.paidFeatures)) {
-          Navigator.of(context).push<EquipmentProfileData>(
+          Navigator.of(context).push<EquipmentProfile>(
             MaterialPageRoute(builder: (_) => const EquipmentProfilesScreen()),
           );
         } else {
diff --git a/test/screens/metering/bloc_metering_test.dart b/test/screens/metering/bloc_metering_test.dart
index 3593c91..45b9291 100644
--- a/test/screens/metering/bloc_metering_test.dart
+++ b/test/screens/metering/bloc_metering_test.dart
@@ -495,7 +495,7 @@ void main() {
   group(
     '`EquipmentProfileChangedEvent`',
     () {
-      final reducedProfile = EquipmentProfileData(
+      final reducedProfile = EquipmentProfile(
         id: '0',
         name: 'Reduced',
         apertureValues: ApertureValue.values,
diff --git a/test/screens/metering/screen_metering_test.dart b/test/screens/metering/screen_metering_test.dart
index 2bbd2a1..8442cfc 100644
--- a/test/screens/metering/screen_metering_test.dart
+++ b/test/screens/metering/screen_metering_test.dart
@@ -5,7 +5,7 @@ import 'package:lightmeter/screens/metering/screen_metering.dart';
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
 
 void main() {
-  const defaultEquipmentProfile = EquipmentProfileData(
+  const defaultEquipmentProfile = EquipmentProfile(
     id: "",
     name: 'Default',
     apertureValues: ApertureValue.values,
@@ -334,7 +334,7 @@ void main() {
   });
 
   group('Reduced equipment profile', () {
-    final equipmentProfile = EquipmentProfileData(
+    final equipmentProfile = EquipmentProfile(
       id: "1",
       name: 'Test1',
       apertureValues: ApertureValue.values.sublist(4),