diff --git a/lib/logic/api_maps/graphql_maps/api_map.dart b/lib/logic/api_maps/graphql_maps/graphql_api_map.dart
similarity index 99%
rename from lib/logic/api_maps/graphql_maps/api_map.dart
rename to lib/logic/api_maps/graphql_maps/graphql_api_map.dart
index 32359f93..2c11c127 100644
--- a/lib/logic/api_maps/graphql_maps/api_map.dart
+++ b/lib/logic/api_maps/graphql_maps/graphql_api_map.dart
@@ -53,7 +53,7 @@ class ResponseLoggingParser extends ResponseParser {
   }
 }
 
-abstract class ApiMap {
+abstract class GraphQLApiMap {
   Future<GraphQLClient> getClient() async {
     IOClient? ioClient;
     if (TlsOptions.stagingAcme || !TlsOptions.verifyCertificate) {
diff --git a/lib/logic/api_maps/graphql_maps/server_api/jobs_api.dart b/lib/logic/api_maps/graphql_maps/server_api/jobs_api.dart
index 03bfd1b3..8ed73a5d 100644
--- a/lib/logic/api_maps/graphql_maps/server_api/jobs_api.dart
+++ b/lib/logic/api_maps/graphql_maps/server_api/jobs_api.dart
@@ -1,6 +1,6 @@
 part of 'server_api.dart';
 
-mixin JobsApi on ApiMap {
+mixin JobsApi on GraphQLApiMap {
   Future<List<ServerJob>> getServerJobs() async {
     QueryResult<Query$GetApiJobs> response;
     List<ServerJob> jobsList = [];
diff --git a/lib/logic/api_maps/graphql_maps/server_api/server_actions_api.dart b/lib/logic/api_maps/graphql_maps/server_api/server_actions_api.dart
index 65e77b98..f6fd5201 100644
--- a/lib/logic/api_maps/graphql_maps/server_api/server_actions_api.dart
+++ b/lib/logic/api_maps/graphql_maps/server_api/server_actions_api.dart
@@ -1,6 +1,6 @@
 part of 'server_api.dart';
 
-mixin ServerActionsApi on ApiMap {
+mixin ServerActionsApi on GraphQLApiMap {
   Future<bool> _commonBoolRequest(final Function graphQLMethod) async {
     QueryResult response;
     bool result = false;
diff --git a/lib/logic/api_maps/graphql_maps/server_api/server_api.dart b/lib/logic/api_maps/graphql_maps/server_api/server_api.dart
index 966b17bd..8f0e55e3 100644
--- a/lib/logic/api_maps/graphql_maps/server_api/server_api.dart
+++ b/lib/logic/api_maps/graphql_maps/server_api/server_api.dart
@@ -32,7 +32,7 @@ part 'services_api.dart';
 part 'users_api.dart';
 part 'volume_api.dart';
 
-class ServerApi extends ApiMap
+class ServerApi extends GraphQLApiMap
     with VolumeApi, JobsApi, ServerActionsApi, ServicesApi, UsersApi {
   ServerApi({
     this.hasLogger = false,
diff --git a/lib/logic/api_maps/graphql_maps/server_api/services_api.dart b/lib/logic/api_maps/graphql_maps/server_api/services_api.dart
index 9d39f137..1632533b 100644
--- a/lib/logic/api_maps/graphql_maps/server_api/services_api.dart
+++ b/lib/logic/api_maps/graphql_maps/server_api/services_api.dart
@@ -1,6 +1,6 @@
 part of 'server_api.dart';
 
-mixin ServicesApi on ApiMap {
+mixin ServicesApi on GraphQLApiMap {
   Future<List<Service>> getAllServices() async {
     QueryResult<Query$AllServices> response;
     List<Service> services = [];
diff --git a/lib/logic/api_maps/graphql_maps/server_api/users_api.dart b/lib/logic/api_maps/graphql_maps/server_api/users_api.dart
index cca78798..11327290 100644
--- a/lib/logic/api_maps/graphql_maps/server_api/users_api.dart
+++ b/lib/logic/api_maps/graphql_maps/server_api/users_api.dart
@@ -1,6 +1,6 @@
 part of 'server_api.dart';
 
-mixin UsersApi on ApiMap {
+mixin UsersApi on GraphQLApiMap {
   Future<List<User>> getAllUsers() async {
     QueryResult<Query$AllUsers> response;
     List<User> users = [];
diff --git a/lib/logic/api_maps/graphql_maps/server_api/volume_api.dart b/lib/logic/api_maps/graphql_maps/server_api/volume_api.dart
index 3459e6f9..a7d23ba8 100644
--- a/lib/logic/api_maps/graphql_maps/server_api/volume_api.dart
+++ b/lib/logic/api_maps/graphql_maps/server_api/volume_api.dart
@@ -1,6 +1,6 @@
 part of 'server_api.dart';
 
-mixin VolumeApi on ApiMap {
+mixin VolumeApi on GraphQLApiMap {
   Future<List<ServerDiskVolume>> getServerDiskVolumes() async {
     QueryResult response;
     List<ServerDiskVolume> volumes = [];
diff --git a/lib/logic/api_maps/rest_maps/backblaze.dart b/lib/logic/api_maps/rest_maps/backblaze.dart
index 6ce8914e..aaa5ca6b 100644
--- a/lib/logic/api_maps/rest_maps/backblaze.dart
+++ b/lib/logic/api_maps/rest_maps/backblaze.dart
@@ -25,7 +25,7 @@ class BackblazeApplicationKey {
   final String applicationKey;
 }
 
-class BackblazeApi extends ApiMap {
+class BackblazeApi extends RestApiMap {
   BackblazeApi({this.hasLogger = false, this.isWithToken = true});
 
   @override
diff --git a/lib/logic/api_maps/rest_maps/dns_providers/cloudflare/cloudflare_api.dart b/lib/logic/api_maps/rest_maps/dns_providers/cloudflare/cloudflare_api.dart
index 9ff01bf7..eb4f9ad4 100644
--- a/lib/logic/api_maps/rest_maps/dns_providers/cloudflare/cloudflare_api.dart
+++ b/lib/logic/api_maps/rest_maps/dns_providers/cloudflare/cloudflare_api.dart
@@ -7,7 +7,7 @@ import 'package:selfprivacy/logic/api_maps/rest_maps/api_map.dart';
 import 'package:selfprivacy/logic/models/hive/server_domain.dart';
 import 'package:selfprivacy/logic/models/json/dns_records.dart';
 
-class CloudflareApi extends ApiMap {
+class CloudflareApi extends RestApiMap {
   CloudflareApi({
     this.hasLogger = false,
     this.isWithToken = true,
diff --git a/lib/logic/api_maps/rest_maps/dns_providers/desec/desec_api.dart b/lib/logic/api_maps/rest_maps/dns_providers/desec/desec_api.dart
index cab65b6a..b6e04f99 100644
--- a/lib/logic/api_maps/rest_maps/dns_providers/desec/desec_api.dart
+++ b/lib/logic/api_maps/rest_maps/dns_providers/desec/desec_api.dart
@@ -6,7 +6,7 @@ import 'package:selfprivacy/logic/api_maps/generic_result.dart';
 import 'package:selfprivacy/logic/api_maps/rest_maps/api_map.dart';
 import 'package:selfprivacy/logic/models/hive/server_domain.dart';
 
-class DesecApi extends ApiMap {
+class DesecApi extends RestApiMap {
   DesecApi({
     this.hasLogger = false,
     this.isWithToken = true,
diff --git a/lib/logic/api_maps/rest_maps/dns_providers/digital_ocean_dns/digital_ocean_dns_api.dart b/lib/logic/api_maps/rest_maps/dns_providers/digital_ocean_dns/digital_ocean_dns_api.dart
index 76f9e78e..6e148c70 100644
--- a/lib/logic/api_maps/rest_maps/dns_providers/digital_ocean_dns/digital_ocean_dns_api.dart
+++ b/lib/logic/api_maps/rest_maps/dns_providers/digital_ocean_dns/digital_ocean_dns_api.dart
@@ -7,7 +7,7 @@ import 'package:selfprivacy/logic/api_maps/rest_maps/api_map.dart';
 import 'package:selfprivacy/logic/models/hive/server_domain.dart';
 import 'package:selfprivacy/logic/models/json/dns_records.dart';
 
-class DigitalOceanDnsApi extends ApiMap {
+class DigitalOceanDnsApi extends RestApiMap {
   DigitalOceanDnsApi({
     this.hasLogger = false,
     this.isWithToken = true,
diff --git a/lib/logic/api_maps/rest_maps/api_map.dart b/lib/logic/api_maps/rest_maps/rest_api_map.dart
similarity index 99%
rename from lib/logic/api_maps/rest_maps/api_map.dart
rename to lib/logic/api_maps/rest_maps/rest_api_map.dart
index 86f53e25..547ce4aa 100644
--- a/lib/logic/api_maps/rest_maps/api_map.dart
+++ b/lib/logic/api_maps/rest_maps/rest_api_map.dart
@@ -8,7 +8,7 @@ import 'package:pretty_dio_logger/pretty_dio_logger.dart';
 import 'package:selfprivacy/config/get_it_config.dart';
 import 'package:selfprivacy/logic/models/message.dart';
 
-abstract class ApiMap {
+abstract class RestApiMap {
   Future<Dio> getClient({final BaseOptions? customOptions}) async {
     final Dio dio = Dio(customOptions ?? (await options));
     if (hasLogger) {
diff --git a/lib/logic/api_maps/rest_maps/server_providers/server_provider.dart b/lib/logic/api_maps/rest_maps/server_providers/server_provider.dart
index d4988c99..2dc455d0 100644
--- a/lib/logic/api_maps/rest_maps/server_providers/server_provider.dart
+++ b/lib/logic/api_maps/rest_maps/server_providers/server_provider.dart
@@ -1,7 +1,7 @@
 import 'package:selfprivacy/logic/api_maps/rest_maps/api_map.dart';
 export 'package:selfprivacy/logic/api_maps/generic_result.dart';
 
-abstract class ServerProviderApi extends ApiMap {
+abstract class ServerProviderApi extends RestApiMap {
   /// Provider name key which lets infect understand what kind of installation
   /// it requires, for example 'digitaloceal' for Digital Ocean
   String get infectProviderName;