diff --git a/Rhino.ServiceBus.Autofac/AutofacBuilder.cs b/Rhino.ServiceBus.Autofac/AutofacBuilder.cs
index 28ffcd8..8ccba71 100644
--- a/Rhino.ServiceBus.Autofac/AutofacBuilder.cs
+++ b/Rhino.ServiceBus.Autofac/AutofacBuilder.cs
@@ -265,8 +265,8 @@ public void RegisterSecurity(byte[] key)
             builder.RegisterType<RijndaelEncryptionService>()
                 .WithParameter(new NamedParameter("key", key))
                 .As<IEncryptionService>().SingleInstance();
-            builder.RegisterType<WireEcryptedStringConvertor>()
-                .As<IValueConvertor<WireEcryptedString>>()
+            builder.RegisterType<WireEncryptedStringConvertor>()
+                .As<IValueConvertor<WireEncryptedString>>()
                 .SingleInstance();
             builder.RegisterType<WireEncryptedMessageConvertor>()
                 .As<IElementSerializationBehavior>().SingleInstance();
@@ -276,8 +276,8 @@ public void RegisterSecurity(byte[] key)
         public void RegisterNoSecurity()
         {
             var builder = new ContainerBuilder();
-            builder.RegisterType<ThrowingWireEcryptedStringConvertor>()
-                .As<IValueConvertor<WireEcryptedString>>().SingleInstance();
+            builder.RegisterType<ThrowingWireEncryptedStringConvertor>()
+                .As<IValueConvertor<WireEncryptedString>>().SingleInstance();
             builder.RegisterType<ThrowingWireEncryptedMessageConvertor>()
                 .As<IElementSerializationBehavior>().SingleInstance();
             builder.Update(container);
diff --git a/Rhino.ServiceBus.Castle/CastleBuilder.cs b/Rhino.ServiceBus.Castle/CastleBuilder.cs
index a63ed97..7bb66de 100644
--- a/Rhino.ServiceBus.Castle/CastleBuilder.cs
+++ b/Rhino.ServiceBus.Castle/CastleBuilder.cs
@@ -313,8 +313,8 @@ public void RegisterSecurity(byte[] key)
 				);
 
             container.Register(
-                Component.For<IValueConvertor<WireEcryptedString>>()
-                    .ImplementedBy<WireEcryptedStringConvertor>()
+                Component.For<IValueConvertor<WireEncryptedString>>()
+                    .ImplementedBy<WireEncryptedStringConvertor>()
                     .DependsOn(Dependency.OnComponent("encryptionService", "esb.security"))
                 );
 
@@ -328,8 +328,8 @@ public void RegisterSecurity(byte[] key)
         public void RegisterNoSecurity()
         {
             container.Register(
-                   Component.For<IValueConvertor<WireEcryptedString>>()
-                       .ImplementedBy<ThrowingWireEcryptedStringConvertor>()
+                   Component.For<IValueConvertor<WireEncryptedString>>()
+                       .ImplementedBy<ThrowingWireEncryptedStringConvertor>()
                    );
             container.Register(
                 Component.For<IElementSerializationBehavior>()
diff --git a/Rhino.ServiceBus.Spring/SpringBuilder.cs b/Rhino.ServiceBus.Spring/SpringBuilder.cs
index 3aeaaaa..3b37fc9 100644
--- a/Rhino.ServiceBus.Spring/SpringBuilder.cs
+++ b/Rhino.ServiceBus.Spring/SpringBuilder.cs
@@ -239,13 +239,13 @@ public void RegisterRhinoQueuesOneWay()
         public void RegisterSecurity(byte[] key)
         {
             applicationContext.RegisterSingleton<IEncryptionService>(() => new RijndaelEncryptionService(key));
-            applicationContext.RegisterSingleton<IValueConvertor<WireEcryptedString>>(() => new WireEcryptedStringConvertor(applicationContext.Get<IEncryptionService>()));
+            applicationContext.RegisterSingleton<IValueConvertor<WireEncryptedString>>(() => new WireEncryptedStringConvertor(applicationContext.Get<IEncryptionService>()));
             applicationContext.RegisterSingleton<IElementSerializationBehavior>(() => new WireEncryptedMessageConvertor(applicationContext.Get<IEncryptionService>()));
         }
 
         public void RegisterNoSecurity()
         {
-            applicationContext.RegisterSingleton<IValueConvertor<WireEcryptedString>>(() => new ThrowingWireEcryptedStringConvertor());
+            applicationContext.RegisterSingleton<IValueConvertor<WireEncryptedString>>(() => new ThrowingWireEncryptedStringConvertor());
             applicationContext.RegisterSingleton<IElementSerializationBehavior>(() => new ThrowingWireEncryptedMessageConvertor());
         }
     }
diff --git a/Rhino.ServiceBus.StructureMap/StructureMapBuilder.cs b/Rhino.ServiceBus.StructureMap/StructureMapBuilder.cs
index 3eed142..0681fb2 100644
--- a/Rhino.ServiceBus.StructureMap/StructureMapBuilder.cs
+++ b/Rhino.ServiceBus.StructureMap/StructureMapBuilder.cs
@@ -226,7 +226,7 @@ public void RegisterSecurity(byte[] key)
             {
                 c.For<IEncryptionService>().Singleton().Use<RijndaelEncryptionService>()
                     .Ctor<byte[]>().Is(key);
-                c.For<IValueConvertor<WireEcryptedString>>().Singleton().Use<WireEcryptedStringConvertor>();
+                c.For<IValueConvertor<WireEncryptedString>>().Singleton().Use<WireEncryptedStringConvertor>();
                 c.For<IElementSerializationBehavior>().Singleton().Use<WireEncryptedMessageConvertor>();
             });
         }
