diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/queue/MessagingConfiguration.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/queue/MessagingConfiguration.java
index 77bd640..529b10f 100644
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/queue/MessagingConfiguration.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/queue/MessagingConfiguration.java
@@ -25,16 +25,15 @@ public class MessagingConfiguration {
     public static final String X_ERROR_INFO_HEADER = "x-error-message";
     public static final String X_ERROR_INFO_TIMESTAMP_HEADER = "x-error-message-timestamp";
 
-
-
     @Value("${fforesight.multitenancy.tenant-delete-queue:tenant-delete-queue}")
-    private String tenantDeleteEventQueue;
+    private String tenantDeleteEventQueueName;
     @Value("${fforesight.multitenancy.tenant-delete-dlq:tenant-delete-dlq}")
-    private String tenantDeleteDLQ;
+    private String tenantDeleteDLQName;
+
 
     @Bean
     public Binding tenantExchangeDeleteBinding(@Qualifier("tenantUserManagementTenantDeleteQueue") Queue tenantUserManagementTenantDeleteQueue,
-                                             @Qualifier("tenantExchange") TopicExchange tenantExchange) {
+                                               @Qualifier("tenantExchange") TopicExchange tenantExchange) {
 
         return BindingBuilder.bind(tenantUserManagementTenantDeleteQueue).to(tenantExchange).with("tenant.delete");
     }
@@ -71,24 +70,30 @@ public class MessagingConfiguration {
         return QueueBuilder.durable(DELETE_FROM_INDEX_DLQ).build();
     }
 
-
     // Tentant Delete Event Queue
 
+
     @Bean(name = "tenantExchange")
     TopicExchange tenantExchange(@Value("${fforesight.tenant-exchange.name}") String tenantExchangeName) {
+
         return new TopicExchange(tenantExchangeName);
     }
 
 
     @Bean("tenantUserManagementTenantDeleteQueue")
     public Queue tenantDeleteQueue() {
-        return QueueBuilder.durable(this.tenantDeleteEventQueue).withArgument("x-dead-letter-exchange", "").withArgument("x-dead-letter-routing-key", this.tenantDeleteDLQ).build();
+
+        return QueueBuilder.durable(this.tenantDeleteEventQueueName)
+                .withArgument("x-dead-letter-exchange", "")
+                .withArgument("x-dead-letter-routing-key", this.tenantDeleteDLQName)
+                .build();
     }
 
 
     @Bean
     public Queue tenantDeleteDLQ() {
-        return QueueBuilder.durable(this.tenantDeleteDLQ).build();
+
+        return QueueBuilder.durable(this.tenantDeleteDLQName).build();
     }
 
 }