From 695f4f2851c7186c9c34d208412fb7f5c9437624 Mon Sep 17 00:00:00 2001
From: Vanessa Fotso <vfotso@mitre.org>
Date: Wed, 12 Oct 2022 13:55:19 -0400
Subject: [PATCH] Changed term 'control' to 'requirement' on the UI

Signed-off-by: Vanessa Fotso <vfotso@mitre.org>
---
 .eslintrc.js                                  | 47 +++++-----
 .../components/components/ComponentCard.vue   |  4 +-
 .../components/LockControlsModal.vue          |  6 +-
 .../components/NewComponentModal.vue          |  2 +-
 .../components/ProjectComponent.vue           |  4 +-
 .../components/memberships/NewMembership.vue  |  6 +-
 .../components/rules/FindAndReplace.vue       |  2 +-
 .../components/rules/FindAndReplaceResult.vue |  2 +-
 .../components/rules/RuleEditorHeader.vue     | 88 +++++++++----------
 .../components/rules/RuleNavigator.vue        | 13 +--
 .../components/rules/RuleSatisfactions.vue    |  4 +-
 app/javascript/components/rules/Rules.vue     |  4 +-
 .../components/rules/RulesCodeEditorView.vue  |  2 +-
 .../components/rules/RulesReadOnlyView.vue    |  2 +-
 .../rules/forms/AdvancedRuleForm.vue          |  4 +-
 .../components/rules/forms/BasicRuleForm.vue  |  4 +-
 .../rules/forms/DisaRuleDescriptionForm.vue   | 10 ++-
 .../rules/forms/NewRuleModalForm.vue          |  6 +-
 .../components/rules/forms/RuleForm.vue       |  6 +-
 19 files changed, 108 insertions(+), 108 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 0f718388..20083f86 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,34 +1,31 @@
 module.exports = {
   env: {
     browser: true,
-    es6: true
+    es6: true,
   },
-  extends: ["plugin:vue/recommended", 'prettier', 'plugin:prettier/recommended' ],
+  extends: ["plugin:vue/recommended", "prettier", "plugin:prettier/recommended"],
   rules: {
-    'max-len': 'off',
-    'no-console': 'warn',
-    'no-return-await': 'warn',
-    'no-throw-literal': 'warn',
-    'vue/require-default-prop': 'off',
-    'vue/prop-name-casing': 'off',
-    'object-curly-spacing': 'off',
-    'lines-between-class-members': [
-      'warn',
-      'always',
-      {exceptAfterSingleLine: true}
+    "max-len": "off",
+    "no-console": "warn",
+    "no-return-await": "warn",
+    "no-throw-literal": "warn",
+    "vue/require-default-prop": "off",
+    "vue/prop-name-casing": "off",
+    "vue/multi-word-component-names": "off",
+    "object-curly-spacing": "off",
+    "lines-between-class-members": ["warn", "always", { exceptAfterSingleLine: true }],
+    "padding-line-between-statements": [
+      "warn",
+      { blankLine: "always", prev: "function", next: "*" },
+      { blankLine: "always", prev: "import", next: ["class", "function"] },
     ],
-    'padding-line-between-statements': [
-      'warn',
-      {blankLine: 'always', prev: 'function', next: '*'},
-      {blankLine: 'always', prev: 'import', next: ['class', 'function']}
-    ],
-    'vue/html-self-closing': [
-      'warn',
+    "vue/html-self-closing": [
+      "warn",
       {
         html: {
-          void: 'always'
-        }
-      }
-    ]
-  }
+          void: "always",
+        },
+      },
+    ],
+  },
 };
diff --git a/app/javascript/components/components/ComponentCard.vue b/app/javascript/components/components/ComponentCard.vue
index 859b83f5..b4cd745c 100644
--- a/app/javascript/components/components/ComponentCard.vue
+++ b/app/javascript/components/components/ComponentCard.vue
@@ -23,7 +23,7 @@
         <i v-if="component.released" class="mdi mdi-stamper h5" aria-hidden="true" />
         <!-- Rules count info -->
         <span class="float-right h6">
-          {{ component.rules_count }} {{ component.component_id ? "Overlaid" : "" }} Controls
+          {{ component.rules_count }} {{ component.component_id ? "Overlaid" : "" }} Requirements
         </span>
       </b-card-title>
       <b-card-sub-title class="mb-2">
