diff --git a/src/integrations/src/AXOpen.Integrations.Blazor/Pages/FetchData.razor b/src/integrations/src/AXOpen.Integrations.Blazor/Pages/FetchData.razor
index 0cee950dd..cc16e6c3c 100644
--- a/src/integrations/src/AXOpen.Integrations.Blazor/Pages/FetchData.razor
+++ b/src/integrations/src/AXOpen.Integrations.Blazor/Pages/FetchData.razor
@@ -53,6 +53,6 @@ else
 
     public void CreateToast()
     {
-        DialogService.AddAlertDialog(eAlertDialogType.Success, "Test", "test", 30);
+        DialogService.AddAlertDialog(eAlertType.Success, "Test", "test", 30);
     }
 }
diff --git a/src/templates.simple/ax/src/templates/unit/server/UnitTemplate.razor b/src/templates.simple/ax/src/templates/unit/server/UnitTemplate.razor
index a1e9d4bfe..d4b9bea37 100644
--- a/src/templates.simple/ax/src/templates/unit/server/UnitTemplate.razor
+++ b/src/templates.simple/ax/src/templates/unit/server/UnitTemplate.razor
@@ -5,7 +5,7 @@
 @using AXOpen.VisualComposer;
 @using AXSharp.Connector;
 @using AXOpen.Core;
-@inject IAlertDialogService _alerts
+@inject IAlertService _alerts
 @inherits RenderableComplexComponentBase<axosimple.UnitTemplate.Unit>
 
 
diff --git a/src/templates.simple/axosimple.sln b/src/templates.simple/axosimple.sln
index 61c4be531..2b91d7cb1 100644
--- a/src/templates.simple/axosimple.sln
+++ b/src/templates.simple/axosimple.sln
@@ -47,7 +47,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.MongoDb", "..\data\src\repositories\MongoDb\AXOpen.Data.MongoDb.csproj", "{6600F42A-C561-41A5-BB6B-2C93613DB92E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AxOpen.Inspectors.Blazor", "..\inspectors\src\AXOpen.Inspectors.blazor\AxOpen.Inspectors.Blazor.csproj", "{286B0C9D-2B65-4C10-B7D2-19052C559ACC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Inspectors.Blazor", "..\inspectors\src\AXOpen.Inspectors.blazor\AXOpen.Inspectors.Blazor.csproj", "{286B0C9D-2B65-4C10-B7D2-19052C559ACC}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ix_ax_axopen_inspectors", "..\inspectors\src\AXOpen.Inspectors\ix_ax_axopen_inspectors.csproj", "{21BC94A1-E2EE-46A8-B062-45581DF36A3E}"
 EndProject
@@ -55,9 +55,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ix_ax_axopen_io", "..\io\sr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ix_ax_ax_sdk", "..\sdk-ax\ctrl\ix\ix_ax_ax_sdk.csproj", "{8A767D14-0309-494B-BC9F-D48D65C7ACF7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{9E31DA60-74BA-484D-875F-A0429EB31EDF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{9E31DA60-74BA-484D-875F-A0429EB31EDF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{85FDDFCA-D24E-4F3A-BA06-9F0369B44609}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\security\src\AXOpen.Security\AXOpen.Security.csproj", "{85FDDFCA-D24E-4F3A-BA06-9F0369B44609}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ix_ax_axopen_simatic1500", "..\simatic1500\ctrl\ix\ix_ax_axopen_simatic1500.csproj", "{81B6C9F9-9762-4D72-863D-9FEC9DCC2A99}"
 EndProject
@@ -205,13 +205,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{43F64FF5-AD56-4894-AA58-262B5F390E75}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{119FD137-5E60-4A1E-BFE8-55846B5EB162}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\security\src\AXOpen.Security.Blazor", "{119FD137-5E60-4A1E-BFE8-55846B5EB162}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{BF810C4C-61B8-4021-8413-0DB2A86B90B9}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\security\src\AXOpen.Security", "{BF810C4C-61B8-4021-8413-0DB2A86B90B9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{7893F729-96F2-406E-A028-70DC28D95530}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\security\src", "{7893F729-96F2-406E-A028-70DC28D95530}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{1CAA7320-D822-4287-8318-8D2740F18BC8}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "security", "..\security", "{1CAA7320-D822-4287-8318-8D2740F18BC8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{2B44526B-EB7F-4233-A6C9-8F89A294507E}"
 EndProject
diff --git a/src/templates.simple/axpansion/server/Pages/Context/Units/Units.razor b/src/templates.simple/axpansion/server/Pages/Context/Units/Units.razor
index f0432eacb..708bd129f 100644
--- a/src/templates.simple/axpansion/server/Pages/Context/Units/Units.razor
+++ b/src/templates.simple/axpansion/server/Pages/Context/Units/Units.razor
@@ -32,14 +32,14 @@
 {
     private async Task Automat()
     {
-        _alerts.AddAlertDialog(eAlertDialogType.Info, Localizer["Mode change"], $"{Localizer[$"Requesting automatic mode of selected units"]}.", 1);
+        _alerts.AddAlertDialog(eAlertType.Info, Localizer["Mode change"], $"{Localizer[$"Requesting automatic mode of selected units"]}.", 1);
 
         var notGroundedStations = ControlledUnits.Where(p => p.unit.GroundStatus != eAxoTaskState.Done);
         var ungroundedStationsList = string.Join(",", notGroundedStations.Select(p => p.unit.Component.AttributeName));
 
         if (notGroundedStations.Count() > 0)
         {
-            _alerts.AddAlertDialog(eAlertDialogType.Warning, Localizer["Mode change"], 
+            _alerts.AddAlertDialog(eAlertType.Warning, Localizer["Mode change"],
                 $"{Localizer[$"Cannot start automatic mode on unit(s)"]} `{ungroundedStationsList}`. Ground must be executed successfully first.", 5);
             return;
         }
@@ -49,12 +49,12 @@
             await a.unit.Automat.ExecuteAsync();
         }
 
-        _alerts.AddAlertDialog(eAlertDialogType.Success, Localizer["Mode change"], $"{Localizer[$"Automatic mode of selected units"]} has been started.", 3);
+        _alerts.AddAlertDialog(eAlertType.Success, Localizer["Mode change"], $"{Localizer[$"Automatic mode of selected units"]} has been started.", 3);
     }
 
     private async Task Ground()
     {
-        _alerts.AddAlertDialog(eAlertDialogType.Info, Localizer["Mode change"], $"{Localizer[$"Requesting ground mode of selected units"]}.", 1);
+        _alerts.AddAlertDialog(eAlertType.Info, Localizer["Mode change"], $"{Localizer[$"Requesting ground mode of selected units"]}.", 1);
         int expectedTimeToExecute = 20000;
         ControlledUnits.ToList().ForEach(async a => await a.unit.Ground.ExecuteAsync());
 
@@ -79,7 +79,7 @@
                 .Where(p => p.unit.GroundStatus != eAxoTaskState.Done)
                 .Select(p => p.unit.Component.AttributeName));
 
-            _alerts.AddAlertDialog(eAlertDialogType.Danger,
+            _alerts.AddAlertDialog(eAlertType.Danger,
                 Localizer["Mode change"],
                 $"{Localizer[$"Ground mode did not succeed on unit"]} " +
                 $"{pp}", 5);
@@ -87,7 +87,7 @@
             return;
         }
 
-        _alerts.AddAlertDialog(eAlertDialogType.Success, 
+        _alerts.AddAlertDialog(eAlertType.Success,
             Localizer["Mode change"], 
             $"{Localizer[$"Ground mode of selected unit(s)"]} was successfully executed.", 3);