diff --git a/lib/pages/device_managment/shared/device_batch_control_dialog.dart b/lib/pages/device_managment/shared/device_batch_control_dialog.dart
index 84d822e6..5076ef76 100644
--- a/lib/pages/device_managment/shared/device_batch_control_dialog.dart
+++ b/lib/pages/device_managment/shared/device_batch_control_dialog.dart
@@ -7,8 +7,7 @@ import 'package:syncrow_web/pages/device_managment/all_devices/helper/route_cont
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
-class DeviceBatchControlDialog extends StatelessWidget
-    with RouteControlsBasedCode {
+class DeviceBatchControlDialog extends StatelessWidget with RouteControlsBasedCode {
   final List<AllDevicesModel> devices;
 
   const DeviceBatchControlDialog({super.key, required this.devices});
@@ -110,11 +109,11 @@ String getBatchDialogName(AllDevicesModel device) {
     case '1G':
       return "Smart Light Switch";
     case '2G':
-      return "2Gang Light";
+      return "Smart Light Switch";
     case '3G':
-      return "Living Room";
+      return "Smart Light Switch";
     case 'GW':
-      return "GateWay";
+      return "Gateway";
     case 'DL':
       return "Door Lock";
     case 'WPS':
@@ -124,9 +123,21 @@ String getBatchDialogName(AllDevicesModel device) {
     case 'CUR':
       return "Smart Curtains";
     case 'WH':
-      return "Smart Water Hater";
+      return "Smart Water Heater";
     case 'AC':
       return "Smart AC";
+    case 'DS':
+      return "Door / Window Sensor";
+    case '1GT':
+      return "Touch Switch";
+    case '2GT':
+      return "Touch Switch";
+    case '3GT':
+      return "Touch Switch";
+    case 'GD':
+      return "Garage Door Opener";
+    case 'WL':
+      return "Water Leak Sensor";
     default:
       return device.categoryName ?? 'Device Control';
   }
diff --git a/lib/pages/device_managment/shared/device_control_dialog.dart b/lib/pages/device_managment/shared/device_control_dialog.dart
index 6a45ce18..14878a46 100644
--- a/lib/pages/device_managment/shared/device_control_dialog.dart
+++ b/lib/pages/device_managment/shared/device_control_dialog.dart
@@ -31,7 +31,7 @@ class DeviceControlDialog extends StatelessWidget with RouteControlsBasedCode {
                   children: [
                     const SizedBox(),
                     Text(
-                      device.categoryName ?? 'Device Control',
+                      device.productName ?? 'Device Control',
                       style: TextStyle(
                         fontWeight: FontWeight.bold,
                         fontSize: 22,