diff --git a/WebDoorCreator.API/Controllers/QueueController.cs b/WebDoorCreator.API/Controllers/QueueController.cs
index bf04d07..65c1317 100644
--- a/WebDoorCreator.API/Controllers/QueueController.cs
+++ b/WebDoorCreator.API/Controllers/QueueController.cs
@@ -14,7 +14,7 @@ namespace WebDoorCreator.API.Controllers
         {
             Log.Info("Starting QueueController");
             _configuration = configuration;
-            QDService = DataService;
+            QDataServ = DataService;
             Log.Info("Avviato QueueController");
         }
 
@@ -29,7 +29,7 @@ namespace WebDoorCreator.API.Controllers
         [HttpGet("ActPendingLenght")]
         public async Task<long> ActPendingLenght()
         {
-            long numQueue = await QDService.NumRequestPending();
+            long numQueue = await QDataServ.NumRequestPending();
             return numQueue;
         }
 
@@ -40,7 +40,7 @@ namespace WebDoorCreator.API.Controllers
         [HttpGet("ActProcessingLenght")]
         public async Task<long> ActProcessingLenght()
         {
-            long numQueue = await QDService.NumRequestProcessing();
+            long numQueue = await QDataServ.NumRequestProcessing();
             return numQueue;
         }
 
@@ -107,7 +107,7 @@ namespace WebDoorCreator.API.Controllers
         [HttpGet("ShowPending")]
         public async Task<Dictionary<string, string>?> ShowPending()
         {
-            var actQueue = await QDService.RequestPending();
+            var actQueue = await QDataServ.RequestPending();
             return actQueue;
         }
 
@@ -118,7 +118,7 @@ namespace WebDoorCreator.API.Controllers
         [HttpGet("ShowProcessing")]
         public async Task<Dictionary<string, string>> ShowProcessing()
         {
-            var actQueue = await QDService.RequestProcessing();
+            var actQueue = await QDataServ.RequestProcessing();
             return actQueue;
         }
 
@@ -131,7 +131,7 @@ namespace WebDoorCreator.API.Controllers
         [HttpGet("TakeProcessingItems")]
         public async Task<Dictionary<string, string>> TakeProcessingItems(int numItems)
         {
-            var actQueue = await QDService.TakeProcessingItems(numItems);
+            var actQueue = await QDataServ.TakeProcessingItems(numItems);
             return actQueue;
         }
 
@@ -147,7 +147,7 @@ namespace WebDoorCreator.API.Controllers
 
         #region Private Properties
 
-        private QueueDataService QDService { get; set; } = null!;
+        private QueueDataService QDataServ { get; set; } = null!;
 
         #endregion Private Properties
     }
diff --git a/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs b/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs
index 6991b90..d3142aa 100644
--- a/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs
+++ b/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs
@@ -29,7 +29,7 @@ namespace WebDoorCreator.UI.Components.Buttons
         protected WebDoorCreatorService WDCService { get; set; } = null!;
 
         [Inject]
-        protected QueueDataService QueueDataServ { get; set; } = null!;
+        protected QueueDataService QDataServ { get; set; } = null!;
 
 
         [Inject]
@@ -129,7 +129,7 @@ namespace WebDoorCreator.UI.Components.Buttons
                 await SaveYaml();
             }
 
-            await QueueDataServ.sendCalcReq($"ORD{idOrd:00000}");
+            await QDataServ.sendCalcReq($"ORD{idOrd:00000}");
         }
     }
 }
\ No newline at end of file
diff --git a/WebDoorCreator.UI/Components/DoorDef/DoorDefSizingSI.razor.cs b/WebDoorCreator.UI/Components/DoorDef/DoorDefSizingSI.razor.cs
index 611e0b7..04a0a03 100644
--- a/WebDoorCreator.UI/Components/DoorDef/DoorDefSizingSI.razor.cs
+++ b/WebDoorCreator.UI/Components/DoorDef/DoorDefSizingSI.razor.cs
@@ -81,7 +81,7 @@ namespace WebDoorCreator.UI.Components.DoorDef
         protected WDCVocabularyService WDVService { get; set; } = null!;
 
         [Inject]
-        protected QueueDataService CamDataServ { get; set; } = null!;
+        protected QueueDataService QDataServ { get; set; } = null!;
 
         #endregion Protected Properties
 
@@ -170,7 +170,7 @@ namespace WebDoorCreator.UI.Components.DoorDef
             DoorOpInst.JsoncActVal = serVal;
             // salvo!
             await WDCService.DoorOpUpdate(DoorOpInst);