@@ -235,7 +235,7 @@ public void RegisterNoSecurity()
         {
             container.Configure(c =>
             {
-                c.For<IValueConvertor<WireEcryptedString>>().Singleton().Use<ThrowingWireEcryptedStringConvertor>();
+                c.For<IValueConvertor<WireEncryptedString>>().Singleton().Use<ThrowingWireEncryptedStringConvertor>();
                 c.For<IElementSerializationBehavior>().Singleton().Use<ThrowingWireEncryptedMessageConvertor>();
             });
         }
diff --git a/Rhino.ServiceBus.Tests/When_Security_Is_Not_Specified_In_Config.cs b/Rhino.ServiceBus.Tests/When_Security_Is_Not_Specified_In_Config.cs
index 724af7d..8918cac 100644
--- a/Rhino.ServiceBus.Tests/When_Security_Is_Not_Specified_In_Config.cs
+++ b/Rhino.ServiceBus.Tests/When_Security_Is_Not_Specified_In_Config.cs
@@ -35,7 +35,7 @@ public void Will_throw_for_wire_encrypted_string()
             }
             catch (SerializationException e)
             {
-                Assert.Equal("Cannot send message containing WireEcryptedString when <security> was not properly set up",
+                Assert.Equal("Cannot send message containing WireEncryptedString when <security> was not properly set up",
                     e.InnerException.Message);
             }
         }
diff --git a/Rhino.ServiceBus.Tests/When_Security_Is_Specified_In_Config.cs b/Rhino.ServiceBus.Tests/When_Security_Is_Specified_In_Config.cs
index d9a3744..2b878f6 100644
--- a/Rhino.ServiceBus.Tests/When_Security_Is_Specified_In_Config.cs
+++ b/Rhino.ServiceBus.Tests/When_Security_Is_Specified_In_Config.cs
@@ -27,8 +27,8 @@ private static IWindsorContainer CreateContainer()
         public void Will_register_wire_encrypted_string_convertor_on_container()
         {
             var container = CreateContainer();
-            var convertor = container.Resolve<IValueConvertor<WireEcryptedString>>();
-            Assert.IsType<WireEcryptedStringConvertor>(convertor);
+            var convertor = container.Resolve<IValueConvertor<WireEncryptedString>>();
+            Assert.IsType<WireEncryptedStringConvertor>(convertor);
         }
 
 		[Fact]
