diff --git a/config/config.example.toml b/config/config.example.toml
index 81bf31a1827e..5aa9e543fb22 100644
--- a/config/config.example.toml
+++ b/config/config.example.toml
@@ -267,7 +267,7 @@ stripe.base_url_file_upload = "https://files.stripe.com/"
 trustpay.base_url = "https://test-tpgw.trustpay.eu/"
 trustpay.base_url_bank_redirects = "https://aapi.trustpay.eu/"
 tsys.base_url = "https://stagegw.transnox.com/"
-unifiedauthenticationservice.base_url = "http://localhost:8000"
+unified_authentication_service.base_url = "http://localhost:8000"
 volt.base_url = "https://api.sandbox.volt.io/"
 wellsfargo.base_url = "https://apitest.cybersource.com/"
 wellsfargopayout.base_url = "https://api-sandbox.wellsfargo.com/"
diff --git a/config/deployments/integration_test.toml b/config/deployments/integration_test.toml
index ba14092e6825..de8063b10294 100644
--- a/config/deployments/integration_test.toml
+++ b/config/deployments/integration_test.toml
@@ -107,7 +107,7 @@ thunes.base_url = "https://api.limonetikqualif.com/"
 trustpay.base_url = "https://test-tpgw.trustpay.eu/"
 trustpay.base_url_bank_redirects = "https://aapi.trustpay.eu/"
 tsys.base_url = "https://stagegw.transnox.com/"
-unifiedauthenticationservice.base_url = "http://localhost:8000"
+unified_authentication_service.base_url = "http://localhost:8000"
 volt.base_url = "https://api.sandbox.volt.io/"
 wellsfargo.base_url = "https://apitest.cybersource.com/"
 wellsfargopayout.base_url = "https://api-sandbox.wellsfargo.com/"
diff --git a/config/deployments/production.toml b/config/deployments/production.toml
index 6ae91f579058..82f9b65b27a7 100644
--- a/config/deployments/production.toml
+++ b/config/deployments/production.toml
@@ -111,7 +111,7 @@ thunes.base_url = "https://api.limonetik.com/"
 trustpay.base_url = "https://tpgw.trustpay.eu/"
 trustpay.base_url_bank_redirects = "https://aapi.trustpay.eu/"
 tsys.base_url = "https://gateway.transit-pass.com/"
-unifiedauthenticationservice.base_url = "http://localhost:8000"
+unified_authentication_service.base_url = "http://localhost:8000"
 volt.base_url = "https://api.volt.io/"
 wellsfargo.base_url = "https://api.cybersource.com/"
 wellsfargopayout.base_url = "https://api.wellsfargo.com/"
diff --git a/config/deployments/sandbox.toml b/config/deployments/sandbox.toml
index cfed74a20077..accf2f586afe 100644
--- a/config/deployments/sandbox.toml
+++ b/config/deployments/sandbox.toml
@@ -111,7 +111,7 @@ thunes.base_url = "https://api.limonetikqualif.com/"
 trustpay.base_url = "https://test-tpgw.trustpay.eu/"
 trustpay.base_url_bank_redirects = "https://aapi.trustpay.eu/"
 tsys.base_url = "https://stagegw.transnox.com/"
-unifiedauthenticationservice.base_url = "http://localhost:8000"
+unified_authentication_service.base_url = "http://localhost:8000"
 volt.base_url = "https://api.sandbox.volt.io/"
 wellsfargo.base_url = "https://apitest.cybersource.com/"
 wellsfargopayout.base_url = "https://api-sandbox.wellsfargo.com/"
