diff --git a/Pilz.Net/Api/Client/BaseChildItemClient.cs b/Pilz.Net/Api/Client/BaseChildItemClient.cs
index a09f627..c9c65e8 100644
--- a/Pilz.Net/Api/Client/BaseChildItemClient.cs
+++ b/Pilz.Net/Api/Client/BaseChildItemClient.cs
@@ -11,12 +11,12 @@ public abstract class BaseChildItemClient<T>(IApiClient client) : BaseClient<T>(
 
     public virtual async Task<IEnumerable<T>> GetAll(int parentId)
     {
-        return (await client.SendRequest<GeneralItemMessages<T>.Items>($"{ApiEndpointParent}/{parentId}{ApiEndpointChild}", HttpMethod.Get)).EnsureOk().Items;
+        return (await client.SendRequest<ItemMessages<T>.Items>($"{ApiEndpointParent}/{parentId}{ApiEndpointChild}", HttpMethod.Get)).EnsureOk().Items;
     }
 
     public virtual async Task<IEnumerable<T>> GetAll(int parentId, int offset, int count)
     {
-        return (await client.SendRequest<GeneralItemMessages<T>.Items>(ApiEndpoint, HttpMethod.Get, new ApiParameterCollection
+        return (await client.SendRequest<ItemMessages<T>.Items>(ApiEndpoint, HttpMethod.Get, new ApiParameterCollection
         {
             ["offset"] = offset,
             ["count"] = count,
@@ -34,7 +34,7 @@ public abstract class BaseChildItemClient<T>(IApiClient client) : BaseClient<T>(
     {
         if (item.Id != 0)
             return await Save(item);
-        return (await client.SendRequest<GeneralItemMessages<T>.Item>(
+        return (await client.SendRequest<ItemMessages<T>.Item>(
             $"{ApiEndpointParent}/{parentId}{ApiEndpointChild}",
             HttpMethod.Post,
             GenerateUpdateMessage(item, true))).EnsureOk().Item;
diff --git a/Pilz.Net/Api/Client/BaseClient.cs b/Pilz.Net/Api/Client/BaseClient.cs
index ffea803..89428b7 100644
--- a/Pilz.Net/Api/Client/BaseClient.cs
+++ b/Pilz.Net/Api/Client/BaseClient.cs
@@ -9,12 +9,12 @@ public abstract class BaseClient<T>(IApiClient client) : IBaseClient<T> where T
 
     public virtual async Task<IEnumerable<T>> GetAll()
     {
-        return (await client.SendRequest<GeneralItemMessages<T>.Items>(ApiEndpoint, HttpMethod.Get)).EnsureOk().Items;
+        return (await client.SendRequest<ItemMessages<T>.Items>(ApiEndpoint, HttpMethod.Get)).EnsureOk().Items;
     }
 
     public virtual async Task<IEnumerable<T>> GetAll(int offset, int amount)
     {
-        return (await client.SendRequest<GeneralItemMessages<T>.Items>(ApiEndpoint, HttpMethod.Get, new ApiParameterCollection
+        return (await client.SendRequest<ItemMessages<T>.Items>(ApiEndpoint, HttpMethod.Get, new ApiParameterCollection
         {
             ["offset"] = offset,
             ["amount"] = amount,
@@ -23,7 +23,7 @@ public abstract class BaseClient<T>(IApiClient client) : IBaseClient<T> where T
 
     public virtual async Task<IEnumerable<T>> GetAll(int[] ids, int offset, int amount)
     {
-        return (await client.SendRequest<GeneralItemMessages<T>.Items>(ApiEndpoint, HttpMethod.Get, new ApiParameterCollection
+        return (await client.SendRequest<ItemMessages<T>.Items>(ApiEndpoint, HttpMethod.Get, new ApiParameterCollection
         {
             ["offset"] = offset,
             ["amount"] = amount,
@@ -33,7 +33,7 @@ public abstract class BaseClient<T>(IApiClient client) : IBaseClient<T> where T
 
     public virtual async Task<T> Get(int id)
     {
-        return (await client.SendRequest<GeneralItemMessages<T>.Item>($"{ApiEndpoint}/{id}", HttpMethod.Get)).EnsureOk().Item;
+        return (await client.SendRequest<ItemMessages<T>.Item>($"{ApiEndpoint}/{id}", HttpMethod.Get)).EnsureOk().Item;
     }
 
     public virtual async Task Delete(int id)
@@ -44,7 +44,7 @@ public abstract class BaseClient<T>(IApiClient client) : IBaseClient<T> where T
     public virtual async Task<T> Save(T item)
     {
         var generateNew = item.Id == 0;
-        return (await client.SendRequest<GeneralItemMessages<T>.Item>(
+        return (await client.SendRequest<ItemMessages<T>.Item>(
             generateNew ? ApiEndpoint : $"{ApiEndpoint}/{item.Id}",
             generateNew ? HttpMethod.Post : HttpMethod.Put,
             GenerateUpdateMessage(item, generateNew))).EnsureOk().Item;
diff --git a/Pilz.Net/Api/Messages/GeneralItemMessages.cs b/Pilz.Net/Api/Messages/ItemMessages.cs
similarity index 93%
rename from Pilz.Net/Api/Messages/GeneralItemMessages.cs
rename to Pilz.Net/Api/Messages/ItemMessages.cs
index 861ba46..137d560 100644
--- a/Pilz.Net/Api/Messages/GeneralItemMessages.cs
+++ b/Pilz.Net/Api/Messages/ItemMessages.cs
@@ -3,7 +3,7 @@ using System.ComponentModel;
 
 namespace Pilz.Net.Api.Messages;
 
-public static class GeneralItemMessages<T>
+public static class ItemMessages<T>
 {
     public class Item(T item) : ObjectMessage(item);
     public class Items(List<T> items) : ObjectsMessage(items);
@@ -21,4 +21,4 @@ public static class GeneralItemMessages<T>
         [JsonProperty(ItemTypeNameHandling = TypeNameHandling.Auto)]
         public List<T> Items { get; } = items;
     }
-}
+}
\ No newline at end of file
diff --git a/Pilz.Net/Extensions/ApiMessageExtensions.cs b/Pilz.Net/Extensions/ApiMessageExtensions.cs
index 3517b22..f063d91 100644
--- a/Pilz.Net/Extensions/ApiMessageExtensions.cs
+++ b/Pilz.Net/Extensions/ApiMessageExtensions.cs
@@ -30,18 +30,18 @@ public static class ApiMessageExtensions
         return new ApiResult(statusCode, @this.ToItemsMsg());
     }
 
-    public static GeneralItemMessages<T>.Item ToItemMsg<T>(this T @this)
+    public static ItemMessages<T>.Item ToItemMsg<T>(this T @this)
     {
-        return new GeneralItemMessages<T>.Item(@this);
+        return new ItemMessages<T>.Item(@this);
     }
 
-    public static GeneralItemMessages<T>.Items ToItemsMsg<T>(this IEnumerable<T> @this)
+    public static ItemMessages<T>.Items ToItemsMsg<T>(this IEnumerable<T> @this)
     {
-        return new GeneralItemMessages<T>.Items([.. @this]);
+        return new ItemMessages<T>.Items([.. @this]);
     }
 
-    public static GeneralItemMessages<T>.Items ToItemsMsg<T>(this T[] @this)
+    public static ItemMessages<T>.Items ToItemsMsg<T>(this T[] @this)
     {
-        return new GeneralItemMessages<T>.Items([.. @this]);
+        return new ItemMessages<T>.Items([.. @this]);
     }
 }