diff --git a/src/shared/actions/terms.js b/src/shared/actions/terms.js
index efa1008681..dd06238e0f 100644
--- a/src/shared/actions/terms.js
+++ b/src/shared/actions/terms.js
@@ -22,7 +22,7 @@ const { getService } = services.terms;
  * @return {Promise}
  */
 function getTermsDone(entity, tokens, mockAgreed) {
-  const service = getService(tokens.tokenV2);
+  const service = getService(tokens.tokenV3);
   let termsPromise;
 
   // if mockAgreed=true passed, then we create an array of 10 true which we pass to the
@@ -68,11 +68,11 @@ function getTermDetailsInit(termId) {
  * Payload creator for TERMS/GET_TERM_DETAILS_DONE action,
  * which fetch details of the specified term.
  * @param {Number|String} termId
- * @param {String} tokenV2
+ * @param {String} tokenV3
  * @return {Promise}
  */
-function getTermDetailsDone(termId, tokenV2) {
-  const service = getService(tokenV2);
+function getTermDetailsDone(termId, tokenV3) {
+  const service = getService(tokenV3);
   return service.getTermDetails(termId).then(details => ({ termId, details }));
 }
 
@@ -90,11 +90,11 @@ function getDocuSignUrlInit(templateId) {
  * which generate the url of DoduSign term
  * @param  {Number|String} templateId id of document template to sign
  * @param  {String} returnUrl  callback url after finishing singing
- * @param  {String} tokenV2    auth token
+ * @param  {String} tokenV3    auth token
  * @return {Promise}           promise of request result
  */
-function getDocuSignUrlDone(templateId, returnUrl, tokenV2) {
-  const service = getService(tokenV2);
+function getDocuSignUrlDone(templateId, returnUrl, tokenV3) {
+  const service = getService(tokenV3);
   return service.getDocuSignUrl(templateId, returnUrl)
     .then(resp => ({ templateId, docuSignUrl: resp.recipientViewUrl }));
 }
@@ -111,11 +111,11 @@ function agreeTermInit(termId) {
 /**
  * Payload creator for TERMS/AGREE_TERM_DONE
  * @param  {Number|String} termId id of term
- * @param  {String} tokenV2    auth token
+ * @param  {String} tokenV3    auth token
  * @return {Promise}           promise of request result
  */
-function agreeTermDone(termId, tokenV2) {
-  const service = getService(tokenV2);
+function agreeTermDone(termId, tokenV3) {
+  const service = getService(tokenV3);
   return service.agreeTerm(termId).then(resp => ({ termId, success: resp.success }));
 }
 
diff --git a/src/shared/components/ReviewOpportunityDetailsPage/Sidebar/index.jsx b/src/shared/components/ReviewOpportunityDetailsPage/Sidebar/index.jsx
index 879576882b..c25ae1f74e 100644
--- a/src/shared/components/ReviewOpportunityDetailsPage/Sidebar/index.jsx
+++ b/src/shared/components/ReviewOpportunityDetailsPage/Sidebar/index.jsx
@@ -28,8 +28,8 @@ const Sidebar = ({ terms }) => (
     </h4>
     {
       terms.map(term => (
-        <p key={term.termsOfUseId}>
-          <a href={`https://www.topcoder.com/challenges/terms/detail/${term.termsOfUseId}`} target="_blank" rel="noopener noreferrer">
+        <p key={term.id}>
+          <a href={`https://www.topcoder.com/challenges/terms/detail/${term.id}`} target="_blank" rel="noopener noreferrer">
             {term.title}
           </a>
         </p>
diff --git a/src/shared/components/Terms/index.jsx b/src/shared/components/Terms/index.jsx
index 8f3a82621d..5e04c3a51f 100644
--- a/src/shared/components/Terms/index.jsx
+++ b/src/shared/components/Terms/index.jsx
@@ -62,7 +62,7 @@ export default class Terms extends React.Component {
   componentDidMount() {
     const { loadDetails, selectedTerm } = this.props;
     if (selectedTerm) {
-      loadDetails(selectedTerm.termsOfUseId);
+      loadDetails(selectedTerm.id);
     }
     window.addEventListener('message', this.messageHandler, false);
     window.addEventListener('resize', this.resizeHandler, false);
@@ -75,8 +75,8 @@ export default class Terms extends React.Component {
       checkStatus, canRegister, onCancel, register,
     } = this.props;
     if (nextProps.selectedTerm && !_.isEqual(selectedTerm, nextProps.selectedTerm)
-      && nextProps.loadingTermId !== _.toString(nextProps.selectedTerm.termsOfUseId)) {
-      loadDetails(nextProps.selectedTerm.termsOfUseId);
+      && nextProps.loadingTermId !== _.toString(nextProps.selectedTerm.id)) {
+      loadDetails(nextProps.selectedTerm.id);
     }
     if (!_.every(terms, 'agreed') && _.every(nextProps.terms, 'agreed') && !nextProps.checkingStatus) {
       checkStatus();
@@ -113,7 +113,7 @@ export default class Terms extends React.Component {
     const { onCancel, selectedTerm, signDocu } = this.props;
     if (event.data.type === 'DocuSign') {
       if (event.data.event === 'signing_complete') {
-        signDocu(selectedTerm.termsOfUseId);
+        signDocu(selectedTerm.id);
       } else {
         onCancel();
       }
@@ -159,7 +159,7 @@ export default class Terms extends React.Component {
     };
 
     return (
-      <div key={(selectedTerm || {}).termsOfUseId}>
+      <div key={(selectedTerm || {}).id}>
         <FocusTrap>
           <Modal
             onCancel={onCancel}
@@ -199,7 +199,7 @@ export default class Terms extends React.Component {
                           {
                             terms.map((t, index) => (
                               <div
-                                key={t.termsOfUseId}
+                                key={t.id}
                                 /* TODO: No need to use so much style names and
                                  * related logic here. It can be simplified:
                                  * "view-only" style should move to the root
@@ -259,11 +259,11 @@ export default class Terms extends React.Component {
                         )
                       }
                       {
-                        loadingTermId === _.toString(selectedTerm.termsOfUseId)
+                        loadingTermId === _.toString(selectedTerm.id)
                         && <LoadingIndicator />
                       }
                       {
-                        loadingTermId !== _.toString(selectedTerm.termsOfUseId) && details
+                        loadingTermId !== _.toString(selectedTerm.id) && details
                         && (
                         <TermDetails
                           details={details}
@@ -282,7 +282,7 @@ export default class Terms extends React.Component {
                 {
                   !isLoadingTerms && !checkingStatus && selectedTerm && details
                     && !viewOnly
-                    && loadingTermId !== _.toString(selectedTerm.termsOfUseId)
+                    && loadingTermId !== _.toString(selectedTerm.id)
                     && details.agreeabilityType === 'Electronically-agreeable' ? (
                       <div styleName="buttons">
                         {
@@ -303,9 +303,9 @@ export default class Terms extends React.Component {
                             : (
                               <div>
                                 <PrimaryButton
-                                  disabled={agreeingTerm === details.termsOfUseId}
+                                  disabled={agreeingTerm === details.id}
                                   onClick={() => {
-                                    agreeTerm(details.termsOfUseId);
+                                    agreeTerm(details.id);
                                     if (this.vScrollArea) {
                                       this.vScrollArea.scrollTop = 0;
                                     }
diff --git a/src/shared/components/challenge-detail/Specification/SideBar/index.jsx b/src/shared/components/challenge-detail/Specification/SideBar/index.jsx
index feafb36a81..1c1ed3841e 100644
--- a/src/shared/components/challenge-detail/Specification/SideBar/index.jsx
+++ b/src/shared/components/challenge-detail/Specification/SideBar/index.jsx
@@ -317,9 +317,9 @@ export default function SideBar({
             <div styleName="link-like-paragraph">
               {
                 terms.map(t => (
-                  <div styleName="term" key={t.termsOfUseId}>
+                  <div styleName="term" key={t.id}>
                     <Link
-                      to={`${challengesUrl}/terms/detail/${t.termsOfUseId}`}
+                      to={`${challengesUrl}/terms/detail/${t.id}`}
                     >
                       {t.title}
                     </Link>
diff --git a/src/shared/containers/Terms.jsx b/src/shared/containers/Terms.jsx
index 5a6c1f7f28..195536d0a4 100644
--- a/src/shared/containers/Terms.jsx
+++ b/src/shared/containers/Terms.jsx
@@ -211,15 +211,15 @@ function mapDispatchToProps(dispatch) {
     },
     loadTermDetails: (tokens, termId) => {
       dispatch(actions.terms.getTermDetailsInit(termId));
-      dispatch(actions.terms.getTermDetailsDone(termId, tokens.tokenV2));
+      dispatch(actions.terms.getTermDetailsDone(termId, tokens.tokenV3));
     },
     getDocuSignUrl: (tokens, templateId, returnUrl) => {
       dispatch(actions.terms.getDocuSignUrlInit(templateId));
-      dispatch(actions.terms.getDocuSignUrlDone(templateId, returnUrl, tokens.tokenV2));
+      dispatch(actions.terms.getDocuSignUrlDone(templateId, returnUrl, tokens.tokenV3));
     },
     agreeTerm: (tokens, termId) => {
       dispatch(actions.terms.agreeTermInit(termId));
-      dispatch(actions.terms.agreeTermDone(termId, tokens.tokenV2));
+      dispatch(actions.terms.agreeTermDone(termId, tokens.tokenV3));
     },
     signDocu: (id) => {
       dispatch(termsActions.terms.signDocu(id));
diff --git a/src/shared/containers/challenge-detail/index.jsx b/src/shared/containers/challenge-detail/index.jsx
index f190dda52c..32bd9b7139 100644
--- a/src/shared/containers/challenge-detail/index.jsx
+++ b/src/shared/containers/challenge-detail/index.jsx
@@ -583,7 +583,7 @@ class ChallengeDetailPageContainer extends React.Component {
         {legacyId && (
           <Terms
             defaultTitle="Challenge Prerequisites"
-            entity={{ type: 'challenge', id: legacyId.toString() }}
+            entity={{ type: 'challenge', id: challengeId.toString(), terms: challenge.terms }}
             instanceId={this.instanceId}
             description="You are seeing these Terms & Conditions because you have registered to a challenge and you have to respect the terms below in order to be able to submit."
             register={() => {
diff --git a/src/shared/containers/terms-detail/index.jsx b/src/shared/containers/terms-detail/index.jsx
index 28539fc95e..0f79a1a904 100644
--- a/src/shared/containers/terms-detail/index.jsx
+++ b/src/shared/containers/terms-detail/index.jsx
@@ -216,15 +216,15 @@ function mapDispatchToProps(dispatch) {
   return {
     loadTermDetails: (tokens, termId) => {
       dispatch(actions.terms.getTermDetailsInit(termId));
-      dispatch(actions.terms.getTermDetailsDone(termId, tokens.tokenV2, false));
+      dispatch(actions.terms.getTermDetailsDone(termId, tokens.tokenV3, false));
     },
     getDocuSignUrl: (tokens, templateId, returnUrl) => {
       dispatch(actions.terms.getDocuSignUrlInit(templateId));
-      dispatch(actions.terms.getDocuSignUrlDone(templateId, returnUrl, tokens.tokenV2));
+      dispatch(actions.terms.getDocuSignUrlDone(templateId, returnUrl, tokens.tokenV3));
     },
     agreeTerms: (tokens, termId) => {
       dispatch(actions.terms.agreeTermInit(termId));
-      dispatch(actions.terms.agreeTermDone(termId, tokens.tokenV2));
+      dispatch(actions.terms.agreeTermDone(termId, tokens.tokenV3));
     },
   };
 }
diff --git a/src/shared/reducers/terms.js b/src/shared/reducers/terms.js
index 3369ad3d30..9af66a28f5 100644
--- a/src/shared/reducers/terms.js
+++ b/src/shared/reducers/terms.js
@@ -154,7 +154,7 @@ function onAgreeTermDone(state, action) {
   }
   if (action.payload.success) {
     const terms = _.cloneDeep(state.terms);
-    const term = _.find(terms, ['termsOfUseId', action.payload.termId]);
+    const term = _.find(terms, ['id', action.payload.termId]);
     term.agreed = true;
     const selectedTerm = _.find(terms, t => !t.agreed);
     return {
@@ -216,7 +216,7 @@ function onCloseTermsModal(state, { payload }) {
  */
 function onSignDocu(state, action) {
   const terms = _.cloneDeep(state.terms);
-  const term = _.find(terms, ['termsOfUseId', action.payload]);
+  const term = _.find(terms, ['id', action.payload]);
   term.agreed = true;
   const selectedTerm = _.find(terms, t => !t.agreed);
   return {