@@ -42,7 +42,7 @@ public void Will_register_wire_encrypted_message_convertor_on_container()
 
         public class ClassWithSecretField
         {
-            public WireEcryptedString ShouldBeEncrypted
+            public WireEncryptedString ShouldBeEncrypted
             {
                 get; set;
             }
@@ -56,11 +56,11 @@ public class SecretMessage : IWireEncryptedMessage
 
         public const string encryptedMessage =
                 @"<?xml version=""1.0"" encoding=""utf-8""?>
-<esb:messages xmlns:esb=""http://servicebus.hibernatingrhinos.com/2008/12/20/esb"" xmlns:tests.classwithsecretfield=""Rhino.ServiceBus.Tests.When_Security_Is_Specified_In_Config+ClassWithSecretField, Rhino.ServiceBus.Tests"" xmlns:datastructures.wireecryptedstring=""Rhino.ServiceBus.DataStructures.WireEcryptedString, Rhino.ServiceBus"" xmlns:string=""System.String"">
+<esb:messages xmlns:esb=""http://servicebus.hibernatingrhinos.com/2008/12/20/esb"" xmlns:tests.classwithsecretfield=""Rhino.ServiceBus.Tests.When_Security_Is_Specified_In_Config+ClassWithSecretField, Rhino.ServiceBus.Tests"" xmlns:datastructures.wireencryptedstring=""Rhino.ServiceBus.DataStructures.WireEncryptedString, Rhino.ServiceBus"" xmlns:string=""System.String"">
   <tests.classwithsecretfield:ClassWithSecretField>
-    <datastructures.wireecryptedstring:ShouldBeEncrypted>
+    <datastructures.wireencryptedstring:ShouldBeEncrypted>
       <string:Value iv=""0yL9+t0uyDy9NeP7CU1Wow=="">q9a10IFuRxrzFoZewfdOyg==</string:Value>
-    </datastructures.wireecryptedstring:ShouldBeEncrypted>
+    </datastructures.wireencryptedstring:ShouldBeEncrypted>
   </tests.classwithsecretfield:ClassWithSecretField>
 </esb:messages>";
 
@@ -74,7 +74,7 @@ public void Will_encrypt_fields_of_messages()
             {
                 new ClassWithSecretField
                 {
-                    ShouldBeEncrypted = new WireEcryptedString{Value = "abc"}
+                    ShouldBeEncrypted = new WireEncryptedString{Value = "abc"}
                 }
             },memoryStream);
 
@@ -85,7 +85,7 @@ public void Will_encrypt_fields_of_messages()
             var actual = document
                 .Element(XName.Get("messages", "http://servicebus.hibernatingrhinos.com/2008/12/20/esb"))
                 .Element(XName.Get("ClassWithSecretField","Rhino.ServiceBus.Tests.When_Security_Is_Specified_In_Config+ClassWithSecretField, Rhino.ServiceBus.Tests"))
-                .Element(XName.Get("ShouldBeEncrypted","Rhino.ServiceBus.DataStructures.WireEcryptedString, Rhino.ServiceBus"))
+                .Element(XName.Get("ShouldBeEncrypted","Rhino.ServiceBus.DataStructures.WireEncryptedString, Rhino.ServiceBus"))
                 .Element(XName.Get("Value","System.String"))
                 .Value;
 
@@ -102,7 +102,7 @@ public void Will_decrypt_fields_of_messages()
             {
                 new ClassWithSecretField
                 {
-                    ShouldBeEncrypted = new WireEcryptedString{Value = "abc"}
+                    ShouldBeEncrypted = new WireEncryptedString{Value = "abc"}
                 }
             }, memoryStream);
 
@@ -171,7 +171,7 @@ public void When_key_is_different_deserializing_key_will_fail()
         {
             var container = CreateContainer();
             var serializer = container.Resolve<IMessageSerializer>();
-            var convertor = (WireEcryptedStringConvertor)container.Resolve<IValueConvertor<WireEcryptedString>>();
+            var convertor = (WireEncryptedStringConvertor)container.Resolve<IValueConvertor<WireEncryptedString>>();
 
             var managed = new RijndaelManaged();
             managed.GenerateKey();
diff --git a/Rhino.ServiceBus.Unity/UnityBuilder.cs b/Rhino.ServiceBus.Unity/UnityBuilder.cs
index ba220ac..9bd573a 100644
--- a/Rhino.ServiceBus.Unity/UnityBuilder.cs
+++ b/Rhino.ServiceBus.Unity/UnityBuilder.cs
@@ -279,7 +279,7 @@ public void RegisterSecurity(byte[] key)
                 new InjectionConstructor(
                     new InjectionParameter<byte[]>(key)));
 
