diff --git a/Pizzeria/Pizzeria.sln b/Pizzeria/Pizzeria.sln
index 8665472..2f7e985 100644
--- a/Pizzeria/Pizzeria.sln
+++ b/Pizzeria/Pizzeria.sln
@@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PizzeriaListImplement", "Pi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PizzeriaBusinessLogic", "PizzeriaBusinessLogic\PizzeriaBusinessLogic.csproj", "{16EC5652-8348-4520-9736-1889B2749416}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PizzeriaFileImplement", "AbstractShopFileImplement\PizzeriaFileImplement.csproj", "{87ACB324-2C2F-48B1-A945-0F348CCA8F69}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PizzeriaFileImplement", "PizzeriaFileImplement\PizzeriaFileImplement.csproj", "{5FA9C75E-4A06-4B3E-AD87-48B0C96BB4A1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -41,10 +41,10 @@ Global
 		{16EC5652-8348-4520-9736-1889B2749416}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{16EC5652-8348-4520-9736-1889B2749416}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{16EC5652-8348-4520-9736-1889B2749416}.Release|Any CPU.Build.0 = Release|Any CPU
-		{87ACB324-2C2F-48B1-A945-0F348CCA8F69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{87ACB324-2C2F-48B1-A945-0F348CCA8F69}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{87ACB324-2C2F-48B1-A945-0F348CCA8F69}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{87ACB324-2C2F-48B1-A945-0F348CCA8F69}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5FA9C75E-4A06-4B3E-AD87-48B0C96BB4A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5FA9C75E-4A06-4B3E-AD87-48B0C96BB4A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5FA9C75E-4A06-4B3E-AD87-48B0C96BB4A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5FA9C75E-4A06-4B3E-AD87-48B0C96BB4A1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Pizzeria/Pizzeria/Pizzeria.csproj b/Pizzeria/Pizzeria/Pizzeria.csproj
index b29b63d..d5d1372 100644
--- a/Pizzeria/Pizzeria/Pizzeria.csproj
+++ b/Pizzeria/Pizzeria/Pizzeria.csproj
@@ -26,9 +26,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\AbstractShopFileImplement\PizzeriaFileImplement.csproj" />
     <ProjectReference Include="..\PizzeriaBusinessLogic\PizzeriaBusinessLogic.csproj" />
     <ProjectReference Include="..\PizzeriaContracts\PizzeriaContracts.csproj" />
+    <ProjectReference Include="..\PizzeriaFileImplement\PizzeriaFileImplement.csproj" />
     <ProjectReference Include="..\PizzeriaListImplement\PizzeriaListImplement.csproj" />
   </ItemGroup>
 
diff --git a/Pizzeria/Pizzeria/Program.cs b/Pizzeria/Pizzeria/Program.cs
index f3c71bc..82ced79 100644
--- a/Pizzeria/Pizzeria/Program.cs
+++ b/Pizzeria/Pizzeria/Program.cs
@@ -1,10 +1,10 @@
 using Microsoft.Extensions.DependencyInjection;
 using PizzeriaContracts.BusinessLogicsContracts;
 using PizzeriaContracts.StorageContracts;
-using PizzeriaFileImplement.Implements;
 using PizzeriaBusinessLogic.BusinessLogic;
 using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;
+using PizzeriaFileImplement.Implements;
 
 namespace Pizzeria
 {
diff --git a/Pizzeria/AbstractShopFileImplement/DataFileSingleton.cs b/Pizzeria/PizzeriaFileImplement/DataFileSingleton.cs
similarity index 100%
rename from Pizzeria/AbstractShopFileImplement/DataFileSingleton.cs
rename to Pizzeria/PizzeriaFileImplement/DataFileSingleton.cs
diff --git a/Pizzeria/AbstractShopFileImplement/Implements/ComponentStorage.cs b/Pizzeria/PizzeriaFileImplement/Implements/ComponentStorage.cs
similarity index 100%
rename from Pizzeria/AbstractShopFileImplement/Implements/ComponentStorage.cs
rename to Pizzeria/PizzeriaFileImplement/Implements/ComponentStorage.cs
diff --git a/Pizzeria/AbstractShopFileImplement/Implements/OrderStorage.cs b/Pizzeria/PizzeriaFileImplement/Implements/OrderStorage.cs
similarity index 95%
rename from Pizzeria/AbstractShopFileImplement/Implements/OrderStorage.cs
rename to Pizzeria/PizzeriaFileImplement/Implements/OrderStorage.cs
index d4282ba..c76c803 100644
--- a/Pizzeria/AbstractShopFileImplement/Implements/OrderStorage.cs
+++ b/Pizzeria/PizzeriaFileImplement/Implements/OrderStorage.cs
@@ -79,11 +79,6 @@ namespace PizzeriaFileImplement.Implements
         private OrderViewModel AddPizzaName(OrderViewModel model)
         {
             var selectedPizza = source.Pizzas.FirstOrDefault(x => x.Id == model.PizzaId);
-
-            if (selectedPizza != null)
-            {
-                model.PizzaName = selectedPizza.PizzaName;
-            }
             model.PizzaName = selectedPizza?.PizzaName;
             return model;
         }
diff --git a/Pizzeria/AbstractShopFileImplement/Implements/PizzaStorage.cs b/Pizzeria/PizzeriaFileImplement/Implements/PizzaStorage.cs
similarity index 100%
rename from Pizzeria/AbstractShopFileImplement/Implements/PizzaStorage.cs
rename to Pizzeria/PizzeriaFileImplement/Implements/PizzaStorage.cs
diff --git a/Pizzeria/AbstractShopFileImplement/Models/Component.cs b/Pizzeria/PizzeriaFileImplement/Models/Component.cs
similarity index 100%
rename from Pizzeria/AbstractShopFileImplement/Models/Component.cs
rename to Pizzeria/PizzeriaFileImplement/Models/Component.cs
diff --git a/Pizzeria/AbstractShopFileImplement/Models/Order.cs b/Pizzeria/PizzeriaFileImplement/Models/Order.cs
similarity index 100%
rename from Pizzeria/AbstractShopFileImplement/Models/Order.cs
rename to Pizzeria/PizzeriaFileImplement/Models/Order.cs
diff --git a/Pizzeria/AbstractShopFileImplement/Models/Pizza.cs b/Pizzeria/PizzeriaFileImplement/Models/Pizza.cs
similarity index 100%
rename from Pizzeria/AbstractShopFileImplement/Models/Pizza.cs
rename to Pizzeria/PizzeriaFileImplement/Models/Pizza.cs
diff --git a/Pizzeria/AbstractShopFileImplement/PizzeriaFileImplement.csproj b/Pizzeria/PizzeriaFileImplement/PizzeriaFileImplement.csproj
similarity index 100%
rename from Pizzeria/AbstractShopFileImplement/PizzeriaFileImplement.csproj
rename to Pizzeria/PizzeriaFileImplement/PizzeriaFileImplement.csproj