@@ -45,7 +45,7 @@ public BusConfigurationBuilder ServiceBusApplicationId(string value) {
             if (value.Length > 10) {
                 throw new ArgumentOutOfRangeException("The length must not be greater than 10.");
             }
-            Configuration.ServiceBusApplicationId = value;
+            configuration.ServiceBusApplicationId = value;
             return this;
         }
 
@@ -66,7 +66,7 @@ public BusConfigurationBuilder DefaultSerializer(IServiceBusSerializer serialize
         /// <returns></returns>
         public BusConfigurationBuilder MaxThreads(byte value) {
             Guard.ArgumentNotZeroOrNegativeValue(value, "value");
-            Configuration.MaxThreads = value;
+            configuration.MaxThreads = value;
             return this;
         }
 
@@ -76,25 +76,25 @@ public BusConfigurationBuilder MaxThreads(byte value) {
         /// <returns></returns>
         public BusConfigurationBuilder ReadFromConfigFile() {
             var setting = AzureConfigurationHelper.GetConfig("ServiceBusApplicationId");
-            Configuration.ServiceBusApplicationId = setting;
+            configuration.ServiceBusApplicationId = setting;
 
             setting = AzureConfigurationHelper.GetConfig("ServiceBusIssuerKey");
             if (string.IsNullOrWhiteSpace(setting)) {
                 throw new ArgumentNullException("ServiceBusIssuerKey", "The ServiceBusIssuerKey must be set.");
             }
-            Configuration.ServiceBusIssuerKey = setting;
+            configuration.ServiceBusIssuerKey = setting;
 
             setting = AzureConfigurationHelper.GetConfig("ServiceBusIssuerName");
             if (string.IsNullOrWhiteSpace(setting)) {
                 throw new ArgumentNullException("ServiceBusIssuerName", "The ServiceBusIssuerName must be set.");
             }
-            Configuration.ServiceBusIssuerName = setting;
+            configuration.ServiceBusIssuerName = setting;
 
             setting = AzureConfigurationHelper.GetConfig("ServiceBusNamespace");
             if (string.IsNullOrWhiteSpace(setting)) {
                 throw new ArgumentNullException("ServiceBusNamespace", "The ServiceBusNamespace must be set.");
             }
-            Configuration.ServiceBusNamespace = setting;
+            configuration.ServiceBusNamespace = setting;
 
             return this;
         }
@@ -106,7 +106,7 @@ public BusConfigurationBuilder ReadFromConfigFile() {
         /// <returns></returns>
         public BusConfigurationBuilder RegisterAssembly(Assembly assembly) {
             Guard.ArgumentNotNull(assembly, "assembly");
-            Configuration.AddRegisteredAssembly(assembly);
+            configuration.AddRegisteredAssembly(assembly);
             return this;
         }
 
@@ -116,7 +116,7 @@ public BusConfigurationBuilder RegisterAssembly(Assembly assembly) {
         /// <typeparam name="T"></typeparam>
         /// <returns></returns>
         public BusConfigurationBuilder RegisterSubscriber<T>() {
-            Configuration.AddRegisteredSubscriber(typeof(T));
+            configuration.AddRegisteredSubscriber(typeof(T));
             return this;
         }
 
@@ -127,7 +127,7 @@ public BusConfigurationBuilder RegisterSubscriber<T>() {
         /// <returns></returns>
         public BusConfigurationBuilder ServiceBusNamespace(string value) {
             Guard.ArgumentNotNull(value, "value");
-            Configuration.ServiceBusNamespace = value;
+            configuration.ServiceBusNamespace = value;
             return this;
         }
 
@@ -138,7 +138,7 @@ public BusConfigurationBuilder ServiceBusNamespace(string value) {
         /// <returns></returns>
         public BusConfigurationBuilder ServiceBusIssuerName(string value) {
             Guard.ArgumentNotNull(value, "value");
-            Configuration.ServiceBusIssuerName = value;
+            configuration.ServiceBusIssuerName = value;
             return this;
         }
 
@@ -149,7 +149,7 @@ public BusConfigurationBuilder ServiceBusIssuerName(string value) {
         /// <returns></returns>
         public BusConfigurationBuilder ServiceBusIssuerKey(string value) {
             Guard.ArgumentNotNull(value, "value");
-            Configuration.ServiceBusIssuerKey = value;
+            configuration.ServiceBusIssuerKey = value;
             return this;
         }
 
@@ -160,7 +160,7 @@ public BusConfigurationBuilder ServiceBusIssuerKey(string value) {
         /// <returns></returns>
         public BusConfigurationBuilder ServicePath(string value) {
             Guard.ArgumentNotNull(value, "value");
-            Configuration.ServicePath = value;
+            configuration.ServicePath = value;
             return this;
         }
 
@@ -171,7 +171,7 @@ public BusConfigurationBuilder ServicePath(string value) {
         /// <returns></returns>
         public BusConfigurationBuilder TopicName(string value) {
             Guard.ArgumentNotNull(value, "value");
-            Configuration.TopicName = value;
+            configuration.TopicName = value;
             return this;
         }