diff --git a/src/components/ChallengeEditor/ChallengeName-Field/index.js b/src/components/ChallengeEditor/ChallengeName-Field/index.js
index 8b12d7d9..4b4feebb 100644
--- a/src/components/ChallengeEditor/ChallengeName-Field/index.js
+++ b/src/components/ChallengeEditor/ChallengeName-Field/index.js
@@ -8,16 +8,16 @@ const ChallengeNameField = ({ challenge, onUpdateInput }) => {
     <>
       <div className={styles.row}>
         <div className={cn(styles.field, styles.col1)}>
-          <label htmlFor='challengeName'>Challenge Name <span>*</span> :</label>
+          <label htmlFor='challengeName'>Work Name <span>*</span> :</label>
         </div>
         <div className={cn(styles.field, styles.col2)}>
-          <input className={styles.challengeName} id='name' name='name' type='text' placeholder='Challenge Name' value={challenge.name} maxLength='200' required onChange={onUpdateInput} />
+          <input className={styles.challengeName} id='name' name='name' type='text' placeholder='Work Name' value={challenge.name} maxLength='200' required onChange={onUpdateInput} />
         </div>
       </div>
       { challenge.submitTriggered && !challenge.name && <div className={styles.row}>
         <div className={cn(styles.field, styles.col1)} />
         <div className={cn(styles.field, styles.col2, styles.error)}>
-          Name is required field
+          Work Name is required field
         </div>
       </div> }
     </>
diff --git a/src/components/ChallengeEditor/ReviewType-Field/index.js b/src/components/ChallengeEditor/ReviewType-Field/index.js
index f0e33057..a5b8f323 100644
--- a/src/components/ChallengeEditor/ReviewType-Field/index.js
+++ b/src/components/ChallengeEditor/ReviewType-Field/index.js
@@ -12,7 +12,7 @@ const ReviewTypeField = ({ reviewers, challenge, onUpdateOthers, onUpdateSelect
     <div>
       <div className={styles.row}>
         <div className={cn(styles.field, styles.col1)}>
-          <label htmlFor='reviewType'>Review Type <span>*</span> :</label>
+          <label htmlFor='reviewType'>Reviewer <span>*</span> :</label>
         </div>
         <div className={cn(styles.field, styles.col2)}>
           <div className={styles.subGroup}>
diff --git a/src/components/ChallengeEditor/Track-Field/index.js b/src/components/ChallengeEditor/Track-Field/index.js
index 99327138..34c16d37 100644
--- a/src/components/ChallengeEditor/Track-Field/index.js
+++ b/src/components/ChallengeEditor/Track-Field/index.js
@@ -18,7 +18,7 @@ const TrackField = ({ challenge, onUpdateOthers, disabled }) => {
     <>
       <div className={styles.row}>
         <div className={cn(styles.field, styles.col1)}>
-          <label htmlFor='track'>Track <span>*</span> :</label>
+          <label htmlFor='track'>Work Type <span>*</span> :</label>
         </div>
         <div className={cn(styles.field, styles.col2)}>
           {
@@ -29,7 +29,7 @@ const TrackField = ({ challenge, onUpdateOthers, disabled }) => {
       { challenge.submitTriggered && !challenge.track && <div className={styles.row}>
         <div className={cn(styles.field, styles.col1)} />
         <div className={cn(styles.field, styles.col2, styles.error)}>
-          Track is required field
+          Work Type is required field
         </div>
       </div> }
     </>
diff --git a/src/components/ChallengeEditor/Type-Field/index.js b/src/components/ChallengeEditor/Type-Field/index.js
index 5e982de0..87ca0653 100644
--- a/src/components/ChallengeEditor/Type-Field/index.js
+++ b/src/components/ChallengeEditor/Type-Field/index.js
@@ -10,14 +10,14 @@ const TypeField = ({ types, onUpdateSelect, challenge, disabled }) => {
     <>
       <div className={styles.row}>
         <div className={cn(styles.field, styles.col1)}>
-          <label htmlFor='type'>Type <span>*</span> :</label>
+          <label htmlFor='type'>Work Format <span>*</span> :</label>
         </div>
         <div className={cn(styles.field, styles.col2, { [styles.disabled]: disabled })}>
           <Select
             name='track'
             options={_.filter(types, t => t.isActive && t.track === challenge.track)}
             value={challenge.typeId}
-            placeholder='Track Type'
+            placeholder='Work Format'
             labelKey='name'
             valueKey='id'
             clearable={false}
@@ -29,7 +29,7 @@ const TypeField = ({ types, onUpdateSelect, challenge, disabled }) => {
       { challenge.submitTriggered && !challenge.typeId && <div className={styles.row}>
         <div className={cn(styles.field, styles.col1)} />
         <div className={cn(styles.field, styles.col2, styles.error)}>
-          Type is required field
+          Work Format is required field
         </div>
       </div> }
     </>
diff --git a/src/components/ChallengeEditor/index.js b/src/components/ChallengeEditor/index.js
index f5738b16..0f387d84 100644
--- a/src/components/ChallengeEditor/index.js
+++ b/src/components/ChallengeEditor/index.js
@@ -55,10 +55,10 @@ const theme = {
 
 const getTitle = (isNew) => {
   if (isNew) {
-    return 'Create New Challenge'
+    return 'Create New Work'
   }
 
-  return 'Edit Challenge'
+  return 'Set-Up Work'
 }
 
 class ChallengeEditor extends Component {
@@ -996,7 +996,7 @@ class ChallengeEditor extends Component {
         isNew && (
           <div className={styles.buttonContainer}>
             <div className={styles.button}>
-              <OutlineButton text={'Create Challenge'} type={'success'} submit />
+              <OutlineButton text={'Continue Set-Up'} type={'success'} submit />
             </div>
           </div>
         )
diff --git a/src/components/Sidebar/index.js b/src/components/Sidebar/index.js
index 9869e77f..b393bbd9 100644
--- a/src/components/Sidebar/index.js
+++ b/src/components/Sidebar/index.js
@@ -14,7 +14,7 @@ const Sidebar = ({
   return (
     <div className={styles.sidebar}>
       <img src={TopcoderLogo} className={styles.logo} />
-      <div className={styles.title}>Challenge Editor</div>
+      <div className={styles.title}>Work Manager</div>
       <Link to='/'>
         <div className={cn(styles.homeLink, { [styles.active]: !projectId })} onClick={resetSidebarActiveParams}>
           Active challenges