diff --git a/security/manager/locales/en-US/chrome/pipnss/pipnss.properties b/security/manager/locales/en-US/chrome/pipnss/pipnss.properties
index cec6136cc4c..90917c068f8 100644
--- a/security/manager/locales/en-US/chrome/pipnss/pipnss.properties
+++ b/security/manager/locales/en-US/chrome/pipnss/pipnss.properties
@@ -68,10 +68,10 @@ SlotDescription=PSM Internal Cryptographic Services
 # 64 bytes long after conversion to UTF8
 PrivateSlotDescription=PSM Private Keys
 #
+# 32
+Fips140TokenDescription=FIPS-140 Softw. Security Device
 # 64
-FipsSlotDescription=PSM Internal FIPS-140-1 Cryptographic Services
-# 64
-FipsPrivateSlotDescription=PSM FIPS-140-1 User Private Key Services
+Fips140SlotDescription=FIPS-140 Cryptographic, Key and Certificate Services
 # 32
 InternalToken=Software Security Device
 # End of size restriction.
diff --git a/security/manager/pki/resources/content/device_manager.xul b/security/manager/pki/resources/content/device_manager.xul
index 09b653bf157..ec4de0aab29 100644
--- a/security/manager/pki/resources/content/device_manager.xul
+++ b/security/manager/pki/resources/content/device_manager.xul
@@ -61,7 +61,7 @@
 <grid flex="1" style="margin:5px">
   <columns>
     <column flex="1"/> 
-    <column flex="1"/> 
+    <column flex="3"/> 
     <column/>
   </columns>
   <rows>
diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
index f40cfd37261..8c1b5ea9a8e 100644
--- a/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/security/manager/ssl/src/nsNSSComponent.cpp
@@ -802,8 +802,8 @@ nsNSSComponent::ConfigureInternalPKCS11Token()
   nsAutoString privateTokenDescription;
   nsAutoString slotDescription;
   nsAutoString privateSlotDescription;
-  nsAutoString fipsSlotDescription;
-  nsAutoString fipsPrivateSlotDescription;
+  nsAutoString fips140TokenDescription;
+  nsAutoString fips140SlotDescription;
 
   nsresult rv;
   rv = GetPIPNSSBundleString("ManufacturerID", manufacturerID);
@@ -824,10 +824,10 @@ nsNSSComponent::ConfigureInternalPKCS11Token()
   rv = GetPIPNSSBundleString("PrivateSlotDescription", privateSlotDescription);
   if (NS_FAILED(rv)) return rv;
 
-  rv = GetPIPNSSBundleString("FipsSlotDescription", fipsSlotDescription);
+  rv = GetPIPNSSBundleString("Fips140TokenDescription", fips140TokenDescription);
   if (NS_FAILED(rv)) return rv;
 
-  rv = GetPIPNSSBundleString("FipsPrivateSlotDescription", fipsPrivateSlotDescription);
+  rv = GetPIPNSSBundleString("Fips140SlotDescription", fips140SlotDescription);
   if (NS_FAILED(rv)) return rv;
 
   PK11_ConfigurePKCS11(NS_ConvertUTF16toUTF8(manufacturerID).get(),
@@ -836,8 +836,8 @@ nsNSSComponent::ConfigureInternalPKCS11Token()
                        NS_ConvertUTF16toUTF8(privateTokenDescription).get(),
                        NS_ConvertUTF16toUTF8(slotDescription).get(),
                        NS_ConvertUTF16toUTF8(privateSlotDescription).get(),
-                       NS_ConvertUTF16toUTF8(fipsSlotDescription).get(),
-                       NS_ConvertUTF16toUTF8(fipsPrivateSlotDescription).get(),
+                       NS_ConvertUTF16toUTF8(fips140TokenDescription).get(),
+                       NS_ConvertUTF16toUTF8(fips140SlotDescription).get(),
                        0, 0);
   return NS_OK;
 }