-            container.RegisterType<IValueConvertor<WireEcryptedString>, WireEcryptedStringConvertor>(
+            container.RegisterType<IValueConvertor<WireEncryptedString>, WireEncryptedStringConvertor>(
                 new ContainerControlledLifetimeManager(),
                 new InjectionConstructor(
                     new ResolvedParameter<IEncryptionService>("esb.security")));
@@ -291,7 +291,7 @@ public void RegisterSecurity(byte[] key)
 
         public void RegisterNoSecurity()
         {
-            container.RegisterType<IValueConvertor<WireEcryptedString>, ThrowingWireEcryptedStringConvertor>(
+            container.RegisterType<IValueConvertor<WireEncryptedString>, ThrowingWireEncryptedStringConvertor>(
                 new ContainerControlledLifetimeManager());
             container.RegisterType<IElementSerializationBehavior, ThrowingWireEncryptedMessageConvertor>(
                 new ContainerControlledLifetimeManager());
diff --git a/Rhino.ServiceBus/Convertors/ThrowingWireEcryptedStringConvertor.cs b/Rhino.ServiceBus/Convertors/ThrowingWireEcryptedStringConvertor.cs
deleted file mode 100644
index bf7a316..0000000
--- a/Rhino.ServiceBus/Convertors/ThrowingWireEcryptedStringConvertor.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Runtime.Serialization;
-using System.Security;
-using System.Xml.Linq;
-using Rhino.ServiceBus.DataStructures;
-using Rhino.ServiceBus.Internal;
-
-namespace Rhino.ServiceBus.Convertors
-{
-    public class ThrowingWireEcryptedStringConvertor : IValueConvertor<WireEcryptedString>
-    {
-        public XElement ToElement(WireEcryptedString val, Func<Type, XNamespace> getNamespace)
-        {
-            throw new SecurityException(
-                "Cannot send message containing WireEcryptedString when <security> was not properly set up");
-        }
-
-        public WireEcryptedString FromElement(XElement element)
-        {
-            var value = element.Element(XName.Get("Value", "System.String"));
-            if(value==null)
-                throw new SerializationException("<WireEcryptedString> did not have mandatory <Value> element");
-            return new WireEcryptedString
-            {
-                Value = value.Value
-            };
-        }
-    }
-}
diff --git a/Rhino.ServiceBus/Convertors/ThrowingWireEncryptedStringConvertor.cs b/Rhino.ServiceBus/Convertors/ThrowingWireEncryptedStringConvertor.cs
new file mode 100644
index 0000000..ad12b9d
--- /dev/null
+++ b/Rhino.ServiceBus/Convertors/ThrowingWireEncryptedStringConvertor.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Runtime.Serialization;
+using System.Security;
+using System.Xml.Linq;
+using Rhino.ServiceBus.DataStructures;
+using Rhino.ServiceBus.Internal;
+
+namespace Rhino.ServiceBus.Convertors
+{
+    public class ThrowingWireEncryptedStringConvertor : IValueConvertor<WireEncryptedString>
+    {
+        public XElement ToElement(WireEncryptedString val, Func<Type, XNamespace> getNamespace)
+        {
+            throw new SecurityException(
+                "Cannot send message containing WireEncryptedString when <security> was not properly set up");
+        }
+
+        public WireEncryptedString FromElement(XElement element)
+        {
+            var value = element.Element(XName.Get("Value", "System.String"));
+            if(value==null)
+                throw new SerializationException("<WireEncryptedString> did not have mandatory <Value> element");
+            return new WireEncryptedString
+            {
+                Value = value.Value
+            };
+        }
+    }
+}
diff --git a/Rhino.ServiceBus/Convertors/WireEcryptedStringConvertor.cs b/Rhino.ServiceBus/Convertors/WireEncryptedStringConvertor.cs
similarity index 75%
rename from Rhino.ServiceBus/Convertors/WireEcryptedStringConvertor.cs
rename to Rhino.ServiceBus/Convertors/WireEncryptedStringConvertor.cs
index f120f29..3910ac7 100644
--- a/Rhino.ServiceBus/Convertors/WireEcryptedStringConvertor.cs
+++ b/Rhino.ServiceBus/Convertors/WireEncryptedStringConvertor.cs
@@ -5,16 +5,16 @@
 
 namespace Rhino.ServiceBus.Convertors
 {
-    public class WireEcryptedStringConvertor : IValueConvertor<WireEcryptedString>
+    public class WireEncryptedStringConvertor : IValueConvertor<WireEncryptedString>
     {
     	public IEncryptionService EncryptionService { get; set;}
 
-        public WireEcryptedStringConvertor(IEncryptionService encryptionService)
+        public WireEncryptedStringConvertor(IEncryptionService encryptionService)
         {
         	EncryptionService = encryptionService;
         }
 
-        public XElement ToElement(WireEcryptedString val, Func<Type, XNamespace> getNamespace)
+        public XElement ToElement(WireEncryptedString val, Func<Type, XNamespace> getNamespace)
         {
         	var encryptedValue = EncryptionService.Encrypt(val);
 			return new XElement(getNamespace(typeof(string)) + "Value",
@@ -22,7 +22,7 @@ public XElement ToElement(WireEcryptedString val, Func<Type, XNamespace> getName
 				encryptedValue.EncryptedBase64Value);
         }
 
-        public WireEcryptedString FromElement(XElement element)
+        public WireEncryptedString FromElement(XElement element)
         {
             var value = element.Element(XName.Get("Value","System.String"));
             if(value==null)
diff --git a/Rhino.ServiceBus/DataStructures/WireEcryptedString.cs b/Rhino.ServiceBus/DataStructures/WireEcryptedString.cs
deleted file mode 100644
index 53e230e..0000000
--- a/Rhino.ServiceBus/DataStructures/WireEcryptedString.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace Rhino.ServiceBus.DataStructures
-{
-    public class WireEcryptedString
-    {
-        public string Value { get; set; }
-
-        public static implicit operator string(WireEcryptedString s)
-        {
-            return s==null ? null : s.Value;
-        }
-
-        public static implicit operator WireEcryptedString(string s)
-        {
-            return new WireEcryptedString {Value = s};
-        }
-    }
-}
\ No newline at end of file
diff --git a/Rhino.ServiceBus/DataStructures/WireEncryptedString.cs b/Rhino.ServiceBus/DataStructures/WireEncryptedString.cs
new file mode 100644
index 0000000..89d393e
--- /dev/null
+++ b/Rhino.ServiceBus/DataStructures/WireEncryptedString.cs
@@ -0,0 +1,17 @@
+namespace Rhino.ServiceBus.DataStructures
+{
+    public class WireEncryptedString
+    {
+        public string Value { get; set; }
+
+        public static implicit operator string(WireEncryptedString s)
+        {
+            return s==null ? null : s.Value;
+        }
+
+        public static implicit operator WireEncryptedString(string s)
+        {
+            return new WireEncryptedString {Value = s};
+        }
+    }
+}
\ No newline at end of file
diff --git a/Rhino.ServiceBus/Rhino.ServiceBus.csproj b/Rhino.ServiceBus/Rhino.ServiceBus.csproj
index 4698e55..c723b96 100644
--- a/Rhino.ServiceBus/Rhino.ServiceBus.csproj
+++ b/Rhino.ServiceBus/Rhino.ServiceBus.csproj
@@ -160,12 +160,12 @@
     <Compile Include="Config\SecurityConfiguration.cs" />
     <Compile Include="Config\SecurityElement.cs" />
     <Compile Include="ConsumerOf.cs" />
-    <Compile Include="Convertors\ThrowingWireEcryptedStringConvertor.cs" />
-    <Compile Include="Convertors\WireEcryptedStringConvertor.cs" />
+    <Compile Include="Convertors\ThrowingWireEncryptedStringConvertor.cs" />
+    <Compile Include="Convertors\WireEncryptedStringConvertor.cs" />
     <Compile Include="DataStructures\OrderedList.cs" />
     <Compile Include="DataStructures\Queue.cs" />
     <Compile Include="DataStructures\Set.cs" />
-    <Compile Include="DataStructures\WireEcryptedString.cs" />
+    <Compile Include="DataStructures\WireEncryptedString.cs" />
     <Compile Include="DataStructures\MultiValueIndexHashtable.cs" />
     <Compile Include="DataStructures\LeastRecentlyUsedSet.cs" />
     <Compile Include="DataStructures\Hashtable.cs" />