diff --git a/pkg/subnet/utils.go b/pkg/subnet/utils.go
index cfe0a0101..a3e52aa8b 100644
--- a/pkg/subnet/utils.go
+++ b/pkg/subnet/utils.go
@@ -83,7 +83,7 @@ func ProcessUploadInfo(info interface{}, uploadType string, filename string) ([]
 	if uploadType == "health" {
 		return processHealthReport(info, filename)
 	}
-	return nil, "", errors.New("invalid Subnet upload type")
+	return nil, "", errors.New("invalid SUBNET upload type")
 }
 
 func UploadFileToSubnet(info []byte, client *xhttp.Client, reqURL string, headers map[string]string, formDataType string) (string, error) {
diff --git a/portal-ui/src/api/consoleApi.ts b/portal-ui/src/api/consoleApi.ts
index 4aab8f4f6..2daa065da 100644
--- a/portal-ui/src/api/consoleApi.ts
+++ b/portal-ui/src/api/consoleApi.ts
@@ -1711,9 +1711,10 @@ export class HttpClient<SecurityDataType = unknown> {
             ? { "Content-Type": type }
             : {}),
         },
-        signal: cancelToken
-          ? this.createAbortSignal(cancelToken)
-          : requestParams.signal,
+        signal:
+          (cancelToken
+            ? this.createAbortSignal(cancelToken)
+            : requestParams.signal) || null,
         body:
           typeof body === "undefined" || body === null
             ? null
@@ -4001,7 +4002,7 @@ export class Api<
      *
      * @tags Subnet
      * @name SubnetRegToken
-     * @summary Subnet registraton token
+     * @summary SUBNET registraton token
      * @request GET:/subnet/registration-token
      * @secure
      */
@@ -4080,7 +4081,7 @@ export class Api<
      *
      * @tags Subnet
      * @name SubnetLogin
-     * @summary Login to subnet
+     * @summary Login to SUBNET
      * @request POST:/subnet/login
      * @secure
      */
@@ -4100,7 +4101,7 @@ export class Api<
      *
      * @tags Subnet
      * @name SubnetLoginMfa
-     * @summary Login to subnet using mfa
+     * @summary Login to SUBNET using mfa
      * @request POST:/subnet/login/mfa
      * @secure
      */
diff --git a/portal-ui/src/screens/Console/HealthInfo/HealthInfo.tsx b/portal-ui/src/screens/Console/HealthInfo/HealthInfo.tsx
index b82699be9..47bd1b4f4 100644
--- a/portal-ui/src/screens/Console/HealthInfo/HealthInfo.tsx
+++ b/portal-ui/src/screens/Console/HealthInfo/HealthInfo.tsx
@@ -248,12 +248,12 @@ const HealthInfo = () => {
                     !subnetResponse.toLowerCase().includes("error") && (
                       <Grid item xs={12}>
                         <strong>
-                          Health report uploaded to Subnet successfully!
+                          Health report uploaded to SUBNET successfully!
                         </strong>
                         &nbsp;{" "}
                         <strong>
                           See the results on your{" "}
-                          <a href={subnetResponse}>Subnet Dashboard</a>{" "}
+                          <a href={subnetResponse}>SUBNET Dashboard</a>{" "}
                         </strong>
                       </Grid>
                     )}
