diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 717809deb4f..797683de6c6 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -8,6 +8,9 @@ message.setup.physical.network.during.zone.creation.basic=When adding a basic zo
 label.domain.router=Domain router
 label.console.proxy=Console proxy
 label.secondary.storage.vm=Secondary storage VM
+label.add.netScaler.device=Add Netscaler device
+label.add.F5.device=Add F5 device
+label.add.SRX.device=Add SRX device
 #new labels (end) ************************************************************************************************
 
 
diff --git a/ui/index.jsp b/ui/index.jsp
index 37adb4093e9..889b872906e 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -2928,6 +2928,9 @@ dictionary = {
 'label.vm.state': '<fmt:message key="label.vm.state" />',
 'label.domain.router' : '<fmt:message key="label.domain.router" />',
 'label.console.proxy' : '<fmt:message key="label.console.proxy" />',
-'label.secondary.storage.vm' : '<fmt:message key="label.secondary.storage.vm" />'
+'label.secondary.storage.vm' : '<fmt:message key="label.secondary.storage.vm" />',
+'label.add.netScaler.device': '<fmt:message key="label.add.netScaler.device" />',
+'label.add.F5.device': '<fmt:message key="label.add.F5.device" />',
+'label.add.SRX.device': '<fmt:message key="label.add.SRX.device" />'
 };
 </script>
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index c8b1164e594..f4efea440dd 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -2347,9 +2347,9 @@
             },
             actions: {
               add: {
-                label: 'label.add.new.NetScaler',
+                label: 'label.add.netScaler.device',
                 createForm: {
-                  title: 'label.add.new.NetScaler',
+                  title: 'label.add.netScaler.device',
                   fields: {
                     ip: {
                       label: 'label.ip.address'
@@ -2403,7 +2403,7 @@
                 },
 								messages: {
                   notification: function(args) {
-                    return 'label.add.new.NetScaler';
+                    return 'label.add.netScaler.device';
                   }
                 },
                 action: function(args) {
@@ -2582,9 +2582,9 @@
             },
             actions: {
               add: {
-                label: 'label.add.new.F5',
+                label: 'label.add.F5.device',
                 createForm: {
-                  title: 'label.add.new.F5',
+                  title: 'label.add.F5.device',
                   fields: {
                     ip: {
                       label: 'label.ip.address'
@@ -2678,7 +2678,7 @@
                 },
                 messages: {
                   notification: function(args) {
-                    return 'label.add.new.F5';
+                    return 'label.add.F5.device';
                   }
                 },
                 notification: {
@@ -2815,9 +2815,9 @@
             },
             actions: {
               add: {
-                label: 'label.add.new.SRX',
+                label: 'label.add.SRX.device',
                 createForm: {
-                  title: 'label.add.new.SRX',
+                  title: 'label.add.SRX.device',
                   fields: {
                     ip: {
                       label: 'label.ip.address'
@@ -2926,7 +2926,7 @@
                 },
                 messages: {
                   notification: function(args) {
-                    return 'label.add.new.SRX';
+                    return 'label.add.SRX.device';
                   }
                 },
                 notification: {
@@ -3993,10 +3993,10 @@
       }
     }),
     subsections: {
-      // Provider list views
+      // netscaler devices listView
       netscalerProviders: {
         id: 'netscalerProviders',
-        title: 'label.netScaler',
+        title: 'label.devices',
         listView: {
           id: 'netscalerProviders',
           fields: {
@@ -4023,9 +4023,9 @@
           },
           actions: {
             add: {
-              label: 'label.add.new.NetScaler',
+              label: 'label.add.netScaler.device',
               createForm: {
-                title: 'label.add.new.NetScaler',
+                title: 'label.add.netScaler.device',
                 fields: {
                   ip: {
                     label: 'label.ip.address'
@@ -4121,7 +4121,7 @@
               },
               messages: {
                 notification: function(args) {
-                  return 'label.add.new.NetScaler';
+                  return 'label.add.netScaler.device';
                 }
               },
               notification: {
@@ -4199,9 +4199,10 @@
         }
       },
 
+			// F5 devices listView
       f5Providers: {
         id: 'f5Providers',
-        title: 'label.f5',
+        title: 'label.devices',
         listView: {
           id: 'f5Providers',
           fields: {
@@ -4216,9 +4217,9 @@
           },
           actions: {
             add: {
-              label: 'label.add.new.F5',
+              label: 'label.add.F5.device',
               createForm: {
-                title: 'label.add.new.F5',
+                title: 'label.add.F5.device',
                 fields: {
                   ip: {
                     label: 'label.ip.address'
@@ -4398,9 +4399,10 @@
         }
       },
 
+			//SRX devices listView
       srxProviders: {
         id: 'srxProviders',
-        title: 'label.srx',
+        title: 'label.devices',
         listView: {
           id: 'srxProviders',
           fields: {
@@ -4410,9 +4412,9 @@
           },
           actions: {
             add: {
-              label: 'label.add.new.SRX',
+              label: 'label.add.SRX.device',
               createForm: {
-                title: 'label.add.new.SRX',
+                title: 'label.add.SRX.device',
                 fields: {
                   ip: {
                     label: 'label.ip.address'
@@ -4521,7 +4523,7 @@
               },
               messages: {
                 notification: function(args) {
-                  return 'label.add.new.SRX';
+                  return 'label.add.SRX.device';
                 }
               },
               notification: {