diff --git a/js/components/whitelabel/wallet/components/lumenus/lumenus_detail/lumenus_edition_container.js b/js/components/whitelabel/wallet/components/lumenus/lumenus_detail/lumenus_edition_container.js
deleted file mode 100644
index c81fb0bb..00000000
--- a/js/components/whitelabel/wallet/components/lumenus/lumenus_detail/lumenus_edition_container.js
+++ /dev/null
@@ -1,24 +0,0 @@
-'use strict';
-
-import React from 'react';
-
-import LumenusFurtherDetails from './lumenus_further_details';
-
-import LumenusAclButtonList from '../lumenus_buttons/lumenus_acl_button_list';
-
-import EditionContainer from '../../../../../ascribe_detail/edition_container';
-
-let LumenusEditionContainer = React.createClass({
-    propTypes: EditionContainer.propTypes,
-
-    render() {
-        return (
-            <EditionContainer
-                {...this.props}
-                actionPanelButtonListType={LumenusAclButtonList}
-                furtherDetailsType={LumenusFurtherDetails} />
-        );
-    }
-});
-
-export default LumenusEditionContainer;
diff --git a/js/components/whitelabel/wallet/components/lumenus/lumenus_buttons/lumenus_acl_button_list.js b/js/components/whitelabel/wallet/components/market/market_buttons/market_acl_button_list.js
similarity index 88%
rename from js/components/whitelabel/wallet/components/lumenus/lumenus_buttons/lumenus_acl_button_list.js
rename to js/components/whitelabel/wallet/components/market/market_buttons/market_acl_button_list.js
index 8398dbda..1dcdd4e5 100644
--- a/js/components/whitelabel/wallet/components/lumenus/lumenus_buttons/lumenus_acl_button_list.js
+++ b/js/components/whitelabel/wallet/components/market/market_buttons/market_acl_button_list.js
@@ -2,17 +2,17 @@
 
 import React from 'react';
 
-import LumenusSubmitButton from './lumenus_submit_button';
+import MarketSubmitButton from './market_submit_button';
 
 import DeleteButton from '../../../../../ascribe_buttons/delete_button';
-import ShareButton from '../../../../../ascribe_buttons/acls/share_button';
+import EmailButton from '../../../../../ascribe_buttons/acls/email_button';
 import TransferButton from '../../../../../ascribe_buttons/acls/transfer_button';
 import UnconsignButton from '../../../../../ascribe_buttons/acls/unconsign_button';
 
 import UserActions from '../../../../../../actions/user_actions';
 import UserStore from '../../../../../../stores/user_store';
 
