diff --git a/K2Field.ServiceBroker.EmailTemplate/Installer/K2Field.ServiceBroker.EmailTemplate.dll b/K2Field.ServiceBroker.EmailTemplate/Installer/K2Field.ServiceBroker.EmailTemplate.dll
index e4a885e..c635c56 100644
Binary files a/K2Field.ServiceBroker.EmailTemplate/Installer/K2Field.ServiceBroker.EmailTemplate.dll and b/K2Field.ServiceBroker.EmailTemplate/Installer/K2Field.ServiceBroker.EmailTemplate.dll differ
diff --git a/K2Field.ServiceBroker.EmailTemplate/K2Field.ServiceBroker.EmailTemplate/Constants/ServiceConfig.cs b/K2Field.ServiceBroker.EmailTemplate/K2Field.ServiceBroker.EmailTemplate/Constants/ServiceConfig.cs
index 41e90fa..0ce3fc5 100644
--- a/K2Field.ServiceBroker.EmailTemplate/K2Field.ServiceBroker.EmailTemplate/Constants/ServiceConfig.cs
+++ b/K2Field.ServiceBroker.EmailTemplate/K2Field.ServiceBroker.EmailTemplate/Constants/ServiceConfig.cs
@@ -8,13 +8,13 @@ namespace K2Field.ServiceBroker.EmailTemplate.Constants
 {
     public static class ServiceConfig
     {
-        public const string PlaceholderSmoSystemName = "Smo System Name (Dynamic Placeholders)";
-        public const string ListMethodName = "Smo List Method Name";
-        public const string PlaceholderPropertyName = "Dynamic Placeholder Property Name";
-        public const string AdoNetPropertyName = "Ado.Net Property Name";
-        public const string ReturnProperty = "Return Property - contains the column to return from Ado.Net";
-        public const string DelimitedInputIDs = "Input Parameters for Dynamic ADO.NET queries, delimited with (;)";
+        public const string PlaceholderSmoSystemName = "SMO System Name";
+        public const string ListMethodName = "SMO List Method Name";
+        public const string PlaceholderPropertyName = "SMO Placeholder Property Name";
+        public const string AdoNetPropertyName = "SMO Ado.Net Property Name";
+        public const string ReturnProperty = "SMO Return Property";
+        public const string DelimitedInputIDs = "ADO.NET query plaeholders, delimited with (;)";
         public const string StaticPlaceholders = "Static Placeholders, delimited with (;)";
-        public const string PlaceholderWrapperSymbol = "Placeholder Wrapper in the Body/Subject and Queries - e.g. $text$";
+        public const string PlaceholderWrapperSymbol = "Placeholder Wrapper Symbol";
     }
 }
diff --git a/K2Field.ServiceBroker.EmailTemplate/K2Field.ServiceBroker.EmailTemplate/EmailTemplateServiceBroker.cs b/K2Field.ServiceBroker.EmailTemplate/K2Field.ServiceBroker.EmailTemplate/EmailTemplateServiceBroker.cs
index 50ec991..48bc57f 100644
--- a/K2Field.ServiceBroker.EmailTemplate/K2Field.ServiceBroker.EmailTemplate/EmailTemplateServiceBroker.cs
+++ b/K2Field.ServiceBroker.EmailTemplate/K2Field.ServiceBroker.EmailTemplate/EmailTemplateServiceBroker.cs
@@ -31,8 +31,8 @@ public class EmailTemplateServiceBroker : ServiceAssemblyBase, IHostableType
         public override string GetConfigSection()
         {
             Service.ServiceConfiguration.Add(ServiceConfig.DelimitedInputIDs, true, "Id1;Id2");
-            Service.ServiceConfiguration.Add(ServiceConfig.PlaceholderSmoSystemName, true, "SmoSystemName");
-            Service.ServiceConfiguration.Add(ServiceConfig.ListMethodName, true, "List");
+            Service.ServiceConfiguration.Add(ServiceConfig.PlaceholderSmoSystemName, true, "K2Field_EmailTemplate_SMO_Placeholders");
+            Service.ServiceConfiguration.Add(ServiceConfig.ListMethodName, true, "GetList");
             Service.ServiceConfiguration.Add(ServiceConfig.PlaceholderPropertyName, true, "Placeholder");
             Service.ServiceConfiguration.Add(ServiceConfig.AdoNetPropertyName, true, "AdoNetQuery");
             Service.ServiceConfiguration.Add(ServiceConfig.ReturnProperty, true, "ReturnProperty");
@@ -44,7 +44,7 @@ public override string GetConfigSection()
         public override string DescribeSchema()
         {
             Service.Name = "K2Field.ServiceBroker.EmailTemplate";
-            Service.MetaData.DisplayName = "Email Templating";
+            Service.MetaData.DisplayName = "K2Field_ServiceBroker_EmailTemplate";
             Service.MetaData.Description = "A Service Broker that provides email templating functionality for the various functional service objects that aid the implementation of a K2 project.";
 
             bool requireServiceFolders = false;
diff --git a/K2Field.ServiceBroker.EmailTemplate/K2Field.ServiceBroker.EmailTemplate/ServiceObjects/EmailTemplate/EmailTemplateSO.cs b/K2Field.ServiceBroker.EmailTemplate/K2Field.ServiceBroker.EmailTemplate/ServiceObjects/EmailTemplate/EmailTemplateSO.cs
index 9e6be08..a5da3e1 100644
--- a/K2Field.ServiceBroker.EmailTemplate/K2Field.ServiceBroker.EmailTemplate/ServiceObjects/EmailTemplate/EmailTemplateSO.cs
+++ b/K2Field.ServiceBroker.EmailTemplate/K2Field.ServiceBroker.EmailTemplate/ServiceObjects/EmailTemplate/EmailTemplateSO.cs
@@ -53,7 +53,7 @@ public override List<ServiceObject> DescribeServiceObjects()
             so.Properties.Add(Helper.CreateProperty(Constants.Properties.OutputEmailBody, "Output body of the email", SoType.Memo));
             so.Properties.Add(Helper.CreateProperty(Constants.Properties.OutputEmailSubject, "Output body of the email", SoType.Memo));
             so.Properties.Add(Helper.CreateProperty(Constants.Properties.Placeholder, "Placeholder", SoType.Text));
-            so.Properties.Add(Helper.CreateProperty(Constants.Properties.Placeholder, "Placeholder with Wrapper", SoType.Text));
+            so.Properties.Add(Helper.CreateProperty(Constants.Properties.PlaceholderWithWrapper, "Placeholder with Wrapper", SoType.Text));
 
             var mGetEmailTemplate = Helper.CreateMethod(Constants.Methods.GetEmailTemplate, "Returns the Email Template with changed placholders", MethodType.Execute);
             mGetEmailTemplate.InputProperties.Add(Constants.Properties.InputEmailBody);