-            await CamDataServ.sendCalcReq($"ORD{DoorOpInst.DoorId:00000}");
+            await QDataServ.sendCalcReq($"ORD{DoorOpInst.DoorId:00000}");
             // rileggo
             await FullReloadData(true);
         }
diff --git a/WebDoorCreator.UI/Components/DoorDef/DoorSizingStep.razor.cs b/WebDoorCreator.UI/Components/DoorDef/DoorSizingStep.razor.cs
index e11ff84..8c96bb1 100644
--- a/WebDoorCreator.UI/Components/DoorDef/DoorSizingStep.razor.cs
+++ b/WebDoorCreator.UI/Components/DoorDef/DoorSizingStep.razor.cs
@@ -12,7 +12,7 @@ namespace WebDoorCreator.UI.Components.DoorDef
         protected WebDoorCreatorService WDService { get; set; } = null!;
 
         [Inject]
-        protected QueueDataService CamDataServ { get; set; } = null!;
+        protected QueueDataService QDataServ { get; set; } = null!;
 
         [Parameter]
         public int DoorId { get; set; } = 0;
@@ -81,7 +81,7 @@ namespace WebDoorCreator.UI.Components.DoorDef
         //            if (_lockEdge != DefaultEdges.lockEdge)
         //            {
         //                paramIsChanged = true;
-        //                var pUpd = Task.Run(async () => await QueueDataServ.sendCalcReq($"ORD{DoorId:00000}"));
+        //                var pUpd = Task.Run(async () => await QDataServ.sendCalcReq($"ORD{DoorId:00000}"));
         //            }
         //        }
         //    }
@@ -100,7 +100,7 @@ namespace WebDoorCreator.UI.Components.DoorDef
         //            if (_height != DefaultSizing.height)
         //            {
         //                paramIsChanged = true;
-        //                var pUpd = Task.Run(async () => await QueueDataServ.sendCalcReq($"ORD{DoorId:00000}"));
+        //                var pUpd = Task.Run(async () => await QDataServ.sendCalcReq($"ORD{DoorId:00000}"));
         //            }
         //        }
         //    }
diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs
index ffd3bf0..39eee69 100644
--- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs
+++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs
@@ -111,7 +111,7 @@ namespace WebDoorCreator.UI.Components.Hardware
         protected WDCVocabularyService WDVService { get; set; } = null!;
 
         [Inject]
-        protected QueueDataService CamDataServ { get; set; } = null!;
+        protected QueueDataService QDataServ { get; set; } = null!;
 
         #endregion Protected Properties
 
@@ -200,7 +200,7 @@ namespace WebDoorCreator.UI.Components.Hardware
             DoorOpInst.JsoncActVal = serVal;
             // salvo!
             await WDCService.DoorOpUpdate(DoorOpInst);
-            await CamDataServ.sendCalcReq($"ORD{DoorOpInst.DoorId:00000}");
+            await QDataServ.sendCalcReq($"ORD{DoorOpInst.DoorId:00000}");
             // rileggo
             await FullReloadData(true);
         }
diff --git a/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs b/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs
index 24cbd86..26b6d45 100644
--- a/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs
+++ b/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs
@@ -16,7 +16,7 @@ namespace WebDoorCreator.UI.Pages
         public void Dispose()
         {
             WDCUService.EA_CurrLanguage -= WDUService_EA_CurrLanguage;
-            CamDataServ.calcDonePipe.EA_NewMessage -= CalcDonePipe_EA_NewMessage;
+            QDataServ.calcDonePipe.EA_NewMessage -= CalcDonePipe_EA_NewMessage;
         }
 
         #endregion Public Methods
@@ -24,7 +24,7 @@ namespace WebDoorCreator.UI.Pages
         #region Protected Properties
 
         [Inject]
-        protected QueueDataService CamDataServ { get; set; } = null!;
+        protected QueueDataService QDataServ { get; set; } = null!;
 
         protected string DoorSvgContent { get; set; } = "";
         protected int idDoor { get; set; } = 0;
@@ -72,7 +72,7 @@ namespace WebDoorCreator.UI.Pages
             }
             userLang = WDCUService.currLanguage ?? "EN";
             WDCUService.EA_CurrLanguage += WDUService_EA_CurrLanguage;
-            CamDataServ.calcDonePipe.EA_NewMessage += CalcDonePipe_EA_NewMessage;
+            QDataServ.calcDonePipe.EA_NewMessage += CalcDonePipe_EA_NewMessage;
         }
 
         protected async Task ReloadData()