diff --git a/lib/logic/cubit/provider_volumes/provider_volume_cubit.dart b/lib/logic/cubit/provider_volumes/provider_volume_cubit.dart
index 0f705d1e..9ca5213e 100644
--- a/lib/logic/cubit/provider_volumes/provider_volume_cubit.dart
+++ b/lib/logic/cubit/provider_volumes/provider_volume_cubit.dart
@@ -121,7 +121,7 @@ class ApiProviderVolumeCubit
   }
 
   Future<void> createVolume(final DiskSize size) async {
-    final ServerVolume? volume = (await ProvidersController
+    final ServerProviderVolume? volume = (await ProvidersController
             .currentServerProvider!
             .createVolume(size.gibibyte.toInt()))
         .data;
diff --git a/lib/logic/cubit/provider_volumes/provider_volume_state.dart b/lib/logic/cubit/provider_volumes/provider_volume_state.dart
index 3858ef14..21faa52c 100644
--- a/lib/logic/cubit/provider_volumes/provider_volume_state.dart
+++ b/lib/logic/cubit/provider_volumes/provider_volume_state.dart
@@ -5,14 +5,14 @@ class ApiProviderVolumeState extends ServerInstallationDependendState {
 
   const ApiProviderVolumeState.initial()
       : this(const [], LoadingStatus.uninitialized, false);
-  final List<ServerVolume> _volumes;
+  final List<ServerProviderVolume> _volumes;
   final LoadingStatus status;
   final bool isResizing;
 
-  List<ServerVolume> get volumes => _volumes;
+  List<ServerProviderVolume> get volumes => _volumes;
 
   ApiProviderVolumeState copyWith({
-    final List<ServerVolume>? volumes,
+    final List<ServerProviderVolume>? volumes,
     final LoadingStatus? status,
     final bool? isResizing,
   }) =>
diff --git a/lib/logic/cubit/server_installation/server_installation_cubit.dart b/lib/logic/cubit/server_installation/server_installation_cubit.dart
index 01f46aa4..f72ee055 100644
--- a/lib/logic/cubit/server_installation/server_installation_cubit.dart
+++ b/lib/logic/cubit/server_installation/server_installation_cubit.dart
@@ -725,7 +725,7 @@ class ServerInstallationCubit extends Cubit<ServerInstallationState> {
       ip4: server.ip,
       id: server.id,
       createTime: server.created,
-      volume: ServerVolume(
+      volume: ServerProviderVolume(
         id: 0,
         name: 'recovered_volume',
         sizeByte: 0,
diff --git a/lib/logic/cubit/server_installation/server_installation_repository.dart b/lib/logic/cubit/server_installation/server_installation_repository.dart
index 0e6c0dcd..a59cfd22 100644
--- a/lib/logic/cubit/server_installation/server_installation_repository.dart
+++ b/lib/logic/cubit/server_installation/server_installation_repository.dart
@@ -313,7 +313,7 @@ class ServerInstallationRepository {
     if (result.success) {
       return ServerHostingDetails(
         apiToken: result.data,
-        volume: ServerVolume(
+        volume: ServerProviderVolume(
           id: 0,
           name: '',
           sizeByte: 0,
@@ -350,7 +350,7 @@ class ServerInstallationRepository {
     if (result.success) {
       return ServerHostingDetails(
         apiToken: result.data,
-        volume: ServerVolume(
+        volume: ServerProviderVolume(
           id: 0,
           name: '',
           sizeByte: 0,
@@ -385,7 +385,7 @@ class ServerInstallationRepository {
       if (await serverApi.isHttpServerWorking()) {
         return ServerHostingDetails(
           apiToken: apiToken,
-          volume: ServerVolume(
+          volume: ServerProviderVolume(
             id: 0,
             name: '',
             serverId: 0,
@@ -416,7 +416,7 @@ class ServerInstallationRepository {
     if (result.success) {
       return ServerHostingDetails(
         apiToken: result.data,
-        volume: ServerVolume(
+        volume: ServerProviderVolume(
           id: 0,
           name: '',
           sizeByte: 0,
diff --git a/lib/logic/models/disk_status.dart b/lib/logic/models/disk_status.dart
index 2a37ad77..033ed0c7 100644
--- a/lib/logic/models/disk_status.dart
+++ b/lib/logic/models/disk_status.dart
@@ -15,7 +15,7 @@ class DiskVolume {
 
   DiskVolume.fromServerDiscVolume(
     final ServerDiskVolume volume,
-    final ServerVolume? providerVolume,
+    final ServerProviderVolume? providerVolume,
   ) : this(
           name: volume.name,
           sizeTotal: DiskSize(
@@ -52,7 +52,7 @@ class DiskVolume {
   bool root;
   bool isResizable;
   ServerDiskVolume? serverDiskVolume;
-  ServerVolume? providerVolume;
+  ServerProviderVolume? providerVolume;
 
   /// from 0.0 to 1.0
   double get percentage =>
@@ -67,7 +67,7 @@ class DiskVolume {
     final bool? root,
     final bool? isResizable,
     final ServerDiskVolume? serverDiskVolume,
-    final ServerVolume? providerVolume,
+    final ServerProviderVolume? providerVolume,
   }) =>
       DiskVolume(
         sizeUsed: sizeUsed ?? this.sizeUsed,
@@ -83,14 +83,14 @@ class DiskVolume {
 class DiskStatus {
   DiskStatus.fromVolumes(
     final List<ServerDiskVolume> serverVolumes,
-    final List<ServerVolume> providerVolumes,
+    final List<ServerProviderVolume> providerVolumes,
   ) {
     diskVolumes = serverVolumes.map((
       final ServerDiskVolume volume,
     ) {
-      ServerVolume? providerVolume;
+      ServerProviderVolume? providerVolume;
 
-      for (final ServerVolume iterableProviderVolume in providerVolumes) {
+      for (final ServerProviderVolume iterableProviderVolume in providerVolumes) {
         if (iterableProviderVolume.linuxDevice == null ||
             volume.model == null ||
             volume.serial == null) {
diff --git a/lib/logic/models/hive/server_details.dart b/lib/logic/models/hive/server_details.dart
index 0e9d825a..e332be66 100644
--- a/lib/logic/models/hive/server_details.dart
+++ b/lib/logic/models/hive/server_details.dart
@@ -28,7 +28,7 @@ class ServerHostingDetails {
   final DateTime? startTime;
 
   @HiveField(4)
-  final ServerVolume volume;
+  final ServerProviderVolume volume;
 
   @HiveField(5)
   final String apiToken;
@@ -52,8 +52,8 @@ class ServerHostingDetails {
 }
 
 @HiveType(typeId: 5)
-class ServerVolume {
-  ServerVolume({
+class ServerProviderVolume {
+  ServerProviderVolume({
     required this.id,
     required this.name,
     required this.sizeByte,
diff --git a/lib/logic/providers/server_providers/digital_ocean.dart b/lib/logic/providers/server_providers/digital_ocean.dart
index 741e35ac..a1df7a70 100644
--- a/lib/logic/providers/server_providers/digital_ocean.dart
+++ b/lib/logic/providers/server_providers/digital_ocean.dart
@@ -336,7 +336,7 @@ class DigitalOceanServerProvider extends ServerProvider {
       }
 
       final volumes = await getVolumes();
-      final ServerVolume volumeToRemove;
+      final ServerProviderVolume volumeToRemove;
       volumeToRemove = volumes.data.firstWhere(
         (final el) => el.serverId == foundServer!.id,
       );
@@ -548,10 +548,10 @@ class DigitalOceanServerProvider extends ServerProvider {
       );
 
   @override
-  Future<GenericResult<List<ServerVolume>>> getVolumes({
+  Future<GenericResult<List<ServerProviderVolume>>> getVolumes({
     final String? status,
   }) async {
-    final List<ServerVolume> volumes = [];
+    final List<ServerProviderVolume> volumes = [];
 
     final result = await _adapter.api().getVolumes();
 
@@ -568,7 +568,7 @@ class DigitalOceanServerProvider extends ServerProvider {
       int id = 0;
       for (final rawVolume in result.data) {
         final String volumeName = rawVolume.name;
-        final volume = ServerVolume(
+        final volume = ServerProviderVolume(
           id: id++,
           name: volumeName,
           sizeByte: rawVolume.sizeGigabytes * 1024 * 1024 * 1024,
@@ -597,8 +597,8 @@ class DigitalOceanServerProvider extends ServerProvider {
   }
 
   @override
-  Future<GenericResult<ServerVolume?>> createVolume(final int gb) async {
-    ServerVolume? volume;
+  Future<GenericResult<ServerProviderVolume?>> createVolume(final int gb) async {
+    ServerProviderVolume? volume;
 
     final result = await _adapter.api().createVolume(gb);
 
@@ -623,7 +623,7 @@ class DigitalOceanServerProvider extends ServerProvider {
     }
 
     final String volumeName = result.data!.name;
-    volume = ServerVolume(
+    volume = ServerProviderVolume(
       id: getVolumesResult.data.length,
       name: volumeName,
       sizeByte: result.data!.sizeGigabytes,
@@ -638,10 +638,10 @@ class DigitalOceanServerProvider extends ServerProvider {
     );
   }
 
-  Future<GenericResult<ServerVolume?>> getVolume(
+  Future<GenericResult<ServerProviderVolume?>> getVolume(
     final String volumeUuid,
   ) async {
-    ServerVolume? requestedVolume;
+    ServerProviderVolume? requestedVolume;
 
     final result = await getVolumes();
 
@@ -668,7 +668,7 @@ class DigitalOceanServerProvider extends ServerProvider {
 
   @override
   Future<GenericResult<bool>> attachVolume(
-    final ServerVolume volume,
+    final ServerProviderVolume volume,
     final int serverId,
   ) async =>
       _adapter.api().attachVolume(
@@ -678,7 +678,7 @@ class DigitalOceanServerProvider extends ServerProvider {
 
   @override
   Future<GenericResult<bool>> detachVolume(
-    final ServerVolume volume,
+    final ServerProviderVolume volume,
   ) async =>
       _adapter.api().detachVolume(
             volume.name,
@@ -687,7 +687,7 @@ class DigitalOceanServerProvider extends ServerProvider {
 
   @override
   Future<GenericResult<void>> deleteVolume(
-    final ServerVolume volume,
+    final ServerProviderVolume volume,
   ) async =>
       _adapter.api().deleteVolume(
             volume.uuid!,
@@ -695,7 +695,7 @@ class DigitalOceanServerProvider extends ServerProvider {
 
   @override
   Future<GenericResult<bool>> resizeVolume(
-    final ServerVolume volume,
+    final ServerProviderVolume volume,
     final DiskSize size,
   ) async =>
       _adapter.api().resizeVolume(
diff --git a/lib/logic/providers/server_providers/hetzner.dart b/lib/logic/providers/server_providers/hetzner.dart
index 58e66701..ff60b136 100644
--- a/lib/logic/providers/server_providers/hetzner.dart
+++ b/lib/logic/providers/server_providers/hetzner.dart
@@ -280,7 +280,7 @@ class HetznerServerProvider extends ServerProvider {
       id: serverResult.data!.id,
       ip4: serverResult.data!.publicNet.ipv4!.ip,
       createTime: DateTime.now(),
-      volume: ServerVolume(
+      volume: ServerProviderVolume(
         id: volume.id,
         name: volume.name,
         sizeByte: volume.size * 1024 * 1024 * 1024,
@@ -580,10 +580,10 @@ class HetznerServerProvider extends ServerProvider {
   }
 
   @override
-  Future<GenericResult<List<ServerVolume>>> getVolumes({
+  Future<GenericResult<List<ServerProviderVolume>>> getVolumes({
     final String? status,
   }) async {
-    final List<ServerVolume> volumes = [];
+    final List<ServerProviderVolume> volumes = [];
 
     final result = await _adapter.api().getVolumes();
 
@@ -603,7 +603,7 @@ class HetznerServerProvider extends ServerProvider {
         final volumeServer = rawVolume.serverId;
         final String volumeName = rawVolume.name;
         final volumeDevice = rawVolume.linuxDevice;
-        final volume = ServerVolume(
+        final volume = ServerProviderVolume(
           id: volumeId,
           name: volumeName,
           sizeByte: volumeSize,
@@ -629,8 +629,8 @@ class HetznerServerProvider extends ServerProvider {
   }
 
   @override
-  Future<GenericResult<ServerVolume?>> createVolume(final int gb) async {
-    ServerVolume? volume;
+  Future<GenericResult<ServerProviderVolume?>> createVolume(final int gb) async {
+    ServerProviderVolume? volume;
 
     final result = await _adapter.api().createVolume(gb);
 
@@ -644,7 +644,7 @@ class HetznerServerProvider extends ServerProvider {
     }
 
     try {
-      volume = ServerVolume(
+      volume = ServerProviderVolume(
         id: result.data!.id,
         name: result.data!.name,
         sizeByte: result.data!.size * 1024 * 1024 * 1024,
@@ -669,12 +669,12 @@ class HetznerServerProvider extends ServerProvider {
   }
 
   @override
-  Future<GenericResult<void>> deleteVolume(final ServerVolume volume) async =>
+  Future<GenericResult<void>> deleteVolume(final ServerProviderVolume volume) async =>
       _adapter.api().deleteVolume(volume.id);
 
   @override
   Future<GenericResult<bool>> resizeVolume(
-    final ServerVolume volume,
+    final ServerProviderVolume volume,
     final DiskSize size,
   ) async =>
       _adapter.api().resizeVolume(
@@ -690,7 +690,7 @@ class HetznerServerProvider extends ServerProvider {
 
   @override
   Future<GenericResult<bool>> attachVolume(
-    final ServerVolume volume,
+    final ServerProviderVolume volume,
     final int serverId,
   ) async =>
       _adapter.api().attachVolume(
@@ -706,7 +706,7 @@ class HetznerServerProvider extends ServerProvider {
 
   @override
   Future<GenericResult<bool>> detachVolume(
-    final ServerVolume volume,
+    final ServerProviderVolume volume,
   ) async =>
       _adapter.api().detachVolume(
             volume.id,
diff --git a/lib/logic/providers/server_providers/server_provider.dart b/lib/logic/providers/server_providers/server_provider.dart
index ce7b6944..ed7d3519 100644
--- a/lib/logic/providers/server_providers/server_provider.dart
+++ b/lib/logic/providers/server_providers/server_provider.dart
@@ -94,35 +94,35 @@ abstract class ServerProvider {
   /// main server type pricing
   Future<GenericResult<AdditionalPricing?>> getAdditionalPricing();
 
-  /// Returns [ServerVolume] of all available volumes
+  /// Returns [ServerProviderVolume] of all available volumes
   /// assigned to the authorized user and attached to active machine.
-  Future<GenericResult<List<ServerVolume>>> getVolumes({final String? status});
+  Future<GenericResult<List<ServerProviderVolume>>> getVolumes({final String? status});
 
-  /// Tries to create an empty unattached [ServerVolume].
+  /// Tries to create an empty unattached [ServerProviderVolume].
   ///
   /// If success, returns this volume information.
-  Future<GenericResult<ServerVolume?>> createVolume(final int gb);
+  Future<GenericResult<ServerProviderVolume?>> createVolume(final int gb);
 
-  /// Tries to delete the requested accessible [ServerVolume].
-  Future<GenericResult<void>> deleteVolume(final ServerVolume volume);
+  /// Tries to delete the requested accessible [ServerProviderVolume].
+  Future<GenericResult<void>> deleteVolume(final ServerProviderVolume volume);
 
-  /// Tries to resize the requested accessible [ServerVolume]
+  /// Tries to resize the requested accessible [ServerProviderVolume]
   /// to the provided size **(not by!)**, must be greater than current size.
   Future<GenericResult<bool>> resizeVolume(
-    final ServerVolume volume,
+    final ServerProviderVolume volume,
     final DiskSize size,
   );
 
-  /// Tries to attach the requested accessible [ServerVolume]
+  /// Tries to attach the requested accessible [ServerProviderVolume]
   /// to an accessible machine by the provided identificator.
   Future<GenericResult<bool>> attachVolume(
-    final ServerVolume volume,
+    final ServerProviderVolume volume,
     final int serverId,
   );
 
-  /// Tries to attach the requested accessible [ServerVolume]
+  /// Tries to attach the requested accessible [ServerProviderVolume]
   /// from any machine.
-  Future<GenericResult<bool>> detachVolume(final ServerVolume volume);
+  Future<GenericResult<bool>> detachVolume(final ServerProviderVolume volume);
 
   /// Returns metedata of an accessible machine by the provided identificator
   /// to show on ServerDetailsScreen.