-let LumenusAclButtonList = React.createClass({
+let MarketAclButtonList = React.createClass({
     propTypes: {
         availableAcls: React.PropTypes.object.isRequired,
         className: React.PropTypes.string,
@@ -45,12 +45,12 @@ let LumenusAclButtonList = React.createClass({
         let { availableAcls, className, pieceOrEditions, handleSuccess } = this.props;
         return (
             <div className={className}>
-                <LumenusSubmitButton
+                <MarketSubmitButton
                     availableAcls={availableAcls}
                     currentUser={this.state.currentUser}
                     editions={pieceOrEditions}
                     handleSuccess={handleSuccess} />
-                <ShareButton
+                <EmailButton
                     availableAcls={availableAcls}
                     currentUser={this.state.currentUser}
                     pieceOrEditions={pieceOrEditions}
@@ -71,4 +71,4 @@ let LumenusAclButtonList = React.createClass({
     }
 });
 
-export default LumenusAclButtonList;
+export default MarketAclButtonList;
diff --git a/js/components/whitelabel/wallet/components/lumenus/lumenus_buttons/lumenus_submit_button.js b/js/components/whitelabel/wallet/components/market/market_buttons/market_submit_button.js
similarity index 93%
rename from js/components/whitelabel/wallet/components/lumenus/lumenus_buttons/lumenus_submit_button.js
rename to js/components/whitelabel/wallet/components/market/market_buttons/market_submit_button.js
index d23f5e15..5ad9f995 100644
--- a/js/components/whitelabel/wallet/components/lumenus/lumenus_buttons/lumenus_submit_button.js
+++ b/js/components/whitelabel/wallet/components/market/market_buttons/market_submit_button.js
@@ -3,7 +3,7 @@
 import React from 'react';
 import classNames from 'classnames';
 
-import LumenusAdditionalDataForm from '../lumenus_forms/lumenus_additional_data_form';
+import MarketAdditionalDataForm from '../market_forms/market_additional_data_form';
 
 import AclFormFactory from '../../../../../ascribe_forms/acl_form_factory';
 import ConsignForm from '../../../../../ascribe_forms/form_consign';
@@ -21,7 +21,7 @@ import ApiUrls from '../../../../../../constants/api_urls';
 import { getAclFormMessage, getAclFormDataId } from '../../../../../../utils/form_utils';
 import { getLangText } from '../../../../../../utils/lang_utils';
 
-let LumenusSubmitButton = React.createClass({
+let MarketSubmitButton = React.createClass({
     propTypes: {
         availableAcls: React.PropTypes.object.isRequired,
         currentUser: React.PropTypes.object,
@@ -102,7 +102,7 @@ let LumenusSubmitButton = React.createClass({
 
         const triggerButton = (
             <button className={classNames('btn', 'btn-default', 'btn-sm', className)}>
-                {getLangText('CONSIGN TO LUMENUS')}
+                {getLangText('CONSIGN TO TODO')}
             </button>
         );
         const consignForm = (
@@ -127,7 +127,7 @@ let LumenusSubmitButton = React.createClass({
                         trigger={triggerButton}
                         handleSuccess={this.handleAdditionalDataSuccess.bind(this, solePieceId)}
                         title={getLangText('Add additional information')}>
-                        <LumenusAdditionalDataForm
+                        <MarketAdditionalDataForm
                             pieceId={solePieceId} />
                     </ModalWrapper>
 
@@ -147,7 +147,7 @@ let LumenusSubmitButton = React.createClass({
                     <ModalWrapper
                         trigger={triggerButton}
                         handleSuccess={handleSuccess}
-                        title={getLangText('Consign artwork to Lumenus')}>
+                        title={getLangText('Consign artwork to TODO')}>
                         {consignForm}
                     </ModalWrapper>
                 </AclProxy>
@@ -156,4 +156,4 @@ let LumenusSubmitButton = React.createClass({
     }
 });
 
-export default LumenusSubmitButton;
+export default MarketSubmitButton;
diff --git a/js/components/whitelabel/wallet/components/market/market_detail/market_edition_container.js b/js/components/whitelabel/wallet/components/market/market_detail/market_edition_container.js
new file mode 100644
index 00000000..97284dbc
--- /dev/null
+++ b/js/components/whitelabel/wallet/components/market/market_detail/market_edition_container.js
@@ -0,0 +1,24 @@
+'use strict';
+
+import React from 'react';
+
+import MarketFurtherDetails from './market_further_details';
+
+import MarketAclButtonList from '../market_buttons/market_acl_button_list';
+
+import EditionContainer from '../../../../../ascribe_detail/edition_container';
+
+let MarketEditionContainer = React.createClass({
+    propTypes: EditionContainer.propTypes,
+
+    render() {
+        return (
+            <EditionContainer
+                {...this.props}
+                actionPanelButtonListType={MarketAclButtonList}
+                furtherDetailsType={MarketFurtherDetails} />
+        );
+    }
+});
+
+export default MarketEditionContainer;
diff --git a/js/components/whitelabel/wallet/components/lumenus/lumenus_detail/lumenus_further_details.js b/js/components/whitelabel/wallet/components/market/market_detail/market_further_details.js
similarity index 58%
rename from js/components/whitelabel/wallet/components/lumenus/lumenus_detail/lumenus_further_details.js
rename to js/components/whitelabel/wallet/components/market/market_detail/market_further_details.js
index 79199b68..4e1e3ee8 100644
--- a/js/components/whitelabel/wallet/components/lumenus/lumenus_detail/lumenus_further_details.js
+++ b/js/components/whitelabel/wallet/components/market/market_detail/market_further_details.js
@@ -2,9 +2,9 @@
 
 import React from 'react';
 
-import LumenusAdditionalDataForm from '../lumenus_forms/lumenus_additional_data_form'
+import MarketAdditionalDataForm from '../market_forms/market_additional_data_form'
 
-let LumenusFurtherDetails = React.createClass({
+let MarketFurtherDetails = React.createClass({
     propTypes: {
         pieceId: React.PropTypes.number,
         handleSuccess: React.PropTypes.func,
@@ -12,7 +12,7 @@ let LumenusFurtherDetails = React.createClass({
 
     render() {
         return (
-            <LumenusAdditionalDataForm
+            <MarketAdditionalDataForm
                 {...this.props}
                 isInline
                 showNotification />
@@ -20,4 +20,4 @@ let LumenusFurtherDetails = React.createClass({
     }
 });
 
-export default LumenusFurtherDetails;
+export default MarketFurtherDetails;
diff --git a/js/components/whitelabel/wallet/components/lumenus/lumenus_detail/lumenus_piece_container.js b/js/components/whitelabel/wallet/components/market/market_detail/market_piece_container.js
similarity index 56%
rename from js/components/whitelabel/wallet/components/lumenus/lumenus_detail/lumenus_piece_container.js
rename to js/components/whitelabel/wallet/components/market/market_detail/market_piece_container.js
index 391a7cb5..d41ade56 100644
--- a/js/components/whitelabel/wallet/components/lumenus/lumenus_detail/lumenus_piece_container.js
+++ b/js/components/whitelabel/wallet/components/market/market_detail/market_piece_container.js
@@ -2,20 +2,20 @@
 
 import React from 'react';
 
-import LumenusFurtherDetails from './lumenus_further_details';
+import MarketFurtherDetails from './market_further_details';
 
 import PieceContainer from '../../../../../ascribe_detail/piece_container';
 
-let LumenusPieceContainer = React.createClass({
+let MarketPieceContainer = React.createClass({
     propTypes: PieceContainer.propTypes,
 
     render() {
         return (
             <PieceContainer
                 {...this.props}
-                furtherDetailsType={LumenusFurtherDetails} />
+                furtherDetailsType={MarketFurtherDetails} />
         );
     }
 });
 
-export default LumenusPieceContainer;
+export default MarketPieceContainer;
diff --git a/js/components/whitelabel/wallet/components/lumenus/lumenus_forms/lumenus_additional_data_form.js b/js/components/whitelabel/wallet/components/market/market_forms/market_additional_data_form.js
similarity index 97%
rename from js/components/whitelabel/wallet/components/lumenus/lumenus_forms/lumenus_additional_data_form.js
rename to js/components/whitelabel/wallet/components/market/market_forms/market_additional_data_form.js
index 2fbf5679..a2318b99 100644
--- a/js/components/whitelabel/wallet/components/lumenus/lumenus_forms/lumenus_additional_data_form.js
+++ b/js/components/whitelabel/wallet/components/market/market_forms/market_additional_data_form.js
@@ -24,7 +24,7 @@ import requests from '../../../../../../utils/requests';
 import { mergeOptions } from '../../../../../../utils/general_utils';
 import { getLangText } from '../../../../../../utils/lang_utils';
 
-let LumenusAdditionalDataForm = React.createClass({
+let MarketAdditionalDataForm = React.createClass({
     propTypes: {
         pieceId: React.PropTypes.oneOfType([
             React.PropTypes.number,
@@ -163,7 +163,7 @@ let LumenusAdditionalDataForm = React.createClass({
                     spinner={spinner}>
                     {heading}
                     <FurtherDetailsFileuploader
-                        label={getLangText('Marketplace image')}
+                        label={getLangText('Marketplace Thumbnail Image')}
                         uploadStarted={this.uploadStarted}
                         submitFile={function () {}}
                         setIsUploadReady={this.setIsUploadReady}
@@ -194,7 +194,7 @@ let LumenusAdditionalDataForm = React.createClass({
                         <InputTextAreaToggable
                             rows={1}
                             defaultValue={piece.extra_data.technology_details}
-                            placeholder={getLangText('Enter technological details about the work was produced...')}
+                            placeholder={getLangText('Enter technological details about the work...')}
                             required />
                     </Property>
                     <Property
@@ -218,4 +218,4 @@ let LumenusAdditionalDataForm = React.createClass({
     }
 });
 
-export default LumenusAdditionalDataForm;
+export default MarketAdditionalDataForm;
diff --git a/js/components/whitelabel/wallet/components/lumenus/lumenus_piece_list.js b/js/components/whitelabel/wallet/components/market/market_piece_list.js
similarity index 88%
rename from js/components/whitelabel/wallet/components/lumenus/lumenus_piece_list.js
rename to js/components/whitelabel/wallet/components/market/market_piece_list.js
index ebf90b3c..90564f2b 100644
--- a/js/components/whitelabel/wallet/components/lumenus/lumenus_piece_list.js
+++ b/js/components/whitelabel/wallet/components/market/market_piece_list.js
@@ -2,7 +2,7 @@
 
 import React from 'react';
 
-import LumenusAclButtonList from './lumenus_buttons/lumenus_acl_button_list';
+import MarketAclButtonList from './market_buttons/market_acl_button_list';
 
 import PieceList from '../../../../piece_list';
 
@@ -15,7 +15,7 @@ import { setDocumentTitle } from '../../../../../utils/dom_utils';
 import { mergeOptions } from '../../../../../utils/general_utils';
 import { getLangText } from '../../../../../utils/lang_utils';
 
-let LumenusPieceList = React.createClass({
+let MarketPieceList = React.createClass({
     propTypes: {
         location: React.PropTypes.object
     },
@@ -53,12 +53,12 @@ let LumenusPieceList = React.createClass({
         return (
             <PieceList
                 redirectTo="/register_piece?slide_num=0"
-                bulkModalButtonListType={LumenusAclButtonList}
+                bulkModalButtonListType={MarketAclButtonList}
                 filterParams={[{
                     label: getLangText('Show works I can'),
                     items: [{
                         key: isUserAdmin ? 'acl_transfer' : 'acl_consign',
-                        label: getLangText(isUserAdmin ? 'transfer' : 'consign to Lumenus'),
+                        label: getLangText(isUserAdmin ? 'transfer' : 'consign to Market'),
                         defaultValue: true
                     }]
                 }]}
@@ -67,4 +67,4 @@ let LumenusPieceList = React.createClass({
     }
 });
 
-export default LumenusPieceList;
+export default MarketPieceList;
diff --git a/js/components/whitelabel/wallet/components/lumenus/lumenus_register_piece.js b/js/components/whitelabel/wallet/components/market/market_register_piece.js
similarity index 96%
rename from js/components/whitelabel/wallet/components/lumenus/lumenus_register_piece.js
rename to js/components/whitelabel/wallet/components/market/market_register_piece.js
index 3d43418d..a59ce5fa 100644
--- a/js/components/whitelabel/wallet/components/lumenus/lumenus_register_piece.js
+++ b/js/components/whitelabel/wallet/components/market/market_register_piece.js
@@ -6,7 +6,7 @@ import { History } from 'react-router';
 import Col from 'react-bootstrap/lib/Col';
 import Row from 'react-bootstrap/lib/Row';
 
-import LumenusAdditionalDataForm from './lumenus_forms/lumenus_additional_data_form';
+import MarketAdditionalDataForm from './market_forms/market_additional_data_form';
 
 import Property from '../../../../ascribe_forms/property';
 import RegisterPieceForm from '../../../../ascribe_forms/form_register_piece';
@@ -23,7 +23,7 @@ import { getLangText } from '../../../../../utils/lang_utils';
 import { setDocumentTitle } from '../../../../../utils/dom_utils';
 import { mergeOptions } from '../../../../../utils/general_utils';
 
-let LumenusRegisterPiece = React.createClass({
+let MarketRegisterPiece = React.createClass({
     propTypes: {
         location: React.PropTypes.object
     },
@@ -138,7 +138,7 @@ let LumenusRegisterPiece = React.createClass({
                             <RegisterPieceForm
                                 disabled={this.state.step > 0}
                                 enableLocalHashing={false}
-                                headerMessage={getLangText('Consign to Lumenus')}
+                                headerMessage={getLangText('Consign to Market')}
                                 submitMessage={getLangText('Proceed to additional details')}
                                 isFineUploaderActive={this.state.isFineUploaderActive}
                                 handleSuccess={this.handleRegisterSuccess}
@@ -160,7 +160,7 @@ let LumenusRegisterPiece = React.createClass({
                 <div data-slide-title={getLangText('Additional details')}>
                     <Row className="no-margin">
                         <Col xs={12} sm={10} md={8} smOffset={1} mdOffset={2}>
-                            <LumenusAdditionalDataForm
+                            <MarketAdditionalDataForm
                                 handleSuccess={this.handleAdditionalDataSuccess}
                                 pieceId={this.getPieceFromQueryParam()}
                                 showHeading />
@@ -172,4 +172,4 @@ let LumenusRegisterPiece = React.createClass({
     }
 });
 
-export default LumenusRegisterPiece;
+export default MarketRegisterPiece;
diff --git a/js/components/whitelabel/wallet/wallet_routes.js b/js/components/whitelabel/wallet/wallet_routes.js
index 86b3474a..85e79924 100644
--- a/js/components/whitelabel/wallet/wallet_routes.js
+++ b/js/components/whitelabel/wallet/wallet_routes.js
@@ -15,7 +15,8 @@ import EditionContainer from '../../../components/ascribe_detail/edition_contain
 import SettingsContainer from '../../../components/ascribe_settings/settings_container';
 import ContractSettings from '../../../components/ascribe_settings/contract_settings';
 import ErrorNotFoundPage from '../../../components/error_not_found_page';
-import RegisterPiece from '../../../components/register_piece'; //TODO: Remove once finished with LumenusRegisterPiece
+
+import CCRegisterPiece from './components/cc/cc_register_piece';
 
 import CylandLanding from './components/cyland/cyland_landing';
 import CylandPieceContainer from './components/cyland/cyland_detail/cyland_piece_container';
@@ -29,13 +30,12 @@ import IkonotvRegisterPiece from './components/ikonotv/ikonotv_register_piece';
 import IkonotvPieceContainer from './components/ikonotv/ikonotv_detail/ikonotv_piece_container';
 import IkonotvContractNotifications from './components/ikonotv/ikonotv_contract_notifications';
 
-import LumenusLanding from './components/lumenus/lumenus_landing';
-import LumenusPieceList from './components/lumenus/lumenus_piece_list';
-import LumenusRegisterPiece from './components/lumenus/lumenus_register_piece';
-import LumenusPieceContainer from './components/lumenus/lumenus_detail/lumenus_piece_container';
-import LumenusEditionContainer from './components/lumenus/lumenus_detail/lumenus_edition_container';
+import MarketPieceList from './components/market/market_piece_list';
+import MarketRegisterPiece from './components/market/market_register_piece';
+import MarketPieceContainer from './components/market/market_detail/market_piece_container';
+import MarketEditionContainer from './components/market/market_detail/market_edition_container';
 
-import CCRegisterPiece from './components/cc/cc_register_piece';
+import LumenusLanding from './components/lumenus/lumenus_landing';
 
 import AuthProxyHandler from '../../../components/ascribe_routes/proxy_routes/auth_proxy_handler';
 
@@ -179,14 +179,14 @@ let ROUTES = {
                 component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(ContractSettings)}/>
             <Route
                 path='register_piece'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(LumenusRegisterPiece)}
+                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(MarketRegisterPiece)}
                 headerTitle='+ NEW WORK'/>
             <Route
                 path='collection'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(LumenusPieceList)}
+                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(MarketPieceList)}
                 headerTitle='COLLECTION'/>
-            <Route path='pieces/:pieceId' component={LumenusPieceContainer} />
-            <Route path='editions/:editionId' component={LumenusEditionContainer} />
+            <Route path='pieces/:pieceId' component={MarketPieceContainer} />
+            <Route path='editions/:editionId' component={MarketEditionContainer} />
             <Route path='verify' component={CoaVerifyContainer} />
             <Route path='*' component={ErrorNotFoundPage} />
         </Route>