diff --git a/config/development.toml b/config/development.toml
index d41a93b12ff4..fa577a78e6ad 100644
--- a/config/development.toml
+++ b/config/development.toml
@@ -165,7 +165,7 @@ cards = [
     "thunes",
     "trustpay",
     "tsys",
-    "unifiedauthenticationservice",
+    "unified_authentication_service",
     "volt",
     "wellsfargo",
     "wellsfargopayout",
@@ -288,7 +288,7 @@ worldpay.base_url = "https://try.access.worldpay.com/"
 xendit.base_url = "https://api.xendit.co"
 trustpay.base_url = "https://test-tpgw.trustpay.eu/"
 tsys.base_url = "https://stagegw.transnox.com/"
-unifiedauthenticationservice.base_url = "http://localhost:8000"
+unified_authentication_service.base_url = "http://localhost:8000"
 volt.base_url = "https://api.sandbox.volt.io/"
 wellsfargo.base_url = "https://apitest.cybersource.com/"
 wellsfargopayout.base_url = "https://api-sandbox.wellsfargo.com/"
diff --git a/config/docker_compose.toml b/config/docker_compose.toml
index 64bb951840c5..3cc690203e68 100644
--- a/config/docker_compose.toml
+++ b/config/docker_compose.toml
@@ -198,7 +198,7 @@ stripe.base_url_file_upload = "https://files.stripe.com/"
 trustpay.base_url = "https://test-tpgw.trustpay.eu/"
 trustpay.base_url_bank_redirects = "https://aapi.trustpay.eu/"
 tsys.base_url = "https://stagegw.transnox.com/"
-unifiedauthenticationservice.base_url = "http://localhost:8000"
+unified_authentication_service.base_url = "http://localhost:8000"
 volt.base_url = "https://api.sandbox.volt.io/"
 wellsfargo.base_url = "https://apitest.cybersource.com/"
 wellsfargopayout.base_url = "https://api-sandbox.wellsfargo.com/"
@@ -288,7 +288,7 @@ cards = [
     "thunes",
     "trustpay",
     "tsys",
-    "unifiedauthenticationservice",
+    "unified_authentication_service",
     "volt",
     "wellsfargo",
     "wellsfargopayout",
diff --git a/crates/api_models/src/connector_enums.rs b/crates/api_models/src/connector_enums.rs
index 6557841f11ce..9617e6450f4c 100644
--- a/crates/api_models/src/connector_enums.rs
+++ b/crates/api_models/src/connector_enums.rs
@@ -123,7 +123,7 @@ pub enum Connector {
     //Thunes,
     Trustpay,
     Tsys,
-    // Unifiedauthenticationservice,
+    // UnifiedAuthenticationService,
     Volt,
     Wellsfargo,
     // Wellsfargopayout,
@@ -261,7 +261,7 @@ impl Connector {
             // | Self::Thunes
             | Self::Trustpay
             | Self::Tsys
-            // | Self::Unifiedauthenticationservice
+            // | Self::UnifiedAuthenticationService
             | Self::Volt
             | Self::Wellsfargo
             // | Self::Wellsfargopayout
diff --git a/crates/common_enums/src/connector_enums.rs b/crates/common_enums/src/connector_enums.rs
index 1b656e86376a..1776ade36661 100644
--- a/crates/common_enums/src/connector_enums.rs
+++ b/crates/common_enums/src/connector_enums.rs
@@ -120,7 +120,7 @@ pub enum RoutableConnectors {
     // Thunes
     // Tsys,
     Tsys,
-    // Unifiedauthenticationservice,
+    // UnifiedAuthenticationService,
     Volt,
     Wellsfargo,
     // Wellsfargopayout,
diff --git a/crates/hyperswitch_connectors/src/connectors.rs b/crates/hyperswitch_connectors/src/connectors.rs
index cc4ac6703376..e7ea31ee0e0b 100644
--- a/crates/hyperswitch_connectors/src/connectors.rs
+++ b/crates/hyperswitch_connectors/src/connectors.rs
@@ -40,7 +40,7 @@ pub mod stax;
 pub mod taxjar;
 pub mod thunes;
 pub mod tsys;
-pub mod unifiedauthenticationservice;
+pub mod unified_authentication_service;
 pub mod volt;
 pub mod worldline;
 pub mod worldpay;
@@ -58,6 +58,6 @@ pub use self::{
     nexixpay::Nexixpay, nomupay::Nomupay, novalnet::Novalnet, payeezy::Payeezy, payu::Payu,
     powertranz::Powertranz, prophetpay::Prophetpay, rapyd::Rapyd, razorpay::Razorpay,
     redsys::Redsys, shift4::Shift4, square::Square, stax::Stax, taxjar::Taxjar, thunes::Thunes,
-    tsys::Tsys, unifiedauthenticationservice::Unifiedauthenticationservice, volt::Volt,
+    tsys::Tsys, unified_authentication_service::UnifiedAuthenticationService, volt::Volt,
     worldline::Worldline, worldpay::Worldpay, xendit::Xendit, zen::Zen, zsl::Zsl,
 };
diff --git a/crates/hyperswitch_connectors/src/connectors/unifiedauthenticationservice.rs b/crates/hyperswitch_connectors/src/connectors/unified_authentication_service.rs
similarity index 84%
rename from crates/hyperswitch_connectors/src/connectors/unifiedauthenticationservice.rs
rename to crates/hyperswitch_connectors/src/connectors/unified_authentication_service.rs
index e00deb07222f..e85fe5dd7de7 100644
--- a/crates/hyperswitch_connectors/src/connectors/unifiedauthenticationservice.rs
+++ b/crates/hyperswitch_connectors/src/connectors/unified_authentication_service.rs
@@ -34,16 +34,16 @@ use hyperswitch_interfaces::{
     webhooks,
 };
 use masking::{ExposeInterface, Mask};
-use transformers as unifiedauthenticationservice;
+use transformers as unified_authentication_service;
 
 use crate::{constants::headers, types::ResponseRouterData, utils};
 
 #[derive(Clone)]
-pub struct Unifiedauthenticationservice {
+pub struct UnifiedAuthenticationService {
     amount_converter: &'static (dyn AmountConvertor<Output = StringMinorUnit> + Sync),
 }
 
-impl Unifiedauthenticationservice {
+impl UnifiedAuthenticationService {
     pub fn new() -> &'static Self {
         &Self {
             amount_converter: &StringMinorUnitForConnector,
@@ -51,27 +51,27 @@ impl Unifiedauthenticationservice {
     }
 }
 
-impl api::Payment for Unifiedauthenticationservice {}
-impl api::PaymentSession for Unifiedauthenticationservice {}
-impl api::ConnectorAccessToken for Unifiedauthenticationservice {}
-impl api::MandateSetup for Unifiedauthenticationservice {}
-impl api::PaymentAuthorize for Unifiedauthenticationservice {}
-impl api::PaymentSync for Unifiedauthenticationservice {}
-impl api::PaymentCapture for Unifiedauthenticationservice {}
-impl api::PaymentVoid for Unifiedauthenticationservice {}
-impl api::Refund for Unifiedauthenticationservice {}
-impl api::RefundExecute for Unifiedauthenticationservice {}
-impl api::RefundSync for Unifiedauthenticationservice {}
-impl api::PaymentToken for Unifiedauthenticationservice {}
+impl api::Payment for UnifiedAuthenticationService {}
+impl api::PaymentSession for UnifiedAuthenticationService {}
+impl api::ConnectorAccessToken for UnifiedAuthenticationService {}
+impl api::MandateSetup for UnifiedAuthenticationService {}
+impl api::PaymentAuthorize for UnifiedAuthenticationService {}
+impl api::PaymentSync for UnifiedAuthenticationService {}
+impl api::PaymentCapture for UnifiedAuthenticationService {}
+impl api::PaymentVoid for UnifiedAuthenticationService {}
+impl api::Refund for UnifiedAuthenticationService {}
+impl api::RefundExecute for UnifiedAuthenticationService {}
+impl api::RefundSync for UnifiedAuthenticationService {}
+impl api::PaymentToken for UnifiedAuthenticationService {}
 
 impl ConnectorIntegration<PaymentMethodToken, PaymentMethodTokenizationData, PaymentsResponseData>
-    for Unifiedauthenticationservice
+    for UnifiedAuthenticationService
 {
     // Not Implemented (R)
 }
 
 impl<Flow, Request, Response> ConnectorCommonExt<Flow, Request, Response>
-    for Unifiedauthenticationservice
+    for UnifiedAuthenticationService
 where
     Self: ConnectorIntegration<Flow, Request, Response>,
 {
@@ -90,9 +90,9 @@ where
     }
 }
 
-impl ConnectorCommon for Unifiedauthenticationservice {
+impl ConnectorCommon for UnifiedAuthenticationService {
     fn id(&self) -> &'static str {
-        "unifiedauthenticationservice"
+        "unified_authentication_service"
     }
 
     fn get_currency_unit(&self) -> api::CurrencyUnit {
@@ -107,16 +107,17 @@ impl ConnectorCommon for Unifiedauthenticationservice {
     }
 
     fn base_url<'a>(&self, connectors: &'a Connectors) -> &'a str {
-        connectors.unifiedauthenticationservice.base_url.as_ref()
+        connectors.unified_authentication_service.base_url.as_ref()
     }
 
     fn get_auth_header(
         &self,
         auth_type: &ConnectorAuthType,
     ) -> CustomResult<Vec<(String, masking::Maskable<String>)>, errors::ConnectorError> {
-        let auth =
-            unifiedauthenticationservice::UnifiedauthenticationserviceAuthType::try_from(auth_type)
-                .change_context(errors::ConnectorError::FailedToObtainAuthType)?;
+        let auth = unified_authentication_service::UnifiedAuthenticationServiceAuthType::try_from(
+            auth_type,
+        )
+        .change_context(errors::ConnectorError::FailedToObtainAuthType)?;
         Ok(vec![(
             headers::AUTHORIZATION.to_string(),
             auth.api_key.expose().into_masked(),
@@ -128,10 +129,10 @@ impl ConnectorCommon for Unifiedauthenticationservice {
         res: Response,
         event_builder: Option<&mut ConnectorEvent>,
     ) -> CustomResult<ErrorResponse, errors::ConnectorError> {
-        let response: unifiedauthenticationservice::UnifiedauthenticationserviceErrorResponse = res
-            .response
-            .parse_struct("UnifiedauthenticationserviceErrorResponse")
-            .change_context(errors::ConnectorError::ResponseDeserializationFailed)?;
+        let response: unified_authentication_service::UnifiedAuthenticationServiceErrorResponse =
+            res.response
+                .parse_struct("UnifiedAuthenticationServiceErrorResponse")
+                .change_context(errors::ConnectorError::ResponseDeserializationFailed)?;
 
         event_builder.map(|i| i.set_response_body(&response));
         router_env::logger::info!(connector_response=?response);
@@ -147,28 +148,28 @@ impl ConnectorCommon for Unifiedauthenticationservice {
     }
 }
 
-impl ConnectorValidation for Unifiedauthenticationservice {
+impl ConnectorValidation for UnifiedAuthenticationService {
     //TODO: implement functions when support enabled
 }
 
 impl ConnectorIntegration<Session, PaymentsSessionData, PaymentsResponseData>
-    for Unifiedauthenticationservice
+    for UnifiedAuthenticationService
 {
     //TODO: implement sessions flow
 }
 
 impl ConnectorIntegration<AccessTokenAuth, AccessTokenRequestData, AccessToken>
-    for Unifiedauthenticationservice
+    for UnifiedAuthenticationService
 {
 }
 
 impl ConnectorIntegration<SetupMandate, SetupMandateRequestData, PaymentsResponseData>
-    for Unifiedauthenticationservice
+    for UnifiedAuthenticationService
 {
 }
 
 impl ConnectorIntegration<Authorize, PaymentsAuthorizeData, PaymentsResponseData>
-    for Unifiedauthenticationservice
+    for UnifiedAuthenticationService
 {
     fn get_headers(
         &self,
@@ -202,11 +203,11 @@ impl ConnectorIntegration<Authorize, PaymentsAuthorizeData, PaymentsResponseData
         )?;
 
         let connector_router_data =
-            unifiedauthenticationservice::UnifiedauthenticationserviceRouterData::from((
+            unified_authentication_service::UnifiedAuthenticationServiceRouterData::from((
                 amount, req,
             ));
         let connector_req =
-            unifiedauthenticationservice::UnifiedauthenticationservicePaymentsRequest::try_from(
+            unified_authentication_service::UnifiedAuthenticationServicePaymentsRequest::try_from(
                 &connector_router_data,
             )?;
         Ok(RequestContent::Json(Box::new(connector_req)))
@@ -240,9 +241,9 @@ impl ConnectorIntegration<Authorize, PaymentsAuthorizeData, PaymentsResponseData
         event_builder: Option<&mut ConnectorEvent>,
         res: Response,
     ) -> CustomResult<PaymentsAuthorizeRouterData, errors::ConnectorError> {
-        let response: unifiedauthenticationservice::UnifiedauthenticationservicePaymentsResponse =
+        let response: unified_authentication_service::UnifiedAuthenticationServicePaymentsResponse =
             res.response
-                .parse_struct("Unifiedauthenticationservice PaymentsAuthorizeResponse")
+                .parse_struct("UnifiedAuthenticationService PaymentsAuthorizeResponse")
                 .change_context(errors::ConnectorError::ResponseDeserializationFailed)?;
         event_builder.map(|i| i.set_response_body(&response));
         router_env::logger::info!(connector_response=?response);
@@ -263,7 +264,7 @@ impl ConnectorIntegration<Authorize, PaymentsAuthorizeData, PaymentsResponseData
 }
 
 impl ConnectorIntegration<PSync, PaymentsSyncData, PaymentsResponseData>
-    for Unifiedauthenticationservice
+    for UnifiedAuthenticationService
 {
     fn get_headers(
         &self,
@@ -306,9 +307,9 @@ impl ConnectorIntegration<PSync, PaymentsSyncData, PaymentsResponseData>
         event_builder: Option<&mut ConnectorEvent>,
         res: Response,
     ) -> CustomResult<PaymentsSyncRouterData, errors::ConnectorError> {
-        let response: unifiedauthenticationservice::UnifiedauthenticationservicePaymentsResponse =
+        let response: unified_authentication_service::UnifiedAuthenticationServicePaymentsResponse =
             res.response
-                .parse_struct("unifiedauthenticationservice PaymentsSyncResponse")
+                .parse_struct("unified_authentication_service PaymentsSyncResponse")
                 .change_context(errors::ConnectorError::ResponseDeserializationFailed)?;
         event_builder.map(|i| i.set_response_body(&response));
         router_env::logger::info!(connector_response=?response);
@@ -329,7 +330,7 @@ impl ConnectorIntegration<PSync, PaymentsSyncData, PaymentsResponseData>
 }
 
 impl ConnectorIntegration<Capture, PaymentsCaptureData, PaymentsResponseData>
-    for Unifiedauthenticationservice
+    for UnifiedAuthenticationService
 {
     fn get_headers(
         &self,
@@ -385,9 +386,9 @@ impl ConnectorIntegration<Capture, PaymentsCaptureData, PaymentsResponseData>
         event_builder: Option<&mut ConnectorEvent>,
         res: Response,
     ) -> CustomResult<PaymentsCaptureRouterData, errors::ConnectorError> {
-        let response: unifiedauthenticationservice::UnifiedauthenticationservicePaymentsResponse =
+        let response: unified_authentication_service::UnifiedAuthenticationServicePaymentsResponse =
             res.response
-                .parse_struct("Unifiedauthenticationservice PaymentsCaptureResponse")
+                .parse_struct("UnifiedAuthenticationService PaymentsCaptureResponse")
                 .change_context(errors::ConnectorError::ResponseDeserializationFailed)?;
         event_builder.map(|i| i.set_response_body(&response));
         router_env::logger::info!(connector_response=?response);
@@ -408,12 +409,12 @@ impl ConnectorIntegration<Capture, PaymentsCaptureData, PaymentsResponseData>
 }
 
 impl ConnectorIntegration<Void, PaymentsCancelData, PaymentsResponseData>
-    for Unifiedauthenticationservice
+    for UnifiedAuthenticationService
 {
 }
 
 impl ConnectorIntegration<Execute, RefundsData, RefundsResponseData>
-    for Unifiedauthenticationservice
+    for UnifiedAuthenticationService
 {
     fn get_headers(
         &self,
@@ -447,12 +448,12 @@ impl ConnectorIntegration<Execute, RefundsData, RefundsResponseData>
         )?;
 
         let connector_router_data =
-            unifiedauthenticationservice::UnifiedauthenticationserviceRouterData::from((
+            unified_authentication_service::UnifiedAuthenticationServiceRouterData::from((
                 refund_amount,
                 req,
             ));
         let connector_req =
-            unifiedauthenticationservice::UnifiedauthenticationserviceRefundRequest::try_from(
+            unified_authentication_service::UnifiedAuthenticationServiceRefundRequest::try_from(
                 &connector_router_data,
             )?;
         Ok(RequestContent::Json(Box::new(connector_req)))
@@ -483,9 +484,9 @@ impl ConnectorIntegration<Execute, RefundsData, RefundsResponseData>
         event_builder: Option<&mut ConnectorEvent>,
         res: Response,
     ) -> CustomResult<RefundsRouterData<Execute>, errors::ConnectorError> {
-        let response: unifiedauthenticationservice::RefundResponse = res
+        let response: unified_authentication_service::RefundResponse = res
             .response
-            .parse_struct("unifiedauthenticationservice RefundResponse")
+            .parse_struct("UnifiedAuthenticationService RefundResponse")
             .change_context(errors::ConnectorError::ResponseDeserializationFailed)?;
         event_builder.map(|i| i.set_response_body(&response));
         router_env::logger::info!(connector_response=?response);
@@ -506,7 +507,7 @@ impl ConnectorIntegration<Execute, RefundsData, RefundsResponseData>
 }
 
 impl ConnectorIntegration<RSync, RefundsData, RefundsResponseData>
-    for Unifiedauthenticationservice
+    for UnifiedAuthenticationService
 {
     fn get_headers(
         &self,
@@ -552,9 +553,9 @@ impl ConnectorIntegration<RSync, RefundsData, RefundsResponseData>
         event_builder: Option<&mut ConnectorEvent>,
         res: Response,
     ) -> CustomResult<RefundSyncRouterData, errors::ConnectorError> {
-        let response: unifiedauthenticationservice::RefundResponse = res
+        let response: unified_authentication_service::RefundResponse = res
             .response
-            .parse_struct("unifiedauthenticationservice RefundSyncResponse")
+            .parse_struct("UnifiedAuthenticationService RefundSyncResponse")
             .change_context(errors::ConnectorError::ResponseDeserializationFailed)?;
         event_builder.map(|i| i.set_response_body(&response));
         router_env::logger::info!(connector_response=?response);
@@ -575,7 +576,7 @@ impl ConnectorIntegration<RSync, RefundsData, RefundsResponseData>
 }
 
 #[async_trait::async_trait]
-impl webhooks::IncomingWebhook for Unifiedauthenticationservice {
+impl webhooks::IncomingWebhook for UnifiedAuthenticationService {
     fn get_webhook_object_reference_id(
         &self,
         _request: &webhooks::IncomingWebhookRequestDetails<'_>,
diff --git a/crates/hyperswitch_connectors/src/connectors/unifiedauthenticationservice/transformers.rs b/crates/hyperswitch_connectors/src/connectors/unified_authentication_service/transformers.rs
similarity index 81%
rename from crates/hyperswitch_connectors/src/connectors/unifiedauthenticationservice/transformers.rs
rename to crates/hyperswitch_connectors/src/connectors/unified_authentication_service/transformers.rs
index 2cd139082402..6a9347dbeed7 100644
--- a/crates/hyperswitch_connectors/src/connectors/unifiedauthenticationservice/transformers.rs
+++ b/crates/hyperswitch_connectors/src/connectors/unified_authentication_service/transformers.rs
@@ -18,12 +18,12 @@ use crate::{
 };
 
 //TODO: Fill the struct with respective fields
-pub struct UnifiedauthenticationserviceRouterData<T> {
+pub struct UnifiedAuthenticationServiceRouterData<T> {
     pub amount: StringMinorUnit, // The type of amount that a connector accepts, for example, String, i64, f64, etc.
     pub router_data: T,
 }
 
-impl<T> From<(StringMinorUnit, T)> for UnifiedauthenticationserviceRouterData<T> {
+impl<T> From<(StringMinorUnit, T)> for UnifiedAuthenticationServiceRouterData<T> {
     fn from((amount, item): (StringMinorUnit, T)) -> Self {
         //Todo :  use utils to convert the amount to the type of amount that a connector accepts
         Self {
@@ -35,13 +35,13 @@ impl<T> From<(StringMinorUnit, T)> for UnifiedauthenticationserviceRouterData<T>
 
 //TODO: Fill the struct with respective fields
 #[derive(Default, Debug, Serialize, PartialEq)]
-pub struct UnifiedauthenticationservicePaymentsRequest {
+pub struct UnifiedAuthenticationServicePaymentsRequest {
     amount: StringMinorUnit,
-    card: UnifiedauthenticationserviceCard,
+    card: UnifiedAuthenticationServiceCard,
 }
 
 #[derive(Default, Debug, Serialize, Eq, PartialEq)]
-pub struct UnifiedauthenticationserviceCard {
+pub struct UnifiedAuthenticationServiceCard {
     number: cards::CardNumber,
     expiry_month: Secret<String>,
     expiry_year: Secret<String>,
@@ -49,16 +49,16 @@ pub struct UnifiedauthenticationserviceCard {
     complete: bool,
 }
 
-impl TryFrom<&UnifiedauthenticationserviceRouterData<&PaymentsAuthorizeRouterData>>
-    for UnifiedauthenticationservicePaymentsRequest
+impl TryFrom<&UnifiedAuthenticationServiceRouterData<&PaymentsAuthorizeRouterData>>
+    for UnifiedAuthenticationServicePaymentsRequest
 {
     type Error = error_stack::Report<errors::ConnectorError>;
     fn try_from(
-        item: &UnifiedauthenticationserviceRouterData<&PaymentsAuthorizeRouterData>,
+        item: &UnifiedAuthenticationServiceRouterData<&PaymentsAuthorizeRouterData>,
     ) -> Result<Self, Self::Error> {
         match item.router_data.request.payment_method_data.clone() {
             PaymentMethodData::Card(req_card) => {
-                let card = UnifiedauthenticationserviceCard {
+                let card = UnifiedAuthenticationServiceCard {
                     number: req_card.card_number,
                     expiry_month: req_card.card_exp_month,
                     expiry_year: req_card.card_exp_year,
@@ -77,11 +77,11 @@ impl TryFrom<&UnifiedauthenticationserviceRouterData<&PaymentsAuthorizeRouterDat
 
 //TODO: Fill the struct with respective fields
 // Auth Struct
-pub struct UnifiedauthenticationserviceAuthType {
+pub struct UnifiedAuthenticationServiceAuthType {
     pub(super) api_key: Secret<String>,
 }
 
-impl TryFrom<&ConnectorAuthType> for UnifiedauthenticationserviceAuthType {
+impl TryFrom<&ConnectorAuthType> for UnifiedAuthenticationServiceAuthType {
     type Error = error_stack::Report<errors::ConnectorError>;
     fn try_from(auth_type: &ConnectorAuthType) -> Result<Self, Self::Error> {
         match auth_type {
@@ -96,27 +96,27 @@ impl TryFrom<&ConnectorAuthType> for UnifiedauthenticationserviceAuthType {
 //TODO: Append the remaining status flags
 #[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq)]
 #[serde(rename_all = "lowercase")]
-pub enum UnifiedauthenticationservicePaymentStatus {
+pub enum UnifiedAuthenticationServicePaymentStatus {
     Succeeded,
     Failed,
     #[default]
     Processing,
 }
 
-impl From<UnifiedauthenticationservicePaymentStatus> for common_enums::AttemptStatus {
-    fn from(item: UnifiedauthenticationservicePaymentStatus) -> Self {
+impl From<UnifiedAuthenticationServicePaymentStatus> for common_enums::AttemptStatus {
+    fn from(item: UnifiedAuthenticationServicePaymentStatus) -> Self {
         match item {
-            UnifiedauthenticationservicePaymentStatus::Succeeded => Self::Charged,
-            UnifiedauthenticationservicePaymentStatus::Failed => Self::Failure,
-            UnifiedauthenticationservicePaymentStatus::Processing => Self::Authorizing,
+            UnifiedAuthenticationServicePaymentStatus::Succeeded => Self::Charged,
+            UnifiedAuthenticationServicePaymentStatus::Failed => Self::Failure,
+            UnifiedAuthenticationServicePaymentStatus::Processing => Self::Authorizing,
         }
     }
 }
 
 //TODO: Fill the struct with respective fields
 #[derive(Default, Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub struct UnifiedauthenticationservicePaymentsResponse {
-    status: UnifiedauthenticationservicePaymentStatus,
+pub struct UnifiedAuthenticationServicePaymentsResponse {
+    status: UnifiedAuthenticationServicePaymentStatus,
     id: String,
 }
 
@@ -124,7 +124,7 @@ impl<F, T>
     TryFrom<
         ResponseRouterData<
             F,
-            UnifiedauthenticationservicePaymentsResponse,
+            UnifiedAuthenticationServicePaymentsResponse,
             T,
             PaymentsResponseData,
         >,
@@ -134,7 +134,7 @@ impl<F, T>
     fn try_from(
         item: ResponseRouterData<
             F,
-            UnifiedauthenticationservicePaymentsResponse,
+            UnifiedAuthenticationServicePaymentsResponse,
             T,
             PaymentsResponseData,
         >,
@@ -160,16 +160,16 @@ impl<F, T>
 // REFUND :
 // Type definition for RefundRequest
 #[derive(Default, Debug, Serialize)]
-pub struct UnifiedauthenticationserviceRefundRequest {
+pub struct UnifiedAuthenticationServiceRefundRequest {
     pub amount: StringMinorUnit,
 }
 
-impl<F> TryFrom<&UnifiedauthenticationserviceRouterData<&RefundsRouterData<F>>>
-    for UnifiedauthenticationserviceRefundRequest
+impl<F> TryFrom<&UnifiedAuthenticationServiceRouterData<&RefundsRouterData<F>>>
+    for UnifiedAuthenticationServiceRefundRequest
 {
     type Error = error_stack::Report<errors::ConnectorError>;
     fn try_from(
-        item: &UnifiedauthenticationserviceRouterData<&RefundsRouterData<F>>,
+        item: &UnifiedAuthenticationServiceRouterData<&RefundsRouterData<F>>,
     ) -> Result<Self, Self::Error> {
         Ok(Self {
             amount: item.amount.to_owned(),
@@ -238,7 +238,7 @@ impl TryFrom<RefundsResponseRouterData<RSync, RefundResponse>> for RefundsRouter
 
 //TODO: Fill the struct with respective fields
 #[derive(Default, Debug, Serialize, Deserialize, PartialEq)]
-pub struct UnifiedauthenticationserviceErrorResponse {
+pub struct UnifiedAuthenticationServiceErrorResponse {
     pub status_code: u16,
     pub code: String,
     pub message: String,
diff --git a/crates/hyperswitch_connectors/src/default_implementations.rs b/crates/hyperswitch_connectors/src/default_implementations.rs
index d2baa0af9763..aaaeecb50e6c 100644
--- a/crates/hyperswitch_connectors/src/default_implementations.rs
+++ b/crates/hyperswitch_connectors/src/default_implementations.rs
@@ -128,7 +128,7 @@ default_imp_for_authorize_session_token!(
     connectors::Shift4,
     connectors::Stax,
     connectors::Taxjar,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Volt,
     connectors::Thunes,
     connectors::Tsys,
@@ -195,7 +195,7 @@ default_imp_for_calculate_tax!(
     connectors::Square,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Volt,
     connectors::Worldline,
     connectors::Worldpay,
@@ -253,7 +253,7 @@ default_imp_for_session_update!(
     connectors::Nexixpay,
     connectors::Payeezy,
     connectors::Payu,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Fiuu,
     connectors::Globepay,
     connectors::Gocardless,
@@ -329,7 +329,7 @@ default_imp_for_post_session_tokens!(
     connectors::Prophetpay,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Deutschebank,
     connectors::Volt,
     connectors::Zen,
@@ -386,7 +386,7 @@ default_imp_for_complete_authorize!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Volt,
     connectors::Xendit,
@@ -452,7 +452,7 @@ default_imp_for_incremental_authorization!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Worldpay,
     connectors::Volt,
@@ -517,7 +517,7 @@ default_imp_for_create_customer!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Worldpay,
     connectors::Volt,
@@ -581,7 +581,7 @@ default_imp_for_connector_redirect_response!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Volt,
     connectors::Xendit,
@@ -642,7 +642,7 @@ default_imp_for_pre_processing_steps!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Worldpay,
     connectors::Volt,
@@ -709,7 +709,7 @@ default_imp_for_post_processing_steps!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Worldpay,
     connectors::Volt,
@@ -776,7 +776,7 @@ default_imp_for_approve!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Worldpay,
     connectors::Volt,
@@ -843,7 +843,7 @@ default_imp_for_reject!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Worldpay,
     connectors::Volt,
@@ -910,7 +910,7 @@ default_imp_for_webhook_source_verification!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Worldpay,
     connectors::Volt,
@@ -978,7 +978,7 @@ default_imp_for_accept_dispute!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Worldpay,
     connectors::Volt,
@@ -1045,7 +1045,7 @@ default_imp_for_submit_evidence!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Worldpay,
     connectors::Volt,
@@ -1112,7 +1112,7 @@ default_imp_for_defend_dispute!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Worldpay,
     connectors::Volt,
@@ -1188,7 +1188,7 @@ default_imp_for_file_upload!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Worldpay,
     connectors::Volt,
@@ -1247,7 +1247,7 @@ default_imp_for_payouts!(
     connectors::Stax,
     connectors::Taxjar,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Volt,
     connectors::Worldline,
     connectors::Worldpay,
@@ -1316,7 +1316,7 @@ default_imp_for_payouts_create!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Worldpay,
     connectors::Volt,
@@ -1385,7 +1385,7 @@ default_imp_for_payouts_retrieve!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Worldpay,
     connectors::Volt,
@@ -1454,7 +1454,7 @@ default_imp_for_payouts_eligibility!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Worldpay,
     connectors::Volt,
@@ -1523,7 +1523,7 @@ default_imp_for_payouts_fulfill!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Worldpay,
     connectors::Volt,
@@ -1592,7 +1592,7 @@ default_imp_for_payouts_cancel!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Worldpay,
     connectors::Volt,
@@ -1661,7 +1661,7 @@ default_imp_for_payouts_quote!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Worldpay,
     connectors::Volt,
@@ -1730,7 +1730,7 @@ default_imp_for_payouts_recipient!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Worldpay,
     connectors::Volt,
@@ -1799,7 +1799,7 @@ default_imp_for_payouts_recipient_account!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Worldpay,
     connectors::Volt,
@@ -1868,7 +1868,7 @@ default_imp_for_frm_sale!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Worldpay,
     connectors::Volt,
@@ -1937,7 +1937,7 @@ default_imp_for_frm_checkout!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Worldpay,
     connectors::Volt,
@@ -2006,7 +2006,7 @@ default_imp_for_frm_transaction!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Worldpay,
     connectors::Volt,
@@ -2075,7 +2075,7 @@ default_imp_for_frm_fulfillment!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Worldpay,
     connectors::Volt,
@@ -2144,7 +2144,7 @@ default_imp_for_frm_record_return!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Worldpay,
     connectors::Volt,
@@ -2210,7 +2210,7 @@ default_imp_for_revoking_mandates!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Worldpay,
     connectors::Volt,
diff --git a/crates/hyperswitch_connectors/src/default_implementations_v2.rs b/crates/hyperswitch_connectors/src/default_implementations_v2.rs
index aa4c4fb6c4ee..10a5fea8c401 100644
--- a/crates/hyperswitch_connectors/src/default_implementations_v2.rs
+++ b/crates/hyperswitch_connectors/src/default_implementations_v2.rs
@@ -247,7 +247,7 @@ default_imp_for_new_connector_integration_payment!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Volt,
     connectors::Worldpay,
@@ -315,7 +315,7 @@ default_imp_for_new_connector_integration_refund!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Volt,
     connectors::Worldpay,
@@ -378,7 +378,7 @@ default_imp_for_new_connector_integration_connector_access_token!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Volt,
     connectors::Worldpay,
@@ -447,7 +447,7 @@ default_imp_for_new_connector_integration_accept_dispute!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Volt,
     connectors::Worldpay,
@@ -515,7 +515,7 @@ default_imp_for_new_connector_integration_submit_evidence!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Volt,
     connectors::Worldpay,
@@ -583,7 +583,7 @@ default_imp_for_new_connector_integration_defend_dispute!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Volt,
     connectors::Worldpay,
@@ -661,7 +661,7 @@ default_imp_for_new_connector_integration_file_upload!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Volt,
     connectors::Worldpay,
@@ -731,7 +731,7 @@ default_imp_for_new_connector_integration_payouts_create!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Volt,
     connectors::Worldpay,
@@ -801,7 +801,7 @@ default_imp_for_new_connector_integration_payouts_eligibility!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Volt,
     connectors::Worldpay,
@@ -871,7 +871,7 @@ default_imp_for_new_connector_integration_payouts_fulfill!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Volt,
     connectors::Worldpay,
@@ -941,7 +941,7 @@ default_imp_for_new_connector_integration_payouts_cancel!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Volt,
     connectors::Worldpay,
@@ -1011,7 +1011,7 @@ default_imp_for_new_connector_integration_payouts_quote!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Volt,
     connectors::Worldpay,
@@ -1081,7 +1081,7 @@ default_imp_for_new_connector_integration_payouts_recipient!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Volt,
     connectors::Worldpay,
@@ -1151,7 +1151,7 @@ default_imp_for_new_connector_integration_payouts_sync!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Volt,
     connectors::Worldpay,
@@ -1221,7 +1221,7 @@ default_imp_for_new_connector_integration_payouts_recipient_account!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Volt,
     connectors::Worldpay,
@@ -1289,7 +1289,7 @@ default_imp_for_new_connector_integration_webhook_source_verification!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Volt,
     connectors::Worldpay,
@@ -1359,7 +1359,7 @@ default_imp_for_new_connector_integration_frm_sale!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Volt,
     connectors::Worldpay,
@@ -1429,7 +1429,7 @@ default_imp_for_new_connector_integration_frm_checkout!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Volt,
     connectors::Worldpay,
@@ -1499,7 +1499,7 @@ default_imp_for_new_connector_integration_frm_transaction!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Volt,
     connectors::Worldpay,
@@ -1569,7 +1569,7 @@ default_imp_for_new_connector_integration_frm_fulfillment!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Volt,
     connectors::Worldpay,
@@ -1639,7 +1639,7 @@ default_imp_for_new_connector_integration_frm_record_return!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Volt,
     connectors::Worldpay,
@@ -1706,7 +1706,7 @@ default_imp_for_new_connector_integration_revoking_mandates!(
     connectors::Taxjar,
     connectors::Thunes,
     connectors::Tsys,
-    connectors::Unifiedauthenticationservice,
+    connectors::UnifiedAuthenticationService,
     connectors::Worldline,
     connectors::Volt,
     connectors::Worldpay,
diff --git a/crates/hyperswitch_interfaces/src/configs.rs b/crates/hyperswitch_interfaces/src/configs.rs
index 93cf888a4158..e7e59d2d0637 100644
--- a/crates/hyperswitch_interfaces/src/configs.rs
+++ b/crates/hyperswitch_interfaces/src/configs.rs
@@ -88,7 +88,7 @@ pub struct Connectors {
     pub thunes: ConnectorParams,
     pub trustpay: ConnectorParamsWithMoreUrls,
     pub tsys: ConnectorParams,
-    pub unifiedauthenticationservice: ConnectorParams,
+    pub unified_authentication_service: ConnectorParams,
     pub volt: ConnectorParams,
     pub wellsfargo: ConnectorParams,
     pub wellsfargopayout: ConnectorParams,
diff --git a/crates/router/src/connector.rs b/crates/router/src/connector.rs
index 1b62748f15b5..4d1114d92a15 100644
--- a/crates/router/src/connector.rs
+++ b/crates/router/src/connector.rs
@@ -53,8 +53,8 @@ pub use hyperswitch_connectors::connectors::{
     payu::Payu, powertranz, powertranz::Powertranz, prophetpay, prophetpay::Prophetpay, rapyd,
     rapyd::Rapyd, razorpay, razorpay::Razorpay, redsys, redsys::Redsys, shift4, shift4::Shift4,
     square, square::Square, stax, stax::Stax, taxjar, taxjar::Taxjar, thunes, thunes::Thunes, tsys,
-    tsys::Tsys, unifiedauthenticationservice,
-    unifiedauthenticationservice::Unifiedauthenticationservice, volt, volt::Volt, worldline, worldline::Worldline, worldpay, worldpay::Worldpay,
+    tsys::Tsys, unified_authentication_service,
+    unified_authentication_service::UnifiedAuthenticationService, volt, volt::Volt, worldline, worldline::Worldline, worldpay, worldpay::Worldpay,
     xendit, xendit::Xendit, zen, zen::Zen, zsl, zsl::Zsl,
 };
 
diff --git a/crates/router/src/core/payments/connector_integration_v2_impls.rs b/crates/router/src/core/payments/connector_integration_v2_impls.rs
index 36658f573cbc..286680062f88 100644
--- a/crates/router/src/core/payments/connector_integration_v2_impls.rs
+++ b/crates/router/src/core/payments/connector_integration_v2_impls.rs
@@ -1145,7 +1145,7 @@ default_imp_for_new_connector_integration_payouts!(
     connector::Threedsecureio,
     connector::Thunes,
     connector::Tsys,
-    connector::Unifiedauthenticationservice,
+    connector::UnifiedAuthenticationService,
     connector::Volt,
     connector::Wellsfargo,
     connector::Wise,
@@ -1748,7 +1748,7 @@ default_imp_for_new_connector_integration_frm!(
     connector::Threedsecureio,
     connector::Thunes,
     connector::Tsys,
-    connector::Unifiedauthenticationservice,
+    connector::UnifiedAuthenticationService,
     connector::Volt,
     connector::Wellsfargo,
     connector::Wise,
@@ -2216,7 +2216,7 @@ default_imp_for_new_connector_integration_connector_authentication!(
     connector::Threedsecureio,
     connector::Thunes,
     connector::Tsys,
-    connector::Unifiedauthenticationservice,
+    connector::UnifiedAuthenticationService,
     connector::Volt,
     connector::Wellsfargo,
     connector::Wise,
diff --git a/crates/router/src/core/payments/flows.rs b/crates/router/src/core/payments/flows.rs
index 5d4db31180c3..ae7a72eaed1b 100644
--- a/crates/router/src/core/payments/flows.rs
+++ b/crates/router/src/core/payments/flows.rs
@@ -504,7 +504,7 @@ default_imp_for_connector_request_id!(
     connector::Threedsecureio,
     connector::Trustpay,
     connector::Tsys,
-    connector::Unifiedauthenticationservice,
+    connector::UnifiedAuthenticationService,
     connector::Volt,
     connector::Wellsfargo,
     connector::Wellsfargopayout,
@@ -1708,7 +1708,7 @@ default_imp_for_fraud_check!(
     connector::Threedsecureio,
     connector::Trustpay,
     connector::Tsys,
-    connector::Unifiedauthenticationservice,
+    connector::UnifiedAuthenticationService,
     connector::Volt,
     connector::Wellsfargo,
     connector::Wellsfargopayout,
@@ -2339,7 +2339,7 @@ default_imp_for_connector_authentication!(
     connector::Taxjar,
     connector::Trustpay,
     connector::Tsys,
-    connector::Unifiedauthenticationservice,
+    connector::UnifiedAuthenticationService,
     connector::Volt,
     connector::Wellsfargo,
     connector::Wellsfargopayout,
diff --git a/crates/router/src/types/api.rs b/crates/router/src/types/api.rs
index 83ec0ce7c2c3..cedb838d5887 100644
--- a/crates/router/src/types/api.rs
+++ b/crates/router/src/types/api.rs
@@ -528,8 +528,8 @@ impl ConnectorData {
                     Ok(ConnectorEnum::Old(Box::new(connector::Trustpay::new())))
                 }
                 enums::Connector::Tsys => Ok(ConnectorEnum::Old(Box::new(connector::Tsys::new()))),
-                // enums::Connector::Unifiedauthenticationservice => Ok(ConnectorEnum::Old(Box::new(
-                //     connector::Unifiedauthenticationservice,
+                // enums::Connector::UnifiedAuthenticationService => Ok(ConnectorEnum::Old(Box::new(
+                //     connector::UnifiedAuthenticationService,
                 // ))),
                 enums::Connector::Volt => Ok(ConnectorEnum::Old(Box::new(connector::Volt::new()))),
                 enums::Connector::Wellsfargo => {
diff --git a/crates/router/src/types/transformers.rs b/crates/router/src/types/transformers.rs
index 717888a9dc74..a3c3da0462a7 100644
--- a/crates/router/src/types/transformers.rs
+++ b/crates/router/src/types/transformers.rs
@@ -299,8 +299,8 @@ impl ForeignTryFrom<api_enums::Connector> for common_enums::RoutableConnectors {
             // api_enums::Connector::Thunes => Self::Thunes,
             api_enums::Connector::Trustpay => Self::Trustpay,
             api_enums::Connector::Tsys => Self::Tsys,
-            // api_enums::Connector::Unifiedauthenticationservice => {
-            //     Self::Unifiedauthenticationservice
+            // api_enums::Connector::UnifiedAuthenticationService => {
+            //     Self::UnifiedAuthenticationService
             // }
             api_enums::Connector::Volt => Self::Volt,
             api_enums::Connector::Wellsfargo => Self::Wellsfargo,
diff --git a/crates/router/tests/connectors/main.rs b/crates/router/tests/connectors/main.rs
index 4939929b3cdf..31ceb1a72456 100644
--- a/crates/router/tests/connectors/main.rs
+++ b/crates/router/tests/connectors/main.rs
@@ -82,7 +82,7 @@ mod stripe;
 mod taxjar;
 mod trustpay;
 mod tsys;
-mod unifiedauthenticationservice;
+mod unified_authentication_service;
 mod utils;
 mod volt;
 mod wellsfargo;
diff --git a/crates/router/tests/connectors/sample_auth.toml b/crates/router/tests/connectors/sample_auth.toml
index 586d24dea779..f2f849731d52 100644
--- a/crates/router/tests/connectors/sample_auth.toml
+++ b/crates/router/tests/connectors/sample_auth.toml
@@ -302,5 +302,5 @@ api_key="API Key"
 [nomupay]
 api_key="API Key"
 
-[unifiedauthenticationservice]
+[unified_authentication_service]
 api_key="API Key"
\ No newline at end of file
diff --git a/crates/router/tests/connectors/unifiedauthenticationservice.rs b/crates/router/tests/connectors/unified_authentication_service.rs
similarity index 96%
rename from crates/router/tests/connectors/unifiedauthenticationservice.rs
rename to crates/router/tests/connectors/unified_authentication_service.rs
index bf09864c5050..0a403d9d260b 100644
--- a/crates/router/tests/connectors/unifiedauthenticationservice.rs
+++ b/crates/router/tests/connectors/unified_authentication_service.rs
@@ -6,13 +6,13 @@ use test_utils::connector_auth;
 use crate::utils::{self, ConnectorActions};
 
 #[derive(Clone, Copy)]
-struct UnifiedauthenticationserviceTest;
-impl ConnectorActions for UnifiedauthenticationserviceTest {}
-impl utils::Connector for UnifiedauthenticationserviceTest {
+struct UnifiedAuthenticationServiceTest;
+impl ConnectorActions for UnifiedAuthenticationServiceTest {}
+impl utils::Connector for UnifiedAuthenticationServiceTest {
     fn get_data(&self) -> api::ConnectorData {
-        use router::connector::Unifiedauthenticationservice;
+        use router::connector::UnifiedAuthenticationService;
         utils::construct_connector_data_old(
-            Box::new(Unifiedauthenticationservice::new()),
+            Box::new(UnifiedAuthenticationService::new()),
             types::Connector::Plaid,
             api::GetToken::Connector,
             None,
@@ -22,18 +22,18 @@ impl utils::Connector for UnifiedauthenticationserviceTest {
     fn get_auth_token(&self) -> types::ConnectorAuthType {
         utils::to_connector_auth_type(
             connector_auth::ConnectorAuthentication::new()
-                .unifiedauthenticationservice
+                .unified_authentication_service
                 .expect("Missing connector authentication configuration")
                 .into(),
         )
     }
 
     fn get_name(&self) -> String {
-        "unifiedauthenticationservice".to_string()
+        "unified_authentication_service".to_string()
     }
 }
 
-static CONNECTOR: UnifiedauthenticationserviceTest = UnifiedauthenticationserviceTest {};
+static CONNECTOR: UnifiedAuthenticationServiceTest = UnifiedAuthenticationServiceTest {};
 
 fn get_default_payment_info() -> Option<utils::PaymentInfo> {
     None
diff --git a/crates/test_utils/src/connector_auth.rs b/crates/test_utils/src/connector_auth.rs
index 13a0ab487563..37cc341c4540 100644
--- a/crates/test_utils/src/connector_auth.rs
+++ b/crates/test_utils/src/connector_auth.rs
@@ -89,7 +89,7 @@ pub struct ConnectorAuthentication {
     pub stripe_uk: Option<HeaderKey>,
     pub trustpay: Option<SignatureKey>,
     pub tsys: Option<SignatureKey>,
-    pub unifiedauthenticationservice: Option<HeaderKey>,
+    pub unified_authentication_service: Option<HeaderKey>,
     pub volt: Option<HeaderKey>,
     pub wellsfargo: Option<HeaderKey>,
     // pub wellsfargopayout: Option<HeaderKey>,
diff --git a/loadtest/config/development.toml b/loadtest/config/development.toml
index 06488656f04f..51981a298e31 100644
--- a/loadtest/config/development.toml
+++ b/loadtest/config/development.toml
@@ -164,7 +164,7 @@ stripe.base_url_file_upload = "https://files.stripe.com/"
 trustpay.base_url = "https://test-tpgw.trustpay.eu/"
 trustpay.base_url_bank_redirects = "https://aapi.trustpay.eu/"
 tsys.base_url = "https://stagegw.transnox.com/"
-unifiedauthenticationservice.base_url = "http://localhost:8000"
+unified_authentication_service.base_url = "http://localhost:8000"
 volt.base_url = "https://api.sandbox.volt.io/"
 wellsfargo.base_url = "https://apitest.cybersource.com/"
 wellsfargopayout.base_url = "https://api-sandbox.wellsfargo.com/"
@@ -253,7 +253,7 @@ cards = [
     "thunes",
     "trustpay",
     "tsys",
-    "unifiedauthenticationservice",
+    "unified_authentication_service",
     "volt",
     "wellsfargo",
     "wellsfargopayout",
diff --git a/scripts/add_connector.sh b/scripts/add_connector.sh
index 60d5c7b366d6..108e9d882635 100755
--- a/scripts/add_connector.sh
+++ b/scripts/add_connector.sh
@@ -6,7 +6,7 @@ function find_prev_connector() {
     git checkout $self
     cp $self $self.tmp
     # Add new connector to existing list and sort it
-    connectors=(aci adyen adyenplatform airwallex amazonpay applepay authorizedotnet bambora bamboraapac bankofamerica billwerk bitpay bluesnap boku braintree cashtocode checkout coinbase cryptopay cybersource datatrans deutschebank digitalvirgo dlocal dummyconnector ebanx elavon fiserv fiservemea fiuu forte globalpay globepay gocardless gpayments helcim iatapay inespay itaubank jpmorgan klarna mifinity mollie multisafepay netcetera nexinets nexixpay nomupay noon novalnet nuvei opayo opennode paybox payeezy payme payone paypal payu placetopay plaid powertranz prophetpay rapyd razorpay redsys shift4 square stax stripe taxjar threedsecureio thunes trustpay tsys unifiedauthenticationservice volt wellsfargo wellsfargopayout wise worldline worldpay xendit zsl "$1")
+    connectors=(aci adyen adyenplatform airwallex amazonpay applepay authorizedotnet bambora bamboraapac bankofamerica billwerk bitpay bluesnap boku braintree cashtocode checkout coinbase cryptopay cybersource datatrans deutschebank digitalvirgo dlocal dummyconnector ebanx elavon fiserv fiservemea fiuu forte globalpay globepay gocardless gpayments helcim iatapay inespay itaubank jpmorgan klarna mifinity mollie multisafepay netcetera nexinets nexixpay nomupay noon novalnet nuvei opayo opennode paybox payeezy payme payone paypal payu placetopay plaid powertranz prophetpay rapyd razorpay redsys shift4 square stax stripe taxjar threedsecureio thunes trustpay tsys unified_authentication_service volt wellsfargo wellsfargopayout wise worldline worldpay xendit zsl "$1")
     IFS=$'\n' sorted=($(sort <<<"${connectors[*]}")); unset IFS
     res="$(echo ${sorted[@]})"
     sed -i'' -e "s/^    connectors=.*/    connectors=($res \"\$1\")/" $self.tmp