@@ -131,7 +131,7 @@
                   v-b-tooltip.hover
                   class="mdi mdi-lock h5 clickable"
                   aria-hidden="true"
-                  title="Lock component controls"
+                  title="Lock component requirements"
                 />
               </template>
             </LockControlsModal>
diff --git a/app/javascript/components/components/LockControlsModal.vue b/app/javascript/components/components/LockControlsModal.vue
index 19ca2923..b6ec458f 100644
--- a/app/javascript/components/components/LockControlsModal.vue
+++ b/app/javascript/components/components/LockControlsModal.vue
@@ -3,16 +3,16 @@
     <!-- Modal trigger button -->
     <span @click="showModal()">
       <slot name="opener">
-        <b-button class="px-2 m-2" variant="primary"> Lock Component Controls </b-button>
+        <b-button class="px-2 m-2" variant="primary"> Lock Component Requirements </b-button>
       </slot>
     </span>
 
     <!-- Add component modal -->
     <b-modal
       ref="LockControlsModal"
-      title="Lock Component Controls"
+      title="Lock Component Requirements"
       size="lg"
-      :ok-title="loading ? 'Loading...' : 'Lock Controls'"
+      :ok-title="loading ? 'Loading...' : 'Lock Requirements'"
       :ok-disabled="loading"
       @ok="lockControls"
     >
diff --git a/app/javascript/components/components/NewComponentModal.vue b/app/javascript/components/components/NewComponentModal.vue
index 97c366af..1d25bf4e 100644
--- a/app/javascript/components/components/NewComponentModal.vue
+++ b/app/javascript/components/components/NewComponentModal.vue
@@ -117,7 +117,7 @@
             <b-form-group
               v-else
               label="STIG ID Prefix"
-              description="STIG IDs for each control will be automatically generated based on this prefix value"
+              description="STIG IDs for each requirement will be automatically generated based on this prefix value"
             >
               <b-form-input
                 v-model="prefix"
diff --git a/app/javascript/components/components/ProjectComponent.vue b/app/javascript/components/components/ProjectComponent.vue
index 7f4eaf0a..bad02192 100644
--- a/app/javascript/components/components/ProjectComponent.vue
+++ b/app/javascript/components/components/ProjectComponent.vue
@@ -30,14 +30,14 @@
         <!-- Tab view for project information -->
         <b-tabs v-model="componentTabIndex" content-class="mt-3" justified>
           <!-- Component rules -->
-          <b-tab :title="`Controls (${component.rules.length})`">
+          <b-tab :title="`Requirements (${component.rules.length})`">
             <b-button
               v-if="role_gte_to(effective_permissions, 'author')"
               class="m-2"
               variant="primary"
               :href="`/components/${component.id}/controls`"
             >
-              Edit Component Controls
+              Edit Component Requirements
             </b-button>
             <span v-b-tooltip.hover :title="releaseComponentTooltip">
               <b-button
