diff --git a/src/YuckQi.Domain.Services/Abstract/ITypeEntityService.cs b/src/YuckQi.Domain.Services/Abstract/ITypeEntityService.cs
index 6d443d4..fd4ecb5 100644
--- a/src/YuckQi.Domain.Services/Abstract/ITypeEntityService.cs
+++ b/src/YuckQi.Domain.Services/Abstract/ITypeEntityService.cs
@@ -8,11 +8,11 @@
 
 namespace YuckQi.Domain.Services.Abstract;
 
-public interface ITypeEntityService<TTypeEntity, in TKey> where TTypeEntity : IEntity<TKey>, IType where TKey : struct
+public interface ITypeEntityService<TTypeEntity, in TIdentifier> where TTypeEntity : IEntity<TIdentifier>, IType where TIdentifier : struct
 {
     Task<Result<TTypeEntity>> CreateAsync(TTypeEntity entity);
     Task<Result<TTypeEntity>> GetAsync(Guid identifier);
-    Task<Result<TTypeEntity>> GetAsync(TKey key);
+    Task<Result<TTypeEntity>> GetAsync(TIdentifier identifier);
     Task<Result<TTypeEntity>> ModifyAsync(TTypeEntity entity);
     Task<Result<IPage<TTypeEntity>>> SearchAsync(TypeSearchCriteria criteria = null);
 }
diff --git a/src/YuckQi.Domain.Services/YuckQi.Domain.Services.csproj b/src/YuckQi.Domain.Services/YuckQi.Domain.Services.csproj
index 72892b2..c4b3777 100644
--- a/src/YuckQi.Domain.Services/YuckQi.Domain.Services.csproj
+++ b/src/YuckQi.Domain.Services/YuckQi.Domain.Services.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.0.0</Version>
+    <Version>6.0.1</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <Description>A .NET library for bootstrapping a domain services project.</Description>
   </PropertyGroup>
diff --git a/src/YuckQi.Domain.Validation/Result.cs b/src/YuckQi.Domain.Validation/Result.cs
index 4192ea7..59c6029 100644
--- a/src/YuckQi.Domain.Validation/Result.cs
+++ b/src/YuckQi.Domain.Validation/Result.cs
@@ -50,11 +50,11 @@ public Result(T payload, IReadOnlyCollection<ResultDetail> detail = null) : base
 
     #region Public Methods
 
-    public static Result<T> ConstraintViolation<TKey>(TKey key, String message = null) where TKey : struct => new(ResultDetail.ConstraintViolation<T, TKey>(key, message));
+    public static Result<T> ConstraintViolation<TIdentifier>(TIdentifier identifier, String message = null) where TIdentifier : struct => new(ResultDetail.ConstraintViolation<T, TIdentifier>(identifier, message));
 
     public Boolean HasResultCode(ResultCode resultCode) => Detail.Any(t => t.Code == resultCode);
 
-    public static Result<T> NotFound<TKey>(TKey key, String message = null) where TKey : struct => new(ResultDetail.NotFound<T, TKey>(key, message));
+    public static Result<T> NotFound<TIdentifier>(TIdentifier identifier, String message = null) where TIdentifier : struct => new(ResultDetail.NotFound<T, TIdentifier>(identifier, message));
 
     #endregion
 }
diff --git a/src/YuckQi.Domain.Validation/ResultDetail.cs b/src/YuckQi.Domain.Validation/ResultDetail.cs
index 23b76ca..1080ef2 100644
--- a/src/YuckQi.Domain.Validation/ResultDetail.cs
+++ b/src/YuckQi.Domain.Validation/ResultDetail.cs
@@ -13,8 +13,8 @@ public class ResultDetail
 
     #region Constants
 
-    public static ResultDetail ConstraintViolation<T, TKey>(TKey key, String message = null) where TKey : struct => new(ResultCode.ConstraintViolation, ResultMessage.ConstraintConflict<T, TKey>(key, message));
-    public static ResultDetail NotFound<T, TKey>(TKey key, String message = null) where TKey : struct => new(ResultCode.NotFound, ResultMessage.NotFound<T, TKey>(key, message));
+    public static ResultDetail ConstraintViolation<T, TIdentifier>(TIdentifier identifier, String message = null) where TIdentifier : struct => new(ResultCode.ConstraintViolation, ResultMessage.ConstraintConflict<T, TIdentifier>(identifier, message));
+    public static ResultDetail NotFound<T, TIdentifier>(TIdentifier identifier, String message = null) where TIdentifier : struct => new(ResultCode.NotFound, ResultMessage.NotFound<T, TIdentifier>(identifier, message));
 
     #endregion
 
diff --git a/src/YuckQi.Domain.Validation/ResultMessage.cs b/src/YuckQi.Domain.Validation/ResultMessage.cs
index d5ba219..e720278 100644
--- a/src/YuckQi.Domain.Validation/ResultMessage.cs
+++ b/src/YuckQi.Domain.Validation/ResultMessage.cs
@@ -25,8 +25,8 @@ public ResultMessage(String id, String text = null)
 
     #region Public Methods
 
-    public static ResultMessage ConstraintConflict<T, TKey>(TKey key, String message = null) where TKey : struct => new($"{ResultCode.ConstraintViolation.GetHashCode()}", message ?? $"'{typeof(T).Name}' '{key}' already exists.");
-    public static ResultMessage NotFound<T, TKey>(TKey key, String message = null) where TKey : struct => new($"{ResultCode.NotFound.GetHashCode()}", message ?? $"'{typeof(T).Name}' '{key}' could not be found.");
+    public static ResultMessage ConstraintConflict<T, TIdentifier>(TIdentifier identifier, String message = null) where TIdentifier : struct => new($"{ResultCode.ConstraintViolation.GetHashCode()}", message ?? $"'{typeof(T).Name}' '{identifier}' already exists.");
+    public static ResultMessage NotFound<T, TIdentifier>(TIdentifier identifier, String message = null) where TIdentifier : struct => new($"{ResultCode.NotFound.GetHashCode()}", message ?? $"'{typeof(T).Name}' '{identifier}' could not be found.");
 
     #endregion
 }
