diff --git a/features/admin.remote-userstores.v1/api/remote-user-stores.ts b/features/admin.remote-userstores.v1/api/remote-user-stores.ts
index 3a0e47a1df6..23a9a5c41d6 100644
--- a/features/admin.remote-userstores.v1/api/remote-user-stores.ts
+++ b/features/admin.remote-userstores.v1/api/remote-user-stores.ts
@@ -22,7 +22,7 @@ import { RequestConfigInterface } from "@wso2is/admin.core.v1/hooks/use-request"
 import { RemoteUserStoreManagerType } from "@wso2is/admin.userstores.v1/constants";
 import { HttpMethods } from "@wso2is/core/models";
 import { AxiosError, AxiosResponse } from "axios";
-import { GenerateTokenResponseInterface, RegenerateTokenPayloadInterface } from "../models/remote-user-stores";
+import { GenerateTokenResponseInterface, RegenerateTokenRequestPayloadInterface } from "../models/remote-user-stores";
 
 /**
  * The error code that is returned when there is no item in the list.
@@ -172,7 +172,7 @@ export const regenerateToken = (
         ? `${store.getState().config.endpoints.remoteUserStoreAgentToken}/${userStoreId}/regenerate`
         : `${ store.getState().config.endpoints.onPremUserStoreAgentToken }/regenerate`;
 
-    const payload: RegenerateTokenPayloadInterface = userStoreManager ===
+    const payload: RegenerateTokenRequestPayloadInterface = userStoreManager ===
         RemoteUserStoreManagerType.RemoteUserStoreManager
         ? { existingTokenId }
         : { existingTokenId, userStoreId };
diff --git a/features/admin.remote-userstores.v1/models/remote-user-stores.ts b/features/admin.remote-userstores.v1/models/remote-user-stores.ts
index 3f4a54fe1ff..7e8dc356fc9 100644
--- a/features/admin.remote-userstores.v1/models/remote-user-stores.ts
+++ b/features/admin.remote-userstores.v1/models/remote-user-stores.ts
@@ -28,7 +28,7 @@ export interface AgentConnectionInterface {
     }
 }
 
-export interface RegenerateTokenPayloadInterface {
+export interface RegenerateTokenRequestPayloadInterface {
     existingTokenId: string;
     userStoreId?: string;
 }
diff --git a/features/admin.remote-userstores.v1/pages/remote-user-store-create-page.scss b/features/admin.remote-userstores.v1/pages/remote-user-store-create-page.scss
index 19fd9cf8e8e..2bd78bf4bf8 100644
--- a/features/admin.remote-userstores.v1/pages/remote-user-store-create-page.scss
+++ b/features/admin.remote-userstores.v1/pages/remote-user-store-create-page.scss
@@ -1,3 +1,21 @@
+/**
+ * Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 .remote-user-store-create-page-layout {
     .remote-user-store-impl-message {
         a:hover {
diff --git a/features/admin.remote-userstores.v1/pages/remote-user-store-create-page.tsx b/features/admin.remote-userstores.v1/pages/remote-user-store-create-page.tsx
index 52ca2db5cd5..ccef6b3640e 100644
--- a/features/admin.remote-userstores.v1/pages/remote-user-store-create-page.tsx
+++ b/features/admin.remote-userstores.v1/pages/remote-user-store-create-page.tsx
@@ -16,7 +16,6 @@
  * under the License.
  */
 
-import { Typography } from "@mui/material";
 import Button from "@oxygen-ui/react/Button";
 import Skeleton from "@oxygen-ui/react/Skeleton";
 import Stack from "@oxygen-ui/react/Stack";
@@ -24,6 +23,7 @@ import Step from "@oxygen-ui/react/Step";
 import StepContent from "@oxygen-ui/react/StepContent";
 import StepLabel from "@oxygen-ui/react/StepLabel";
 import Stepper from "@oxygen-ui/react/Stepper";
+import Typography from "@oxygen-ui/react/Typography";
 import { FeatureAccessConfigInterface, useRequiredScopes } from "@wso2is/access-control";
 import { ClaimManagementConstants } from "@wso2is/admin.claims.v1/constants";
 import { AppConstants, AppState, history } from "@wso2is/admin.core.v1";
@@ -81,7 +81,7 @@ type RemoteCustomerUserStoreCreatePageInterface = IdentifiableComponentInterface
  *
  * @returns the remote customer user store creation page
  */
-const RemoteCustomerUserStoreCreatePage: FunctionComponent<RemoteCustomerUserStoreCreatePageInterface> = (
+const RemoteUserStoreCreatePage: FunctionComponent<RemoteCustomerUserStoreCreatePageInterface> = (
     props: RemoteCustomerUserStoreCreatePageInterface
 ): ReactElement => {
     const { location, ["data-componentid"]: testId = "remote-userstore-create-page" } = props;
@@ -547,4 +547,4 @@ const RemoteCustomerUserStoreCreatePage: FunctionComponent<RemoteCustomerUserSto
     );
 };
 
-export default RemoteCustomerUserStoreCreatePage;
+export default RemoteUserStoreCreatePage;
diff --git a/features/admin.remote-userstores.v1/public-api.ts b/features/admin.remote-userstores.v1/public-api.ts
index be32d2d40a6..fe255c1a90e 100644
--- a/features/admin.remote-userstores.v1/public-api.ts
+++ b/features/admin.remote-userstores.v1/public-api.ts
@@ -16,6 +16,6 @@
  * under the License.
  */
 
-export { default as RemoteCustomerUserStoreCreatePage } from "./pages/remote-user-store-create-page";
+export { default as RemoteUserStoreCreatePage } from "./pages/remote-user-store-create-page";
 export { default as RemoteUserStoreEditPage } from "./pages/remote-user-store-edit-page";
 export { default as RemoteUserStoresPage } from "./pages/remote-user-stores-page";