diff --git a/app/javascript/components/memberships/NewMembership.vue b/app/javascript/components/memberships/NewMembership.vue
index 24cfd605..840aa3e8 100644
--- a/app/javascript/components/memberships/NewMembership.vue
+++ b/app/javascript/components/memberships/NewMembership.vue
@@ -152,9 +152,9 @@ export default {
       selectedRole: null,
       roleDescriptions: [
         "Read only access to the Project or Component",
-        "Edit, comment, and mark Controls as requiring review. Cannot sign-off or approve changes to a Control. Great for individual contributors.",
-        "Author and approve changes to a Control.",
-        "Full control of a Project or Component. Lock Controls, revert controls, and manage members.",
+        "Edit, comment, and mark Requirements as requiring review. Cannot sign-off or approve changes to a Requirement. Great for individual contributors.",
+        "Author and approve changes to a Requirement.",
+        "Full control of a Project or Component. Lock Requirements, revert requirements, and manage members.",
       ],
       userSearchStyles: {
         vueSimpleSuggest: "userSearchVueSimpleSuggest",
diff --git a/app/javascript/components/rules/FindAndReplace.vue b/app/javascript/components/rules/FindAndReplace.vue
index 38057639..67c18067 100644
--- a/app/javascript/components/rules/FindAndReplace.vue
+++ b/app/javascript/components/rules/FindAndReplace.vue
@@ -42,7 +42,7 @@
         >
         <CommentModal
           title="Replace All"
-          message="Provide a comment that summarizes your changes to these controls."
+          message="Provide a comment that summarizes your changes to these requirements."
           :require-non-empty="false"
           button-text="Replace All"
           button-variant="primary"
diff --git a/app/javascript/components/rules/FindAndReplaceResult.vue b/app/javascript/components/rules/FindAndReplaceResult.vue
index 281e2911..3c8efd55 100644
--- a/app/javascript/components/rules/FindAndReplaceResult.vue
+++ b/app/javascript/components/rules/FindAndReplaceResult.vue
@@ -17,7 +17,7 @@
       <b-col lg="2" class="text-right">
         <CommentModal
           title="Replace"
-          message="Provide a comment that summarizes your changes to this control."
+          message="Provide a comment that summarizes your changes to this requirement."
           :require-non-empty="false"
           button-text="Replace"
           button-variant="secondary"
diff --git a/app/javascript/components/rules/RuleEditorHeader.vue b/app/javascript/components/rules/RuleEditorHeader.vue
index 5537b486..a95a8cb3 100644
--- a/app/javascript/components/rules/RuleEditorHeader.vue
+++ b/app/javascript/components/rules/RuleEditorHeader.vue
@@ -10,10 +10,10 @@
       </h2>
 
       <p v-if="!readOnly && rule.locked" class="text-danger font-weight-bold">
-        This control is locked and must first be unlocked if changes or deletion are required.
+        This requirement is locked and must first be unlocked if changes or deletion are required.
       </p>
       <p v-if="!readOnly && rule.review_requestor_id" class="text-danger font-weight-bold">
-        This control is under review and cannot be edited at this time.
+        This requirement is under review and cannot be edited at this time.
       </p>
 
       <div v-if="!readOnly">
@@ -28,14 +28,14 @@
         <!-- Action Buttons -->
         <!-- Clone rule modal -->
         <NewRuleModalForm
-          :title="'Clone Control'"
+          :title="'Clone Requirement'"
           :id-prefix="'duplicate'"
           :for-duplicate="true"
           :selected-rule-id="rule.id"
           :selected-rule-text="`${projectPrefix}-${rule.rule_id}`"
           @ruleSelected="$emit('ruleSelected', $event.id)"
         />
-        <b-button v-b-modal.duplicate-rule-modal variant="info">Clone Control</b-button>
+        <b-button v-b-modal.duplicate-rule-modal variant="info">Clone Requirement</b-button>
         <!-- Mark/Unmark as duplicate modal -->
         <span
           v-if="
@@ -45,7 +45,7 @@
             rule.satisfies.length > 0
           "
           v-b-tooltip.hover
-          title="This control cannot be marked as duplicate because it satisfies other controls"
+          title="This requirement cannot be marked as duplicate because it satisfies other requirements"
         >
           <b-button v-b-modal.mark-as-duplicate-modal disabled variant="orange"
             >Mark as Duplicate</b-button
@@ -78,16 +78,16 @@
             v-if="effectivePermissions == 'admin'"
             v-b-tooltip.hover
             class="d-inline-block"
-            title="Cannot delete a control that is locked or under review"
+            title="Cannot delete a requirement that is locked or under review"
           >
-            <b-button variant="danger" disabled>Delete Control</b-button>
+            <b-button variant="danger" disabled>Delete Requirement</b-button>
           </span>
           <span
             v-b-tooltip.hover
             class="d-inline-block"
-            title="Cannot save a control that is locked or under review."
+            title="Cannot save a requirement that is locked or under review."
           >
-            <b-button variant="success" disabled>Save Control</b-button>
+            <b-button variant="success" disabled>Save Requirement</b-button>
           </span>
         </template>
         <template v-else>
@@ -97,15 +97,15 @@
             v-b-modal.delete-rule-modal
             variant="danger"
           >
-            Delete Control
+            Delete Requirement
           </b-button>
 
           <!-- Save rule -->
           <CommentModal
-            title="Save Control"
-            message="Provide a comment that summarizes your changes to this control."
+            title="Save Requirement"
+            message="Provide a comment that summarizes your changes to this requirement."
             :require-non-empty="true"
-            button-text="Save Control"
+            button-text="Save Requirement"
             button-variant="success"
             :button-disabled="false"
             wrapper-class="d-inline-block"
@@ -116,7 +116,7 @@
         <!-- Comment -->
         <CommentModal
           title="Comment"
-          message="Submit general feedback on the control"
+          message="Submit general feedback on the requirement"
           :require-non-empty="true"
           button-text="Comment"
           button-variant="secondary"
@@ -199,18 +199,18 @@
 
         <b-modal
           id="delete-rule-modal"
-          title="Delete Control"
+          title="Delete Requirement"
           centered
           @ok="$root.$emit('delete:rule', rule.id)"
         >
           <p class="my-2">
-            Are you sure you want to delete this control?<br />This cannot be undone.
+            Are you sure you want to delete this requirement?<br />This cannot be undone.
           </p>
 
           <template #modal-footer="{ cancel, ok }">
             <!-- Emulate built in modal footer ok and cancel button actions -->
             <b-button @click="cancel()"> Cancel </b-button>
-            <b-button variant="danger" @click="ok()"> Permanently Delete Control </b-button>
+            <b-button variant="danger" @click="ok()"> Permanently Delete Requirement </b-button>
           </template>
         </b-modal>
         <b-modal
@@ -219,7 +219,7 @@
           centered
           @ok="$root.$emit('markDuplicate:rule', rule.id, satisfied_by_rule_id)"
         >
-          <p>Mark control as duplicate of:</p>
+          <p>Mark requirement as duplicate of:</p>
           <b-form-select
             v-model="satisfied_by_rule_id"
             :options="
@@ -244,7 +244,7 @@
           centered
           @ok="$root.$emit('unmarkDuplicate:rule', rule.id, satisfied_by_rule_id)"
         >
-          <p>Unmark control as duplicate of:</p>
+          <p>Unmark requirement as duplicate of:</p>
           <b-form-select
             v-model="satisfied_by_rule_id"
             :options="
@@ -330,11 +330,11 @@ export default {
         {
           value: "request_review",
           name: "Request Review",
-          description: "control will not be editable during the review process",
+          description: "requirement will not be editable during the review process",
           disabledTooltip: isUnderReview
-            ? "Control is already under review"
+            ? "Requirement is already under review"
             : this.rule.locked
-            ? "Control is currently locked"
+            ? "Requirement is currently locked"
             : null,
         },
 
@@ -344,70 +344,70 @@ export default {
         {
           value: "revoke_review_request",
           name: "Revoke Review Request",
-          description: "revoke your request for review - control will be editable again",
+          description: "revoke your request for review - requirement will be editable again",
           disabledTooltip: !(isAdmin || isRequestor)
             ? "Only an admin or the review requestor can revoke the current review request"
             : !isUnderReview
-            ? "Control is not currently under review"
+            ? "Requirement is not currently under review"
             : null,
         },
 
         // should only be able to request changes if
         // - current user is a reviewer or admin
-        // - control is currently under review
+        // - requirement is currently under review
         {
           value: "request_changes",
           name: "Request Changes",
-          description: "request changes on the control - control will be editable again",
+          description: "request changes on the requirement - requirement will be editable again",
           disabledTooltip: !(isAdmin || isReviewer)
             ? "Only an admin or reviewer can request changes"
             : !isUnderReview
-            ? "Control is not currently under review"
+            ? "Requirement is not currently under review"
             : null,
         },
 
         // should only be able to approve if
         // - current user is a reviewer or admin
-        // - control is currently under review
+        // - requirement is currently under review
         {
           value: "approve",
           name: "Approve",
-          description: "approve the control - control will become locked",
+          description: "approve the requirement - requirement will become locked",
           disabledTooltip: !(isAdmin || isReviewer)
             ? "Only an admin or reviewer can approve"
             : !isUnderReview
-            ? "Control is not currently under review"
+            ? "Requirement is not currently under review"
             : null,
         },
 
-        // should only be able to lock control if
+        // should only be able to lock requirement if
         // - current user is admin
-        // - control is not under review
-        // - control is not locked
+        // - requirement is not under review
+        // - requirement is not locked
         {
           value: "lock_control",
-          name: "Lock Control",
-          description: "skip the review process - control will be immediately locked",
+          name: "Lock Requirement",
+          description: "skip the review process - requirement will be immediately locked",
           disabledTooltip: !isAdmin
-            ? "Only an admin can directly lock a control"
+            ? "Only an admin can directly lock a requirement"
             : isUnderReview
-            ? "Cannot lock a control that is currently under review"
+            ? "Cannot lock a requirement that is currently under review"
             : this.rule.locked
-            ? "Cannot lock a control that is already locked"
+            ? "Cannot lock a requirement that is already locked"
             : null,
         },
 
-        // should only be able to unlock a control if
+        // should only be able to unlock a requirement if
         // - current user is admin
-        // - control is locked
+        // - requirement is locked
         {
           value: "unlock_control",
-          name: "Unlock Control",
-          description: "unlock the control - control will be editable again",
+          name: "Unlock Requirement",
+          description: "unlock the requirement - requirement will be editable again",
           disabledTooltip: !isAdmin
-            ? "Only an admin can unlock a control"
+            ? "Only an admin can unlock a requirement"
             : !this.rule.locked
-            ? "Cannot unlock a control that is not locked"
+            ? "Cannot unlock a requirement that is not locked"
             : null,
         },
       ];
diff --git a/app/javascript/components/rules/RuleNavigator.vue b/app/javascript/components/rules/RuleNavigator.vue
index e59f4046..345cd6f7 100644
--- a/app/javascript/components/rules/RuleNavigator.vue
+++ b/app/javascript/components/rules/RuleNavigator.vue
@@ -12,13 +12,13 @@
           ref="ruleSearch"
           type="text"
           class="form-control"
-          placeholder="Search controls..."
+          placeholder="Search requirements..."
           @input="searchUpdated($event.target.value)"
         />
       </div>
 
       <!-- Filter by rule status -->
-      <b-form-group class="mt-3" label="Filter by Control Status">
+      <b-form-group class="mt-3" label="Filter by Requirement Status">
         <b-form-checkbox
           id="acFilterChecked-filter"
           v-model="filters.acFilterChecked"
@@ -123,7 +123,8 @@
 
       <!-- Currently opened controls -->
       <p class="mt-0 mb-0">
-        <strong>Open Controls</strong>
+        <strong>Open Requirements</strong>
+        <!-- eslint-disable-next-line vue/no-useless-template-attributes -->
         <template v-if="openRuleIds.length > 0" href="#">
           <i
             class="text-primary mdi mdi-close clickable float-right"
@@ -135,7 +136,7 @@
         </template>
       </p>
       <div v-if="openRules.length === 0">
-        <em>No controls selected</em>
+        <em>No requirements selected</em>
       </div>
       <div v-else>
         <div
@@ -169,7 +170,7 @@
 
       <!-- All project controls -->
       <p class="mt-0 mb-0">
-        <strong>All Controls</strong>
+        <strong>All Requirements</strong>
         <template v-if="!readOnly">
           <i v-b-modal.create-rule-modal class="text-primary mdi mdi-plus clickable float-right" />
           <span v-b-modal.create-rule-modal class="text-primary float-right clickable">add </span>
@@ -178,7 +179,7 @@
 
       <!-- New rule modal -->
       <NewRuleModalForm
-        title="Create New Control"
+        title="Create New Requirement"
         :for-duplicate="false"
         id-prefix="create"
         @ruleSelected="ruleSelected($event)"
diff --git a/app/javascript/components/rules/RuleSatisfactions.vue b/app/javascript/components/rules/RuleSatisfactions.vue
index 576e5242..34655cc8 100644
--- a/app/javascript/components/rules/RuleSatisfactions.vue
+++ b/app/javascript/components/rules/RuleSatisfactions.vue
@@ -40,7 +40,7 @@
       >
         <p>
           Are you sure you want to unmark {{ formatRuleForDisplay(satisfies_rule) }} as a duplicate
-          of this control?
+          of this requirement?
         </p>
         <template #modal-footer="{ cancel, ok }">
           <!-- Emulate built in modal footer ok and cancel button actions -->
@@ -89,7 +89,7 @@
         @ok="$root.$emit('unmarkDuplicate:rule', rule.id, satisfied_by_rule.id)"
       >
         <p>
-          Are you sure you want to unmark this control as a duplicate of
+          Are you sure you want to unmark this requirement as a duplicate of
           {{ formatRuleForDisplay(satisfied_by_rule) }}
         </p>
         <template #modal-footer="{ cancel, ok }">
diff --git a/app/javascript/components/rules/Rules.vue b/app/javascript/components/rules/Rules.vue
index 40e5503f..14787b12 100644
--- a/app/javascript/components/rules/Rules.vue
+++ b/app/javascript/components/rules/Rules.vue
@@ -2,7 +2,7 @@
   <div>
     <b-breadcrumb :items="breadcrumbs" />
 
-    <h1>{{ component.name }} - Controls</h1>
+    <h1>{{ component.name }} - Requirements</h1>
 
     <RulesCodeEditorView
       :project="project"
@@ -84,7 +84,7 @@ export default {
           href: "/components/" + this.component.id,
         },
         {
-          text: "Controls",
+          text: "Requirements",
           active: true,
         },
       ];
diff --git a/app/javascript/components/rules/RulesCodeEditorView.vue b/app/javascript/components/rules/RulesCodeEditorView.vue
index 055f99aa..ce84c0cb 100644
--- a/app/javascript/components/rules/RulesCodeEditorView.vue
+++ b/app/javascript/components/rules/RulesCodeEditorView.vue
@@ -68,7 +68,7 @@
     <template v-else>
       <div class="col-10">
         <p class="text-center">
-          No control currently selected. Select a control on the left to view or edit.
+          No requirement currently selected. Select a requirement on the left to view or edit.
         </p>
       </div>
     </template>
diff --git a/app/javascript/components/rules/RulesReadOnlyView.vue b/app/javascript/components/rules/RulesReadOnlyView.vue
index d1d8894b..cd9ca832 100644
--- a/app/javascript/components/rules/RulesReadOnlyView.vue
+++ b/app/javascript/components/rules/RulesReadOnlyView.vue
@@ -39,7 +39,7 @@
     <template v-else>
       <div class="col-9">
         <p class="text-center">
-          No control currently selected. Select a control on the left to view.
+          No requirement currently selected. Select a requirement on the left to view.
         </p>
       </div>
     </template>
diff --git a/app/javascript/components/rules/forms/AdvancedRuleForm.vue b/app/javascript/components/rules/forms/AdvancedRuleForm.vue
index 157cf0c7..41850c74 100644
--- a/app/javascript/components/rules/forms/AdvancedRuleForm.vue
+++ b/app/javascript/components/rules/forms/AdvancedRuleForm.vue
@@ -151,7 +151,7 @@
     <div v-if="rule.status != 'Applicable - Configurable'">
       <hr />
       <p>
-        <small>Some fields are hidden due to the control's status.</small>
+        <small>Some fields are hidden due to the requirement's status.</small>
       </p>
     </div>
   </div>
@@ -204,7 +204,7 @@ export default {
     disabled: function () {
       return this.readOnly || this.rule.locked || this.rule.review_requestor_id ? true : false;
     },
-    // Still allow additional questions to be edited except when the control is actually
+    // Still allow additional questions to be edited except when the requirement is actually
     // locked, or if a review is requested or this is a read only view.
     forceEnableAdditionalQuestions: function () {
       return !this.readOnly && !this.rule.locked && !this.rule.review_requestor_id;
diff --git a/app/javascript/components/rules/forms/BasicRuleForm.vue b/app/javascript/components/rules/forms/BasicRuleForm.vue
index 00fc7809..64d34891 100644
--- a/app/javascript/components/rules/forms/BasicRuleForm.vue
+++ b/app/javascript/components/rules/forms/BasicRuleForm.vue
@@ -24,7 +24,7 @@
     <div v-if="rule.status != 'Applicable - Configurable'">
       <hr />
       <p>
-        <small>Some fields are hidden due to the control's status.</small>
+        <small>Some fields are hidden due to the requirement's status.</small>
       </p>
     </div>
   </div>
@@ -71,7 +71,7 @@ export default {
         ? true
         : false;
     },
-    // Still allow additional questions to be edited except when the control is actually
+    // Still allow additional questions to be edited except when the requirement is actually
     // locked, or if a review is requested or this is a read only view.
     forceEnableAdditionalQuestions: function () {
       return !this.readOnly && !this.rule.locked && !this.rule.review_requestor_id;
diff --git a/app/javascript/components/rules/forms/DisaRuleDescriptionForm.vue b/app/javascript/components/rules/forms/DisaRuleDescriptionForm.vue
index d724ad2e..3123674c 100644
--- a/app/javascript/components/rules/forms/DisaRuleDescriptionForm.vue
+++ b/app/javascript/components/rules/forms/DisaRuleDescriptionForm.vue
@@ -566,9 +566,11 @@ export default {
     tooltips: function () {
       return {
         documentable: null,
-        vuln_discussion: "Discuss, in detail, the rationale for this control's vulnerability",
-        false_positives: "List any likely false-positives associated with evaluating this control",
-        false_negatives: "List any likely false-negatives associated with evaluating this control",
+        vuln_discussion: "Discuss, in detail, the rationale for this requirement's vulnerability",
+        false_positives:
+          "List any likely false-positives associated with evaluating this requirement",
+        false_negatives:
+          "List any likely false-negatives associated with evaluating this requirement",
         mitigations: [
           "Not Yet Determined",
           "Applicable - Configurable",
@@ -583,7 +585,7 @@ export default {
             : null,
         severity_override_guidance: null,
         potential_impacts:
-          "List the potential operational impacts on a system when applying fix discussed in this control",
+          "List the potential operational impacts on a system when applying fix discussed in this requirement",
         third_party_tools: null,
         mitigation_control: null,
         responsibility: null,
diff --git a/app/javascript/components/rules/forms/NewRuleModalForm.vue b/app/javascript/components/rules/forms/NewRuleModalForm.vue
index f940d10a..486e85d6 100644
--- a/app/javascript/components/rules/forms/NewRuleModalForm.vue
+++ b/app/javascript/components/rules/forms/NewRuleModalForm.vue
@@ -2,9 +2,9 @@
   <div>
     <b-modal :id="`${idPrefix}-rule-modal`" ref="modal" :title="title" centered @ok="handleSubmit">
       <form ref="form" method="post">
-        <!-- Hide the rule_id (SV-#) input when duplicating the control and show a confirmation -->
-        <div v-if="forDuplicate">Clone control {{ selectedRuleText }}?</div>
-        <div v-else>Create a new control in this project?</div>
+        <!-- Hide the rule_id (SV-#) input when duplicating the requirement and show a confirmation -->
+        <div v-if="forDuplicate">Clone requirement {{ selectedRuleText }}?</div>
+        <div v-else>Create a new requirement in this project?</div>
       </form>
     </b-modal>
   </div>
diff --git a/app/javascript/components/rules/forms/RuleForm.vue b/app/javascript/components/rules/forms/RuleForm.vue
index d5aa6bb2..246cc39f 100644
--- a/app/javascript/components/rules/forms/RuleForm.vue
+++ b/app/javascript/components/rules/forms/RuleForm.vue
@@ -546,21 +546,21 @@ export default {
         )
           ? null
           : "Explain the rationale behind selecting one of the above statuses",
-        title: "Describe the vulnerability for this control",
+        title: "Describe the vulnerability for this requirement",
         version: null,
         rule_severity:
           "Unknown: severity not defined, Info: rule is informational only, CAT III (Low): not a serious problem, CAT II (Medium): fairly serious problem, CAT I (High): a grave or critical problem",
         rule_weight: null,
         artifact_description:
           this.rule.status === "Not Applicable"
-            ? "Provide evidence that the control is not applicable to the system - code files, documentation, screenshots, etc."
+            ? "Provide evidence that the requirement is not applicable to the system - code files, documentation, screenshots, etc."
             : [
                 "Not Yet Determined",
                 "Applicable - Configurable",
                 "Applicable - Does Not Meet",
               ].includes(this.rule.status)
             ? null
-            : "Provide evidence that the control is inherently met by the system - code files, documentation, screenshots, etc.",
+            : "Provide evidence that the requirement is inherently met by the system - code files, documentation, screenshots, etc.",
         fix_id: null,
         fixtext_fixref: null,
         fixtext: