diff --git a/WorkFlow.Domain/Entities/ProfileObjState.cs b/WorkFlow.Domain/Entities/ProfileObjState.cs
index 78d0911..0376582 100644
--- a/WorkFlow.Domain/Entities/ProfileObjState.cs
+++ b/WorkFlow.Domain/Entities/ProfileObjState.cs
@@ -48,6 +48,6 @@ namespace WorkFlow.Domain.Entities
         public Profile? Profile { get; init; } = null;
 
         [ForeignKey("StateId")]
-        public WfState? State { get; init; } = null;
+        public State? State { get; init; } = null;
     }
 }
\ No newline at end of file
diff --git a/WorkFlow.Domain/Entities/WfState.cs b/WorkFlow.Domain/Entities/State.cs
similarity index 94%
rename from WorkFlow.Domain/Entities/WfState.cs
rename to WorkFlow.Domain/Entities/State.cs
index bb0ac71..62abba7 100644
--- a/WorkFlow.Domain/Entities/WfState.cs
+++ b/WorkFlow.Domain/Entities/State.cs
@@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace WorkFlow.Domain.Entities
 {
     [Table("TBMWF_WF_STATE", Schema = "dbo")]
-    public class WfState : IUnique<int>
+    public class State : IUnique<int>
     {
         [Key]
         [Column("GUID")]
diff --git a/WorkFlow.Infrastructure/Contracts/IWfStateRepository.cs b/WorkFlow.Infrastructure/Contracts/IStateRepository.cs
similarity index 66%
rename from WorkFlow.Infrastructure/Contracts/IWfStateRepository.cs
rename to WorkFlow.Infrastructure/Contracts/IStateRepository.cs
index aa7ae9f..50040d9 100644
--- a/WorkFlow.Infrastructure/Contracts/IWfStateRepository.cs
+++ b/WorkFlow.Infrastructure/Contracts/IStateRepository.cs
@@ -3,7 +3,7 @@ using WorkFlow.Domain.Entities;
 
 namespace WorkFlow.Infrastructure.Contracts
 {
-    public interface IWfStateRepository : ICRUDRepository<WfState, int>
+    public interface IStateRepository : ICRUDRepository<State, int>
     {
     }
 }
\ No newline at end of file
diff --git a/WorkFlow.Infrastructure/DIExtensions.cs b/WorkFlow.Infrastructure/DIExtensions.cs
index f68c1bc..b938b07 100644
--- a/WorkFlow.Infrastructure/DIExtensions.cs
+++ b/WorkFlow.Infrastructure/DIExtensions.cs
@@ -11,6 +11,6 @@ namespace WorkFlow.Infrastructure
             .AddScoped<IProfileControlsTFRepository, ProfileControlsTFRepository>()
             .AddScoped<IProfileObjStateRepository, ProfileObjStateRepository>()
             .AddScoped<IProfileRepository, ProfileRepository>()
-            .AddScoped<IWfStateRepository, WfStateRepository>();
+            .AddScoped<IStateRepository, StateRepository>();
     }
 }
\ No newline at end of file
diff --git a/WorkFlow.Infrastructure/Repositories/WfStateRepository.cs b/WorkFlow.Infrastructure/Repositories/StateRepository.cs
similarity index 55%
rename from WorkFlow.Infrastructure/Repositories/WfStateRepository.cs
rename to WorkFlow.Infrastructure/Repositories/StateRepository.cs
index ee3d9e6..c35feff 100644
--- a/WorkFlow.Infrastructure/Repositories/WfStateRepository.cs
+++ b/WorkFlow.Infrastructure/Repositories/StateRepository.cs
@@ -4,7 +4,7 @@ using WorkFlow.Domain.Entities;
 using WorkFlow.Infrastructure.Contracts;
 namespace WorkFlow.Infrastructure.Repositories
 {
-    public class WfStateRepository(WFDBContext dbContext) : CRUDRepository<WfState, int, WFDBContext>(dbContext, dbContext.WfStates), IWfStateRepository, ICRUDRepository<WfState, int>
+    public class StateRepository(WFDBContext dbContext) : CRUDRepository<State, int, WFDBContext>(dbContext, dbContext.States), IStateRepository, ICRUDRepository<State, int>
     {
     }
 }
\ No newline at end of file
diff --git a/WorkFlow.Infrastructure/WFDBContext.cs b/WorkFlow.Infrastructure/WFDBContext.cs
index 63011f5..071ef8a 100644
--- a/WorkFlow.Infrastructure/WFDBContext.cs
+++ b/WorkFlow.Infrastructure/WFDBContext.cs
@@ -13,6 +13,6 @@ namespace WorkFlow.Infrastructure
 
         public DbSet<ProfileObjState> ProfileObjStates { get; set; }
 
-        public DbSet<WfState> WfStates { get; set; }
+        public DbSet<State> States { get; set; }
     }
 }
\ No newline at end of file