@@ -263,12 +263,12 @@ const HealthInfo = () => {
                       <Grid item xs={12}>
                         <strong>
                           Something went wrong uploading your Health report to
-                          Subnet.
+                          SUBNET.
                         </strong>
                         &nbsp;{" "}
                         <strong>
                           Log into your{" "}
-                          <a href="https://subnet.min.io">Subnet Account</a> to
+                          <a href="https://subnet.min.io">SUBNET Account</a> to
                           manually upload your Health report.
                         </strong>
                       </Grid>
@@ -330,7 +330,7 @@ const HealthInfo = () => {
             <br />
             <HelpBox
               title={
-                "Cluster Health Report will be uploaded to Subnet, and is viewable from your Subnet Diagnostics dashboard."
+                "Cluster Health Report will be uploaded to SUBNET, and is viewable from your SUBNET Diagnostics dashboard."
               }
               iconComponent={<InfoIcon />}
               help={
diff --git a/restapi/embedded_spec.go b/restapi/embedded_spec.go
index 444f43cf4..bb10d894d 100644
--- a/restapi/embedded_spec.go
+++ b/restapi/embedded_spec.go
@@ -4753,7 +4753,7 @@ func init() {
         "tags": [
           "Subnet"
         ],
-        "summary": "Login to subnet",
+        "summary": "Login to SUBNET",
         "operationId": "SubnetLogin",
         "parameters": [
           {
@@ -4786,7 +4786,7 @@ func init() {
         "tags": [
           "Subnet"
         ],
-        "summary": "Login to subnet using mfa",
+        "summary": "Login to SUBNET using mfa",
         "operationId": "SubnetLoginMFA",
         "parameters": [
           {
@@ -4849,7 +4849,7 @@ func init() {
         "tags": [
           "Subnet"
         ],
-        "summary": "Subnet registraton token",
+        "summary": "SUBNET registraton token",
         "operationId": "SubnetRegToken",
         "responses": {
           "200": {
@@ -13829,7 +13829,7 @@ func init() {
         "tags": [
           "Subnet"
         ],
-        "summary": "Login to subnet",
+        "summary": "Login to SUBNET",
         "operationId": "SubnetLogin",
         "parameters": [
           {
@@ -13862,7 +13862,7 @@ func init() {
         "tags": [
           "Subnet"
         ],
-        "summary": "Login to subnet using mfa",
+        "summary": "Login to SUBNET using mfa",
         "operationId": "SubnetLoginMFA",
         "parameters": [
           {
@@ -13925,7 +13925,7 @@ func init() {
         "tags": [
           "Subnet"
         ],
-        "summary": "Subnet registraton token",
+        "summary": "SUBNET registraton token",
         "operationId": "SubnetRegToken",
         "responses": {
           "200": {
diff --git a/restapi/errors.go b/restapi/errors.go
index bef6a1d78..3f3c371b9 100644
--- a/restapi/errors.go
+++ b/restapi/errors.go
@@ -71,7 +71,7 @@ var (
 	ErrEncryptionConfigNotFound         = errors.New("encryption configuration not found")
 	ErrPolicyNotFound                   = errors.New("policy does not exist")
 	ErrLoginNotAllowed                  = errors.New("login not allowed")
-	ErrSubnetUploadFail                 = errors.New("Subnet upload failed")
+	ErrSubnetUploadFail                 = errors.New("SUBNET upload failed")
 	ErrHealthReportFail                 = errors.New("failure to generate Health report")
 )
 
diff --git a/restapi/operations/subnet/subnet_login.go b/restapi/operations/subnet/subnet_login.go
index 4a50c907d..4f7546f55 100644
--- a/restapi/operations/subnet/subnet_login.go
+++ b/restapi/operations/subnet/subnet_login.go
@@ -51,7 +51,7 @@ func NewSubnetLogin(ctx *middleware.Context, handler SubnetLoginHandler) *Subnet
 /*
 	SubnetLogin swagger:route POST /subnet/login Subnet subnetLogin
 
-Login to subnet
+Login to SUBNET
 */
 type SubnetLogin struct {
 	Context *middleware.Context
diff --git a/restapi/operations/subnet/subnet_login_m_f_a.go b/restapi/operations/subnet/subnet_login_m_f_a.go
index 8cef58490..026a48f2f 100644
--- a/restapi/operations/subnet/subnet_login_m_f_a.go
+++ b/restapi/operations/subnet/subnet_login_m_f_a.go
@@ -51,7 +51,7 @@ func NewSubnetLoginMFA(ctx *middleware.Context, handler SubnetLoginMFAHandler) *
 /*
 	SubnetLoginMFA swagger:route POST /subnet/login/mfa Subnet subnetLoginMFA
 
-Login to subnet using mfa
+Login to SUBNET using mfa
 */
 type SubnetLoginMFA struct {
 	Context *middleware.Context
diff --git a/restapi/operations/subnet/subnet_reg_token.go b/restapi/operations/subnet/subnet_reg_token.go
index 0621af1f8..2aa659e07 100644
--- a/restapi/operations/subnet/subnet_reg_token.go
+++ b/restapi/operations/subnet/subnet_reg_token.go
@@ -51,7 +51,7 @@ func NewSubnetRegToken(ctx *middleware.Context, handler SubnetRegTokenHandler) *
 /*
 	SubnetRegToken swagger:route GET /subnet/registration-token Subnet subnetRegToken
 
-Subnet registraton token
+SUBNET registraton token
 */
 type SubnetRegToken struct {
 	Context *middleware.Context
diff --git a/swagger.yml b/swagger.yml
index ba78796b4..bfee71629 100644
--- a/swagger.yml
+++ b/swagger.yml
@@ -2394,7 +2394,7 @@ paths:
         - Profile
   /subnet/registration-token:
     get:
-      summary: Subnet registraton token
+      summary: SUBNET registraton token
       operationId: SubnetRegToken
       responses:
         200:
@@ -2466,7 +2466,7 @@ paths:
 
   /subnet/login:
     post:
-      summary: Login to subnet
+      summary: Login to SUBNET
       operationId: SubnetLogin
       parameters:
         - name: body
@@ -2488,7 +2488,7 @@ paths:
 
   /subnet/login/mfa:
     post:
-      summary: Login to subnet using mfa
+      summary: Login to SUBNET using mfa
       operationId: SubnetLoginMFA
       parameters:
         - name: body