diff --git a/common/containers/Tabs/Swap/components/wantToSwapMy.js b/common/containers/Tabs/Swap/components/currencySwap.js
similarity index 97%
rename from common/containers/Tabs/Swap/components/wantToSwapMy.js
rename to common/containers/Tabs/Swap/components/currencySwap.js
index f223c1d2..be58f129 100644
--- a/common/containers/Tabs/Swap/components/wantToSwapMy.js
+++ b/common/containers/Tabs/Swap/components/currencySwap.js
@@ -31,9 +31,9 @@ class CoinTypeDropDown extends Component {
   }
 }
 
-export default class WantToSwapMy extends Component {
-  constructor(props, context) {
-    super(props, context);
+export default class CurrencySwap extends Component {
+  constructor(props) {
+    super(props);
   }
 
   static propTypes = {
diff --git a/common/containers/Tabs/Swap/components/currentRates.js b/common/containers/Tabs/Swap/components/currentRates.js
index eed17fd7..1016bec4 100644
--- a/common/containers/Tabs/Swap/components/currentRates.js
+++ b/common/containers/Tabs/Swap/components/currentRates.js
@@ -49,12 +49,10 @@ export default class CurrentRates extends Component {
                 name="ETHBTCAmount"
               />
               <span>
-                ETH ={' '}
-                {toFixedIfLarger(
+                {` ETH = ${toFixedIfLarger(
                   this.state.ETHBTCAmount * this.props.ETHBTC,
                   6
-                )}{' '}
-                BTC
+                )} BTC`}
               </span>
             </p>
             <p className="mono">
@@ -65,12 +63,10 @@ export default class CurrentRates extends Component {
                 name="ETHREPAmount"
               />
               <span>
-                ETH ={' '}
-                {toFixedIfLarger(
+                {` ETH = ${toFixedIfLarger(
                   this.state.ETHREPAmount * this.props.ETHREP,
                   6
-                )}{' '}
-                REP
+                )} REP`}
               </span>
             </p>
           </div>
@@ -83,12 +79,10 @@ export default class CurrentRates extends Component {
                 name="BTCETHAmount"
               />
               <span>
-                BTC ={' '}
-                {toFixedIfLarger(
+                {` BTC = ${toFixedIfLarger(
                   this.state.BTCETHAmount * this.props.BTCETH,
                   6
-                )}{' '}
-                ETH
+                )} ETH`}
               </span>
             </p>
             <p className="mono">
@@ -99,12 +93,10 @@ export default class CurrentRates extends Component {
                 name="BTCREPAmount"
               />
               <span>
-                BTC ={' '}
-                {toFixedIfLarger(
+                {` BTC = ${toFixedIfLarger(
                   this.state.BTCREPAmount * this.props.BTCREP,
                   6
-                )}{' '}
-                REP
+                )} REP`}
               </span>
             </p>
           </div>
diff --git a/common/containers/Tabs/Swap/components/yourReceiving.js b/common/containers/Tabs/Swap/components/receivingAddress.js
similarity index 97%
rename from common/containers/Tabs/Swap/components/yourReceiving.js
rename to common/containers/Tabs/Swap/components/receivingAddress.js
index cde16274..a0cd4a80 100644
--- a/common/containers/Tabs/Swap/components/yourReceiving.js
+++ b/common/containers/Tabs/Swap/components/receivingAddress.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { DONATION_ADDRESSES_MAP } from 'config/data';
 import Validator from 'libs/validator';
 
-export default class YourReceiving extends Component {
+export default class ReceivingAddress extends Component {
   constructor(props) {
     super(props);
     this.validator = new Validator();
diff --git a/common/containers/Tabs/Swap/components/yourInformation.js b/common/containers/Tabs/Swap/components/swapInformation.js
similarity index 83%
rename from common/containers/Tabs/Swap/components/yourInformation.js
rename to common/containers/Tabs/Swap/components/swapInformation.js
index 60e71f86..272e4c49 100644
--- a/common/containers/Tabs/Swap/components/yourInformation.js
+++ b/common/containers/Tabs/Swap/components/swapInformation.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { toFixedIfLarger } from 'utils/formatters';
 
-export default class YourInformation extends Component {
+export default class SwapInformation extends Component {
   constructor(props) {
     super(props);
   }
@@ -50,20 +50,22 @@ export default class YourInformation extends Component {
         <section className="order-info-wrap row">
           <div className="col-sm-4 order-info">
             <h4>
-              {' '}{toFixedIfLarger(originAmount, 6)} {originKind}{' '}
+              {` ${toFixedIfLarger(originAmount, 6)} ${originKind}`}
             </h4>
             <p>Amount to send</p>
           </div>
           <div className="col-sm-4 order-info">
             <h4>
-              {' '}{toFixedIfLarger(destinationAmount, 6)} {destinationKind}{' '}
+              {` ${toFixedIfLarger(destinationAmount, 6)} ${destinationKind}`}
             </h4>
             <p>Amount to receive</p>
           </div>
           <div className="col-sm-4 order-info">
             <h4>
-              {' '}{toFixedIfLarger(this.computedOriginDestinationRatio(), 6)}{' '}
-              {originKind}/{destinationKind}{' '}
+              {` ${toFixedIfLarger(
+                this.computedOriginDestinationRatio(),
+                6
+              )} ${originKind}/${destinationKind} `}
             </h4>
             <p>Your rate</p>
           </div>
diff --git a/common/containers/Tabs/Swap/index.js b/common/containers/Tabs/Swap/index.js
index 9e875332..e54bb613 100644
--- a/common/containers/Tabs/Swap/index.js
+++ b/common/containers/Tabs/Swap/index.js
@@ -1,8 +1,8 @@
 import React, { Component } from 'react';
-import WantToSwapMy from './components/wantToSwapMy';
-import YourInformation from './components/yourInformation';
+import CurrencySwap from './components/currencySwap';
+import SwapInformation from './components/swapInformation';
 import CurrentRates from './components/currentRates';
-import YourReceiving from './components/yourReceiving';
+import ReceivingAddress from './components/receivingAddress';
 
 import { connect } from 'react-redux';
 import * as swapActions from 'actions/swap';
@@ -104,12 +104,12 @@ class Swap extends Component {
             {!partOneComplete &&
               <div>
                 <CurrentRates {...bityRates} />
-                <WantToSwapMy {...wantToSwapMyProps} />
+                <CurrencySwap {...wantToSwapMyProps} />
               </div>}
             {partOneComplete &&
               <div>
-                <YourInformation {...yourInformationProps} />
-                <YourReceiving {...yourReceivingProps} />
+                <SwapInformation {...yourInformationProps} />
+                <ReceivingAddress {...yourReceivingProps} />
               </div>}
           </main>
         </div>