diff --git a/src/YuckQi.Domain.Validation/YuckQi.Domain.Validation.csproj b/src/YuckQi.Domain.Validation/YuckQi.Domain.Validation.csproj
index 6687d94..30ee162 100644
--- a/src/YuckQi.Domain.Validation/YuckQi.Domain.Validation.csproj
+++ b/src/YuckQi.Domain.Validation/YuckQi.Domain.Validation.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.0.0</Version>
+    <Version>6.0.1</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <Description>A .NET library providing domain validation fundamentals.</Description>
   </PropertyGroup>
diff --git a/src/YuckQi.Domain/Entities/Abstract/EntityBase.cs b/src/YuckQi.Domain/Entities/Abstract/EntityBase.cs
index 7034825..5c9616b 100644
--- a/src/YuckQi.Domain/Entities/Abstract/EntityBase.cs
+++ b/src/YuckQi.Domain/Entities/Abstract/EntityBase.cs
@@ -1,6 +1,6 @@
 namespace YuckQi.Domain.Entities.Abstract;
 
-public abstract class EntityBase<TKey> : IEntity<TKey> where TKey : struct
+public abstract class EntityBase<TIdentifier> : IEntity<TIdentifier> where TIdentifier : struct
 {
-    public TKey Key { get; set; }
+    public TIdentifier Identifier { get; set; }
 }
diff --git a/src/YuckQi.Domain/Entities/Abstract/IEntity.cs b/src/YuckQi.Domain/Entities/Abstract/IEntity.cs
index 23e8b99..32f745d 100644
--- a/src/YuckQi.Domain/Entities/Abstract/IEntity.cs
+++ b/src/YuckQi.Domain/Entities/Abstract/IEntity.cs
@@ -1,6 +1,6 @@
 namespace YuckQi.Domain.Entities.Abstract;
 
-public interface IEntity<TKey> where TKey : struct
+public interface IEntity<TIdentifier> where TIdentifier : struct
 {
-    TKey Key { get; set; }
+    TIdentifier Identifier { get; set; }
 }
diff --git a/src/YuckQi.Domain/Entities/MultiTenant/Abstract/IMultiTenantEntity.cs b/src/YuckQi.Domain/Entities/MultiTenant/Abstract/IMultiTenantEntity.cs
index 10ffe2c..6346129 100644
--- a/src/YuckQi.Domain/Entities/MultiTenant/Abstract/IMultiTenantEntity.cs
+++ b/src/YuckQi.Domain/Entities/MultiTenant/Abstract/IMultiTenantEntity.cs
@@ -3,9 +3,9 @@
 
 namespace YuckQi.Domain.Entities.MultiTenant.Abstract;
 
-public interface IMultiTenantEntity<TKey, TTenantKey> : IEntity<TKey> where TKey : struct where TTenantKey : struct
+public interface IMultiTenantEntity<TIdentifier, TTenantIdentifier> : IEntity<TIdentifier> where TIdentifier : struct where TTenantIdentifier : struct
 {
-    TTenantKey TenantId { get; set; }
+    TTenantIdentifier TenantIdentifier { get; set; }
 
-    Boolean IsValidTenant(TTenantKey? tenantId);
+    Boolean IsValidTenant(TTenantIdentifier? tenantIdentifier);
 }
diff --git a/src/YuckQi.Domain/Entities/MultiTenant/Abstract/MultiTenantEntityBase.cs b/src/YuckQi.Domain/Entities/MultiTenant/Abstract/MultiTenantEntityBase.cs
index 8ba8f96..94a9f4c 100644
--- a/src/YuckQi.Domain/Entities/MultiTenant/Abstract/MultiTenantEntityBase.cs
+++ b/src/YuckQi.Domain/Entities/MultiTenant/Abstract/MultiTenantEntityBase.cs
@@ -3,9 +3,9 @@
 
 namespace YuckQi.Domain.Entities.MultiTenant.Abstract;
 
-public abstract class MultiTenantEntityBase<TKey, TTenantKey> : EntityBase<TKey>, IMultiTenantEntity<TKey, TTenantKey> where TKey : struct where TTenantKey : struct
+public abstract class MultiTenantEntityBase<TIdentifier, TTenantIdentifier> : EntityBase<TIdentifier>, IMultiTenantEntity<TIdentifier, TTenantIdentifier> where TIdentifier : struct where TTenantIdentifier : struct
 {
-    public TTenantKey TenantId { get; set; }
+    public TTenantIdentifier TenantIdentifier { get; set; }
 
-    public Boolean IsValidTenant(TTenantKey? tenantId) => TenantId.Equals(tenantId);
+    public Boolean IsValidTenant(TTenantIdentifier? tenantIdentifier) => TenantIdentifier.Equals(tenantIdentifier);
 }
diff --git a/src/YuckQi.Domain/YuckQi.Domain.csproj b/src/YuckQi.Domain/YuckQi.Domain.csproj
index 53568e0..c881b69 100644
--- a/src/YuckQi.Domain/YuckQi.Domain.csproj
+++ b/src/YuckQi.Domain/YuckQi.Domain.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.0.0</Version>
+    <Version>6.0.1</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <Description>A .NET library for bootstrapping a domain model project.</Description>
   </PropertyGroup>