diff --git a/src/components/Modal/ClosePOModal.js b/src/components/PurchaseOrder/CloseOrder/CloseOrderModal.js
similarity index 85%
rename from src/components/Modal/ClosePOModal.js
rename to src/components/PurchaseOrder/CloseOrder/CloseOrderModal.js
index ad77b629e..0b1d93de5 100644
--- a/src/components/Modal/ClosePOModal.js
+++ b/src/components/PurchaseOrder/CloseOrder/CloseOrderModal.js
@@ -4,9 +4,9 @@ import PropTypes from 'prop-types';
 
 import { Button } from '@folio/stripes/components';
 
-import ClosePOModalForm from './ClosePOModalForm';
+import CloseOrderModalForm from './CloseOrderModalForm';
 
-class ClosePOModal extends Component {
+class CloseOrderModal extends Component {
   static propTypes = {
     orderId: PropTypes.string.isRequired,
   };
@@ -44,7 +44,7 @@ class ClosePOModal extends Component {
         >
           <FormattedMessage id="ui-orders.paneBlock.closeBtn" />
         </Button>
-        <ClosePOModalForm
+        <CloseOrderModalForm
           close={this.closeModal}
           orderId={orderId}
           open={this.state.openModal}
@@ -54,4 +54,4 @@ class ClosePOModal extends Component {
   }
 }
 
-export default ClosePOModal;
+export default CloseOrderModal;
diff --git a/src/components/Modal/ClosePOModalForm.js b/src/components/PurchaseOrder/CloseOrder/CloseOrderModalForm.js
similarity index 64%
rename from src/components/Modal/ClosePOModalForm.js
rename to src/components/PurchaseOrder/CloseOrder/CloseOrderModalForm.js
index 386040695..44a15d5f4 100644
--- a/src/components/Modal/ClosePOModalForm.js
+++ b/src/components/PurchaseOrder/CloseOrder/CloseOrderModalForm.js
@@ -13,9 +13,9 @@ import {
   TextArea,
 } from '@folio/stripes/components';
 
-const ClosePOModalForm = ({ close, open, orderId }) => {
-  const cancelBtn = <FormattedMessage id="ui-orders.closePOModal.cancel" />;
-  const submitBtn = <FormattedMessage id="ui-orders.closePOModal.submit" />;
+const CloseOrderModalForm = ({ close, open, orderId }) => {
+  const cancelBtn = <FormattedMessage id="ui-orders.closeOrderModal.cancel" />;
+  const submitBtn = <FormattedMessage id="ui-orders.closeOrderModal.submit" />;
   const footer = (
     <ModalFooter
       secondaryButton={{
@@ -32,19 +32,19 @@ const ClosePOModalForm = ({ close, open, orderId }) => {
   return (
     <Modal
       footer={footer}
-      label={<FormattedMessage id="ui-orders.closePOModal.title" values={{ orderId }} />}
+      label={<FormattedMessage id="ui-orders.closeOrderModal.title" values={{ orderId }} />}
       open={open}
     >
       <Row>
         <Col xs={12}>
           <Field
             component={Select}
-            label={<FormattedMessage id="ui-orders.closePOModal.reason" />}
+            label={<FormattedMessage id="ui-orders.closeOrderModal.reason" />}
             name="reason"
           />
           <Field
             component={TextArea}
-            label={<FormattedMessage id="ui-orders.closePOModal.notes" />}
+            label={<FormattedMessage id="ui-orders.closeOrderModal.notes" />}
             name="notes"
           />
         </Col>
@@ -53,14 +53,14 @@ const ClosePOModalForm = ({ close, open, orderId }) => {
   );
 };
 
-ClosePOModalForm.propTypes = {
+CloseOrderModalForm.propTypes = {
   close: PropTypes.func.isRequired,
   open: PropTypes.bool.isRequired,
   orderId: PropTypes.string.isRequired,
 };
 
 export default stripesForm({
-  form: 'closePOModalForm',
+  form: 'closeOrderModalForm',
   navigationCheck: true,
   enableReinitialize: true,
-})(ClosePOModalForm);
+})(CloseOrderModalForm);
diff --git a/src/components/PurchaseOrder/CloseOrder/index.js b/src/components/PurchaseOrder/CloseOrder/index.js
new file mode 100644
index 000000000..d06bcc5e1
--- /dev/null
+++ b/src/components/PurchaseOrder/CloseOrder/index.js
@@ -0,0 +1,4 @@
+import CloseOrderModal from './CloseOrderModal';
+import CloseOrderModalForm from './CloseOrderModalForm';
+
+export { CloseOrderModal, CloseOrderModalForm };
diff --git a/src/components/PurchaseOrder/PO.js b/src/components/PurchaseOrder/PO.js
index 6cdd30ab0..ae071c6de 100644
--- a/src/components/PurchaseOrder/PO.js
+++ b/src/components/PurchaseOrder/PO.js
@@ -27,7 +27,7 @@ import {
   LayerPOLine,
 } from '../LayerCollection';
 import transitionToParams from '../Utils/transitionToParams';
-import ClosePOModal from '../Modal/ClosePOModal';
+import { CloseOrderModal } from './CloseOrder';
 import { AdjustmentView } from './Adjustment';
 import LineListing from './LineListing';
 import { PODetailsView } from './PODetails';
@@ -187,7 +187,7 @@ class PO extends Component {
     const lastMenu = (
       <PaneMenu>
         <IfPermission perm="purchase_order.item.put">
-          <ClosePOModal orderId={get(initialValues, 'id', '')} />
+          <CloseOrderModal orderId={get(initialValues, 'id', '')} />
           <FormattedMessage id="ui-orders.paneMenu.editOrder">
             {ariaLabel => (
               <IconButton
diff --git a/translations/ui-orders/en.json b/translations/ui-orders/en.json
index c637f9207..b738500af 100644
--- a/translations/ui-orders/en.json
+++ b/translations/ui-orders/en.json
@@ -444,11 +444,11 @@
   "settings.setPOLInesLimit": "Set Purchase Order Lines Limit",
   "settings.setPOLInesLimit.changed": "The Limit of Purchase Order Lines has been successfully saved",
   "settings.setPOLInesLimit.validatation": "Please enter a whole number greater than 0 and less than 1000 to continue",
-  "closePOModal.reason": "Reason",
-  "closePOModal.notes": "Notes",
-  "closePOModal.cancel": "Cancel",
-  "closePOModal.submit": "Submit",
-  "closePOModal.title": "Close - Purchase Order #{orderId}",
+  "closeOrderModal.reason": "Reason",
+  "closeOrderModal.notes": "Notes",
+  "closeOrderModal.cancel": "Cancel",
+  "closeOrderModal.submit": "Submit",
+  "closeOrderModal.title": "Close - Purchase Order #{orderId}",
 
   "errors.noMatch.oops": "Uh-oh!",
   "errors.noMatch.how": "How did you get to {location}?"