diff --git a/app/(prowler)/providers/page.tsx b/app/(prowler)/providers/page.tsx
index 7e876da05d..d3cd8c1611 100644
--- a/app/(prowler)/providers/page.tsx
+++ b/app/(prowler)/providers/page.tsx
@@ -31,15 +31,15 @@ export default function Providers() {
       />
       <Spacer />
       <ModalWrap
-        title="Modal Title"
-        body={
+        modalTitle="Modal Title"
+        modalBody={
           <>
             <p>Modal body content</p>
           </>
         }
-        actionText="Save"
+        actionButtonLabel="Save"
         onAction={onSave}
-        triggerText="Open Modal"
+        openButtonLabel="Open Modal"
       />
     </>
   );
diff --git a/components/ui/modal/Modal.tsx b/components/ui/modal/Modal.tsx
index eabfa171c8..ca7754a96e 100644
--- a/components/ui/modal/Modal.tsx
+++ b/components/ui/modal/Modal.tsx
@@ -9,28 +9,28 @@ import {
 import React from "react";
 
 interface ModalProps {
-  title: string;
-  body: React.ReactNode;
-  closeText?: string;
-  actionText?: string;
-  onAction?: () => void;
+  modalTitle: string;
+  modalBody: React.ReactNode;
+  closeButtonLabel?: string;
+  actionButtonLabel?: string;
+  onAction: () => void;
   isOpen: boolean;
   onOpenChange: (isOpen: boolean) => void;
   isDismissable?: boolean;
+  isKeyboardDismissDisabled?: boolean;
+  hideCloseButton?: boolean;
 }
 
 export const Modal: React.FC<ModalProps> = ({
-  title,
+  modalTitle,
+  modalBody,
+  closeButtonLabel,
+  actionButtonLabel,
+  onAction,
   isOpen,
   onOpenChange,
-  body,
-  closeText,
-  actionText,
-  onAction,
   isDismissable,
 }) => {
-  const hasActionButton = actionText && onAction;
-
   return (
     <>
       <ModalContainer
@@ -44,17 +44,17 @@ export const Modal: React.FC<ModalProps> = ({
         <ModalContent>
           {(onClose) => (
             <>
-              <ModalHeader className="flex flex-col gap-1">{title}</ModalHeader>
-              <ModalBody>{body}</ModalBody>
+              <ModalHeader className="flex flex-col gap-1">
+                {modalTitle}
+              </ModalHeader>
+              <ModalBody>{modalBody}</ModalBody>
               <ModalFooter>
                 <Button color="danger" variant="light" onPress={onClose}>
-                  {closeText && closeText}
+                  {closeButtonLabel}
+                </Button>
+                <Button color="primary" onPress={onAction}>
+                  {actionButtonLabel}
                 </Button>
-                {hasActionButton && (
-                  <Button color="primary" onPress={onAction}>
-                    {actionText}
-                  </Button>
-                )}
               </ModalFooter>
             </>
           )}
diff --git a/components/ui/modal/ModalWrap.tsx b/components/ui/modal/ModalWrap.tsx
index d2eca3491f..42318210bf 100644
--- a/components/ui/modal/ModalWrap.tsx
+++ b/components/ui/modal/ModalWrap.tsx
@@ -6,38 +6,38 @@ import React from "react";
 import { Modal } from "@/components";
 
 interface ModalWrapProps {
-  title: string;
-  body: React.ReactNode;
-  closeText?: string;
-  actionText?: string;
-  onAction?: () => void;
-  triggerText?: string;
+  modalTitle: string;
+  modalBody: React.ReactNode;
+  closeButtonLabel?: string;
+  actionButtonLabel?: string;
+  onAction: () => void;
+  openButtonLabel?: string;
   isDismissable?: boolean;
 }
 
 export const ModalWrap: React.FC<ModalWrapProps> = ({
-  title,
-  body,
-  closeText = "Close",
-  actionText = "Save",
+  modalTitle,
+  modalBody,
+  closeButtonLabel = "Close",
+  actionButtonLabel = "Save",
   onAction,
+  openButtonLabel = "Open",
   isDismissable = true,
-  triggerText = "Open",
 }) => {
   const { isOpen, onOpen, onClose, onOpenChange } = useDisclosure();
   const closeOnAction = () => {
-    onAction && onAction();
+    onAction?.();
     onClose();
   };
 
   return (
     <>
-      <Button onPress={onOpen}>{triggerText}</Button>
+      <Button onPress={onOpen}>{openButtonLabel}</Button>
       <Modal
-        title={title}
-        body={body}
-        closeText={closeText}
-        actionText={actionText}
+        modalTitle={modalTitle}
+        modalBody={modalBody}
+        closeButtonLabel={closeButtonLabel}
+        actionButtonLabel={actionButtonLabel}
         onAction={closeOnAction}
         isDismissable={isDismissable}
         isOpen={isOpen}