diff --git a/Class_Diagram.md b/Class_Diagram.md
index 777c911..7ea7ec7 100644
--- a/Class_Diagram.md
+++ b/Class_Diagram.md
@@ -433,15 +433,15 @@ package Data <<Database>> #ddd {
   
     package Dice #fdb {
     
-      class DieEntity $todo
+      class NumberDieEntity $todo
       
-	  class DieExtensions <<static>> $todo
+	  class NumberDieExtensions <<static>> $todo
       
       class DiceGroupDbManager $todo
     
-      class FaceEntity $todo
+      class NumberFaceEntity $todo
       
-	  class FaceExtensions <<static>> $todo
+	  class NumberFaceExtensions <<static>> $todo
     }
     
     package Games #daf {
@@ -483,14 +483,14 @@ DiceAppDbContext .left.|> ILoader
 
 PlayerExtensions ..> PlayerEntity
 
-DieExtensions ..> DieEntity
-FaceExtensions ..> FaceEntity
+DieExtensions ..> NumberDieEntity
+FaceExtensions ..> NumberFaceEntity
 
 GameExtensions ..> GameEntity
 TurnExtensions ..> TurnEntity
 
 DiceAppDbContext -down-> "[*]" PlayerEntity
-DiceAppDbContext -right-> "[*]" DieEntity
+DiceAppDbContext -right-> "[*]" NumberDieEntity
 DiceAppDbContext -up-> "[*]" GameEntity
 DiceAppDbContext --> "[*]" TurnEntity
 
@@ -520,15 +520,15 @@ package Data <<Database>> #ddd {
   
     package Dice #fdb {
     
-      class DieEntity $todo
+      class NumberDieEntity $todo
       
-	  class DieExtensions <<static>> $todo
+	  class NumberDieExtensions <<static>> $todo
       
       class DiceGroupDbManager $todo
     
-      class FaceEntity $todo
+      class NumberFaceEntity $todo
       
-	  class FaceExtensions <<static>> $todo
+	  class NumberFaceExtensions <<static>> $todo
     }
     
     package Games #daf {
@@ -565,14 +565,14 @@ DiceAppDbContextWithStub -down-|> DiceAppDbContext
 
 PlayerExtensions ..> PlayerEntity
 
-DieExtensions ..> DieEntity
-FaceExtensions ..> FaceEntity
+DieExtensions ..> NumberDieEntity
+FaceExtensions ..> NumberFaceEntity
 
 GameExtensions ..> GameEntity
 TurnExtensions ..> TurnEntity
 
 DiceAppDbContext -down-> "[*]" PlayerEntity
-DiceAppDbContext -right-> "[*]" DieEntity
+DiceAppDbContext -right-> "[*]" NumberDieEntity
 DiceAppDbContext -up-> "[*]" GameEntity
 DiceAppDbContext -up-> "[*]" TurnEntity
 
@@ -669,11 +669,11 @@ package Data <<Database>> #ddd {
   
     package Dice #fdb {
     
-      class DieEntity $todo
+      class NumberDieEntity $todo
       
       class DiceGroupDbManager $todo
       
-      class FaceEntity $todo
+      class NumberFaceEntity $todo
     }
     
     package Games #daf {
@@ -709,8 +709,8 @@ DiceAppDbContextWithStub --|> DiceAppDbContext
 DiceAppDbContext --|> System.Data.Entity.DbContext
 
 DiceAppDbContext --> "[*] /+Players" PlayerEntity
-DiceAppDbContext --> "[*] /+Dice" DieEntity
-DiceAppDbContext --> "[*] /+Faces" FaceEntity
+DiceAppDbContext --> "[*] /+Dice" NumberDieEntity
+DiceAppDbContext --> "[*] /+Faces" NumberFaceEntity
 DiceAppDbContext -up-> "[*] /+Games" GameEntity
 DiceAppDbContext -up-> "[*] /+Turns" TurnEntity