diff --git a/app/javascript/react/screens/App/Overview/Overview.scss b/app/javascript/react/screens/App/Overview/Overview.scss
index 139324b687..8a5b2ac195 100644
--- a/app/javascript/react/screens/App/Overview/Overview.scss
+++ b/app/javascript/react/screens/App/Overview/Overview.scss
@@ -6,7 +6,6 @@
 @import 'components/ModalWizard/ModalWizard.scss';
 @import 'components/AggregateCards/AggregateCards.scss';
 @import 'components/OverviewEmptyState/OverviewEmptyState.scss';
-@import 'components/EditPlanNameModal/EditPlanNameModal.scss';
 
 hr {
   margin-top: 10px;
diff --git a/app/javascript/react/screens/App/Overview/components/EditPlanNameModal/EditPlanNameActions.js b/app/javascript/react/screens/App/Overview/components/EditPlanNameModal/EditPlanNameActions.js
index c06eaa54c6..48f7c42803 100644
--- a/app/javascript/react/screens/App/Overview/components/EditPlanNameModal/EditPlanNameActions.js
+++ b/app/javascript/react/screens/App/Overview/components/EditPlanNameModal/EditPlanNameActions.js
@@ -1,32 +1,15 @@
-import {
-  V2V_EDIT_PLAN_TITLE_SHOW_ALERT,
-  V2V_EDIT_PLAN_TITLE_HIDE_ALERT,
-  V2V_POST_EDIT_PLAN_TITLE
-} from './EditPlanNameConstants';
+import { V2V_POST_EDIT_PLAN_NAME } from './EditPlanNameConstants';
 import API from '../../../../../../common/API';
 
 export { fetchTransformationPlansAction } from '../../OverviewActions';
 
-export const showAlertAction = (alertText, alertType = 'error') => dispatch => {
-  dispatch({
-    type: V2V_EDIT_PLAN_TITLE_SHOW_ALERT,
-    payload: { alertText, alertType }
-  });
-};
-
-export const hideAlertAction = () => dispatch => {
-  dispatch({
-    type: V2V_EDIT_PLAN_TITLE_HIDE_ALERT
-  });
-};
-
 const _editMigrationPlansActionCreator = (url, planId, migrationPlans) => dispatch => {
   const body = {
     action: 'edit',
     resource: { ...migrationPlans }
   };
   return dispatch({
-    type: V2V_POST_EDIT_PLAN_TITLE,
+    type: V2V_POST_EDIT_PLAN_NAME,
     payload: API.post(`${url}/${planId}`, body)
   });
 };
diff --git a/app/javascript/react/screens/App/Overview/components/EditPlanNameModal/EditPlanNameConstants.js b/app/javascript/react/screens/App/Overview/components/EditPlanNameModal/EditPlanNameConstants.js
index 9352f1ab4a..76fe17eb92 100644
--- a/app/javascript/react/screens/App/Overview/components/EditPlanNameModal/EditPlanNameConstants.js
+++ b/app/javascript/react/screens/App/Overview/components/EditPlanNameModal/EditPlanNameConstants.js
@@ -1,3 +1 @@
-export const V2V_EDIT_PLAN_TITLE_SHOW_ALERT = 'V2V_EDIT_PLAN_TITLE_SHOW_ALERT';
-export const V2V_EDIT_PLAN_TITLE_HIDE_ALERT = 'V2V_EDIT_PLAN_TITLE_HIDE_ALERT';
-export const V2V_POST_EDIT_PLAN_TITLE = 'V2V_POST_EDIT_PLAN_TITLE';
+export const V2V_POST_EDIT_PLAN_NAME = 'V2V_POST_EDIT_PLAN_NAME';
diff --git a/app/javascript/react/screens/App/Overview/components/EditPlanNameModal/EditPlanNameModal.js b/app/javascript/react/screens/App/Overview/components/EditPlanNameModal/EditPlanNameModal.js
index 200d09985f..cb4536ee89 100644
--- a/app/javascript/react/screens/App/Overview/components/EditPlanNameModal/EditPlanNameModal.js
+++ b/app/javascript/react/screens/App/Overview/components/EditPlanNameModal/EditPlanNameModal.js
@@ -1,9 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import cx from 'classnames';
 import { Field, reduxForm } from 'redux-form';
 import { required } from 'redux-form-validators';
-import { Modal, Button, Form, Alert, Spinner, noop } from 'patternfly-react';
+import { Modal, Button, Form, Spinner, noop } from 'patternfly-react';
 import { FormField } from '../../../common/forms/FormField';
 import { validation } from '../../../../../../common/constants';
 import { asyncValidate, onChange } from '../../screens/PlanWizard/components/PlanWizardGeneralStep/helpers';
@@ -38,20 +37,9 @@ class EditPlanNameModal extends React.Component {
   };
 
   render() {
-    const {
-      editPlanNameModalVisible,
-      hideEditPlanNameModalAction,
-      editPlanNameModal,
-      alertType,
-      alertText,
-      hideAlertAction,
-      savingPlan
-    } = this.props;
+    const { editPlanNameModalVisible, hideEditPlanNameModalAction, editPlanNameModal, savingPlan } = this.props;
 
     const disableConfirmButton = savingPlan || !!editPlanNameModal.syncErrors || !!editPlanNameModal.asyncErrors;
-    const alertClasses = cx('modal-alert--alert', {
-      'is-visible': alertText
-    });
 
     const formBody = (
       <Form horizontal>
@@ -95,14 +83,7 @@ class EditPlanNameModal extends React.Component {
           <Modal.CloseButton onClick={hideEditPlanNameModalAction} />
           <Modal.Title>{__('Edit Migration Plan')}</Modal.Title>
         </Modal.Header>
-        <Modal.Body>
-          {!savingPlan ? formBody : spinner}
-          <div className="modal-alert">
-            <Alert className={alertClasses} type={alertType} onDismiss={hideAlertAction}>
-              {alertText}
-            </Alert>
-          </div>
-        </Modal.Body>
+        <Modal.Body>{!savingPlan ? formBody : spinner}</Modal.Body>
         <Modal.Footer>
           <Button bsStyle="default" className="btn-cancel" onClick={hideEditPlanNameModalAction}>
             {__('Cancel')}
@@ -120,9 +101,6 @@ EditPlanNameModal.propTypes = {
   editPlanNameModalVisible: PropTypes.bool,
   hideEditPlanNameModalAction: PropTypes.func,
   editPlanNameModal: PropTypes.object,
-  alertType: PropTypes.string,
-  alertText: PropTypes.string,
-  hideAlertAction: PropTypes.func,
   editingPlan: PropTypes.object,
   editMigrationPlansAction: PropTypes.func,
   editMigrationPlansUrl: PropTypes.string,
@@ -136,9 +114,6 @@ EditPlanNameModal.defaultProps = {
   editPlanNameModalVisible: false,
   hideEditPlanNameModalAction: noop,
   editPlanNameModal: {},
-  alertType: 'error',
-  alertText: '',
-  hideAlertAction: noop,
   editMigrationPlansUrl: '/api/service_templates'
 };
 
diff --git a/app/javascript/react/screens/App/Overview/components/EditPlanNameModal/EditPlanNameModal.scss b/app/javascript/react/screens/App/Overview/components/EditPlanNameModal/EditPlanNameModal.scss
deleted file mode 100644
index 9badd5d231..0000000000
--- a/app/javascript/react/screens/App/Overview/components/EditPlanNameModal/EditPlanNameModal.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-
-.modal-alert {
-  position: absolute;
-  height: 44px;
-  width: 100%;
-  overflow: hidden;
-}
-
-.modal-alert .modal-alert--alert {
-  position: absolute;
-  bottom: 0px;
-  width: calc(100% - 40px);
-  left: -1000px;
-  transition: left 0.2s ease-in;
-  z-index: 1;
-  margin-bottom: 0;
-  margin-left: 20px;
-}
-
-.modal-alert .modal-alert--alert.is-visible {
-  left: 1px;
-}
diff --git a/app/javascript/react/screens/App/Overview/components/EditPlanNameModal/EditPlanNameReducer.js b/app/javascript/react/screens/App/Overview/components/EditPlanNameModal/EditPlanNameReducer.js
index c26d94b65b..7cac68e9c0 100644
--- a/app/javascript/react/screens/App/Overview/components/EditPlanNameModal/EditPlanNameReducer.js
+++ b/app/javascript/react/screens/App/Overview/components/EditPlanNameModal/EditPlanNameReducer.js
@@ -2,7 +2,7 @@ import Immutable from 'seamless-immutable';
 import {
   V2V_EDIT_PLAN_TITLE_SHOW_ALERT,
   V2V_EDIT_PLAN_TITLE_HIDE_ALERT,
-  V2V_POST_EDIT_PLAN_TITLE
+  V2V_POST_EDIT_PLAN_NAME
 } from './EditPlanNameConstants';
 
 const initialState = Immutable({
@@ -18,17 +18,17 @@ export default (state = initialState, action) => {
       return Immutable.merge(state, action.payload);
     case V2V_EDIT_PLAN_TITLE_HIDE_ALERT:
       return state.set('alertText', '');
-    case `${V2V_POST_EDIT_PLAN_TITLE}_PENDING`:
+    case `${V2V_POST_EDIT_PLAN_NAME}_PENDING`:
       return state
         .set('savingPlan', true)
         .set('savingPlanRejected', false)
         .set('savingPlanError', null);
-    case `${V2V_POST_EDIT_PLAN_TITLE}_FULFILLED`:
+    case `${V2V_POST_EDIT_PLAN_NAME}_FULFILLED`:
       return state
         .set('savingPlan', false)
         .set('savingPlanRejected', false)
         .set('savingPlanError', null);
-    case `${V2V_POST_EDIT_PLAN_TITLE}_REJECTED`:
+    case `${V2V_POST_EDIT_PLAN_NAME}_REJECTED`:
       return state
         .set('savingPlan', false)
         .set('savingPlanRejected', true)
diff --git a/app/javascript/react/screens/App/Overview/screens/MappingWizard/components/MappingWizardGeneralStep/helpers.js b/app/javascript/react/screens/App/Overview/screens/MappingWizard/components/MappingWizardGeneralStep/helpers.js
index 343ec642ab..955ffbe498 100644
--- a/app/javascript/react/screens/App/Overview/screens/MappingWizard/components/MappingWizardGeneralStep/helpers.js
+++ b/app/javascript/react/screens/App/Overview/screens/MappingWizard/components/MappingWizardGeneralStep/helpers.js
@@ -13,7 +13,7 @@ export const asyncValidate = (values, dispatch, props) =>
 
     if (duplicateName && !duplicateIsEditingMappingName) {
       props.showAlertAction(sprintf(__('Infrastructure mapping %s already exists'), newTransformationName));
-      const error = { name: __('Please enter a unique name') };
+      const error = { name: __('Mapping name already exists. Enter a unique name.') };
       reject(error);
     } else {
       resolve();
diff --git a/app/javascript/react/screens/App/Overview/screens/PlanWizard/components/PlanWizardGeneralStep/helpers.js b/app/javascript/react/screens/App/Overview/screens/PlanWizard/components/PlanWizardGeneralStep/helpers.js
index 1ede6b26ea..c039d708de 100644
--- a/app/javascript/react/screens/App/Overview/screens/PlanWizard/components/PlanWizardGeneralStep/helpers.js
+++ b/app/javascript/react/screens/App/Overview/screens/PlanWizard/components/PlanWizardGeneralStep/helpers.js
@@ -16,8 +16,8 @@ export const asyncValidate = (values, dispatch, props) =>
     const duplicateIsEditingPlanName = editingPlan && duplicateName === editingPlan.name;
 
     if (duplicateName && !duplicateIsEditingPlanName) {
-      props.showAlertAction(sprintf(__('Name %s already exists'), newPlanName));
-      const error = { name: 'Please enter a unique name' };
+      if (props.showAlertAction) props.showAlertAction(sprintf(__('Name %s already exists'), newPlanName));
+      const error = { name: 'Plan name already exists. Enter a unique name.' };
       reject(error);
     } else {
       resolve();
@@ -26,6 +26,6 @@ export const asyncValidate = (values, dispatch, props) =>
 
 export const onChange = (values, dispatch, props) => {
   if (props.valid) {
-    props.hideAlertAction();
+    if (props.hideAlertAction) props.hideAlertAction();
   }
 };