diff --git a/Maximus.Connectivity.Monitoring/Classes.mpx b/Maximus.Connectivity.Monitoring/Classes.mpx
index 6097fa0..94bbd93 100644
--- a/Maximus.Connectivity.Monitoring/Classes.mpx
+++ b/Maximus.Connectivity.Monitoring/Classes.mpx
@@ -166,7 +166,7 @@
 
         <!-- Maximus.Connectivity.Monitoring.Test.Ping -->
         <DisplayString ElementID="Maximus.Connectivity.Monitoring.Test.Ping">
-          <Name>Connectivity Test - Ping</Name>
+          <Name>Ping</Name>
           <Description>When created, this test object will add the 'ICMP availability (Ping) Monitor' monitor for the selected destination. The 'Collect Performance Data' option is supported. When on, it will record round trip time.</Description>
         </DisplayString>
         <DisplayString ElementID="Maximus.Connectivity.Monitoring.Test.Ping" SubElementID="MaxTTL">
@@ -188,13 +188,13 @@
         
         <!-- Maximus.Connectivity.Monitoring.Test.DNSNameResolution -->
         <DisplayString ElementID="Maximus.Connectivity.Monitoring.Test.DNSNameResolution">
-          <Name>Connectivity Test - DNS Name Resolution</Name>
+          <Name>DNS Name Resolution</Name>
           <Description>When created, this test object will add the 'DNS Name Resolution Monitor' monitor for the selected destination. The 'Collect Performance Data' option is not supported.</Description>
         </DisplayString>
         
         <!-- Maximus.Connectivity.Monitoring.Test.SSL -->
         <DisplayString ElementID="Maximus.Connectivity.Monitoring.Test.SSL">
-          <Name>Connectivity Test - Secure Socket Layer Connection</Name>
+          <Name>Secure Socket Layer Connection</Name>
           <Description>When created, this object will add the 'Certificate Expiration Monitor', 'Allowed SSL Protocol Monitor', 'Certificate Policy Monitor', 'Certificate Validity Monitor', 'Disabled SSL Protocols Monitor' and 'Weak Certificate Hash Signature Algorithm Monitor' monitors. Note, that certificate expiration warning threshold is set in monitor overrides, not in the object property. Default threshold is 15 days. The 'Collect Performance Data' option is not supported.</Description>
         </DisplayString>
         <DisplayString ElementID="Maximus.Connectivity.Monitoring.Test.SSL" SubElementID="AllowUnknownCertificateAuthority">
@@ -267,7 +267,7 @@
         
         <!-- Maximus.Connectivity.Monitoring.Test.HTTP -->
         <DisplayString ElementID="Maximus.Connectivity.Monitoring.Test.HTTP">
-          <Name>Connectivity Test - HTTP Probe</Name>
+          <Name>HTTP Probe</Name>
           <Description>When created, this test object will add the '' monitor for the selected destination. To assign User name and Password use the '' security profile. The 'Collect Performance Data' option is supported and will collect response time.</Description>
         </DisplayString>
         <DisplayString ElementID="Maximus.Connectivity.Monitoring.Test.HTTP" SubElementID="Accept">
diff --git a/Maximus.Connectivity.Monitoring/MPResources.resources b/Maximus.Connectivity.Monitoring/MPResources.resources
index df300fe..50b34e2 100644
Binary files a/Maximus.Connectivity.Monitoring/MPResources.resources and b/Maximus.Connectivity.Monitoring/MPResources.resources differ
diff --git a/Maximus.Connectivity.UI.Control/FQDNGridView.cs b/Maximus.Connectivity.UI.Control/FQDNGridView.cs
index 528623c..759f35f 100644
--- a/Maximus.Connectivity.UI.Control/FQDNGridView.cs
+++ b/Maximus.Connectivity.UI.Control/FQDNGridView.cs
@@ -351,6 +351,8 @@ private void RegisterCommands()
           CommandID testClassCommand = new CommandID(testClass.Id, TestClassCommandId);
           TestClassesAddCommands.Add(testClassCommand.Guid, ManagementGroup.EntityTypes.GetClass(testClass.Id));
           string commandText = string.IsNullOrWhiteSpace(testClass.DisplayName) ? testClass.Name : testClass.DisplayName;
+          ManagementPack testClassMP = testClass.GetManagementPack();
+          commandText += " (" + (testClassMP.DisplayName ?? testClassMP.Name) + ")";
           TryAddCommand(testClassCommand, $"Add {commandText}", "Adds a test to the selected destination.");
         }
         TestClassesInitialized = true;
diff --git a/README.md b/README.md
index c602527..0f97a34 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,26 @@
 # Maximus Connectivity Monitoring
 ## Management Pack for System Center Operations Manager 
-Multi-protocol connectivity testing for SCOM, including ping, HTTP, SSL/TLS, TCP, etc.
+Multi-protocol connectivity testing for SCOM, including ping, HTTP, SSL/TLS, etc.
+
+See "making of" article at http://maxcoreblog.com/2021/01/11/connectivity-monitoring-scom-management-pack-the-making-of/
+
+Main management pack features:
+
+  - All intuitive GUI driven configuration.
+  - Extendable -- other management pack authors can add more tests, which will be picked up by UI.
+
+
+Tests objects implemented in the current release:
+  - Ping (2 monitors and 1 performance collection rule)
+  - SSL Connection and Remote Certificate Validation (6 monitors)
+  - HTTP Probe (1 monitor and 1 performance collection rule)
+  - DNS Name Resolution (1 monitor)
+
+The main idea behind this management pack is to create flexible infrastructure, 
+which allows to create and configure a suitable monitoring sets for each destination. 
+Say, for instance, if you have an SQL server, you can add it as a destination,
+then add 'Ping', 'DNS Resolution', 'SSL', 'TCP Connect', and 'SQL Synthetic transaction' test objects.
+For a mail server, you can create a destination and add 'Ping', 'DNS Resolution', 'SSL', 'TCP Connect',
+'SMTP Send', and 'IMAP Receive' modules. Or, for an S3-compatible storage service you can make
+a set of 'Ping', 'DNS Resolution', 'SSL', 'TCP Connect', and 'S3 Synthetic Transaction'.
+