diff --git a/bloom_filter/bloom_filter_wallet.js b/bloom_filter/bloom_filter_wallet.js
index 1250874cb3..9976d6da57 100644
--- a/bloom_filter/bloom_filter_wallet.js
+++ b/bloom_filter/bloom_filter_wallet.js
@@ -21,7 +21,7 @@ var fs = require('fs')
 
 require('coffee-script/register') // npm install coffee-script
 
-var graphenejs = require("graphenejs-lib");
+var graphenejs = require("bitsharesjs");
 var h = graphenejs.hash;
 var key_utils = graphenejs.key;
 const chainPrefix = "BTS";
diff --git a/bloom_filter/package.json b/bloom_filter/package.json
index fad0396fec..b1bbafd695 100644
--- a/bloom_filter/package.json
+++ b/bloom_filter/package.json
@@ -12,6 +12,6 @@
   "license": "ISC",
   "devDependencies": {
     "coffee-script": "^1.12.2",
-    "graphenejs-lib": "^0.4.10"
+    "bitsharesjs": "^0.4.10"
   }
 }
diff --git a/release-notes.txt b/release-notes.txt
index 6632f4280c..52274b8388 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -32,8 +32,8 @@ Release 2.0.160629
 
 New features
 --------
-- Api code moved to new [graphenejs-ws](https://github.com/svk31/graphenejs-ws) library
-- Crypto and blockchain state code moved to [graphenejs-lib](https://github.com/svk31/graphenejs-lib) library
+- Api code moved to new [bitsharesjs-ws](https://github.com/svk31/bitsharesjs-ws) library
+- Crypto and blockchain state code moved to [bitsharesjs](https://github.com/svk31/bitsharesjs) library
 - Add OPEN.MKR deposit/withdrawal
 - Limit chat messages to 140 characters
 - Refactor MyMarkets selection to tabbed layout
diff --git a/web/app/App.jsx b/web/app/App.jsx
index 58ce885e3a..ff22664df6 100644
--- a/web/app/App.jsx
+++ b/web/app/App.jsx
@@ -1,5 +1,5 @@
-import {ChainStore} from "graphenejs-lib/es";
-import {Apis} from "graphenejs-ws";
+import {ChainStore} from "bitsharesjs/es";
+import {Apis} from "bitsharesjs-ws";
 import React from "react";
 import IntlStore from "stores/IntlStore";
 import AccountStore from "stores/AccountStore";
diff --git a/web/app/Routes-dev.jsx b/web/app/Routes-dev.jsx
index b62a96c592..fa6eabe93c 100644
--- a/web/app/Routes-dev.jsx
+++ b/web/app/Routes-dev.jsx
@@ -1,5 +1,5 @@
 import React from "react";
-import {Apis} from "graphenejs-ws";
+import {Apis} from "bitsharesjs-ws";
 
 import { Router, Route, IndexRoute, browserHistory } from "react-router/es";
 import App from "./App";
diff --git a/web/app/Routes.jsx b/web/app/Routes.jsx
index 2c2b56bd36..195ad069a0 100644
--- a/web/app/Routes.jsx
+++ b/web/app/Routes.jsx
@@ -1,5 +1,5 @@
 import React from "react";
-import {Apis} from "graphenejs-ws";
+import {Apis} from "bitsharesjs-ws";
 
 import { Route, IndexRoute } from "react-router/es";
 import App from "./App";
diff --git a/web/app/actions/AssetActions.js b/web/app/actions/AssetActions.js
index 1b02e9b334..3d4deb03fb 100644
--- a/web/app/actions/AssetActions.js
+++ b/web/app/actions/AssetActions.js
@@ -1,10 +1,10 @@
 var alt = require("alt-instance");
-import {Apis} from "graphenejs-ws";
+import {Apis} from "bitsharesjs-ws";
 import utils from "common/utils";
 import WalletApi from "api/WalletApi";
 import ApplicationApi from "api/ApplicationApi";
 import WalletDb from "stores/WalletDb";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import big from "bignumber.js";
 
 let wallet_api = new WalletApi();
diff --git a/web/app/actions/BackupActions.js b/web/app/actions/BackupActions.js
index 3a54ff2534..44f50aabfa 100644
--- a/web/app/actions/BackupActions.js
+++ b/web/app/actions/BackupActions.js
@@ -1,7 +1,7 @@
 import alt from "alt-instance";
 import iDB from "idb-instance";
 import {compress, decompress} from "lzma";
-import {PrivateKey, PublicKey, Aes, key} from "graphenejs-lib/es";
+import {PrivateKey, PublicKey, Aes, key} from "bitsharesjs/es";
 import WalletActions from "actions/WalletActions";
 
 class BackupActions {
diff --git a/web/app/actions/BlockchainActions.js b/web/app/actions/BlockchainActions.js
index 994c313f2f..7f3d47cb09 100644
--- a/web/app/actions/BlockchainActions.js
+++ b/web/app/actions/BlockchainActions.js
@@ -1,5 +1,5 @@
 var alt = require("alt-instance");
-import {Apis} from "graphenejs-ws";
+import {Apis} from "bitsharesjs-ws";
 
 let latestBlocks = {};
 
diff --git a/web/app/actions/MarketsActions.js b/web/app/actions/MarketsActions.js
index c4263dcd9c..56711180c6 100644
--- a/web/app/actions/MarketsActions.js
+++ b/web/app/actions/MarketsActions.js
@@ -1,8 +1,8 @@
 var alt = require("alt-instance");
 import WalletApi from "api/WalletApi";
 import WalletDb from "stores/WalletDb";
-import {ChainStore} from "graphenejs-lib/es";
-import {Apis} from "graphenejs-ws";
+import {ChainStore} from "bitsharesjs/es";
+import {Apis} from "bitsharesjs-ws";
 import marketUtils from "common/market_utils";
 import accountUtils from "common/account_utils";
 import Immutable from "immutable";
diff --git a/web/app/actions/TransactionConfirmActions.js b/web/app/actions/TransactionConfirmActions.js
index 77fd7f3a28..99145719ab 100644
--- a/web/app/actions/TransactionConfirmActions.js
+++ b/web/app/actions/TransactionConfirmActions.js
@@ -1,5 +1,5 @@
 import alt from "alt-instance";
-import {ChainConfig} from "graphenejs-ws";
+import {ChainConfig} from "bitsharesjs-ws";
 
 class TransactionConfirmActions {
 
diff --git a/web/app/actions/WalletActions.js b/web/app/actions/WalletActions.js
index c294821968..579f50c00b 100644
--- a/web/app/actions/WalletActions.js
+++ b/web/app/actions/WalletActions.js
@@ -2,8 +2,8 @@ import WalletDb from "stores/WalletDb";
 import WalletUnlockActions from "actions/WalletUnlockActions";
 import CachedPropertyActions from "actions/CachedPropertyActions";
 import ApplicationApi from "api/ApplicationApi";
-import {TransactionBuilder, FetchChain} from "graphenejs-lib/es";
-import {Apis} from "graphenejs-ws";
+import {TransactionBuilder, FetchChain} from "bitsharesjs/es";
+import {Apis} from "bitsharesjs-ws";
 import alt from "alt-instance";
 import SettingsStore from "stores/SettingsStore";
 
diff --git a/web/app/api/ApplicationApi.js b/web/app/api/ApplicationApi.js
index 85f9e3e330..f3eb81dc3a 100644
--- a/web/app/api/ApplicationApi.js
+++ b/web/app/api/ApplicationApi.js
@@ -1,6 +1,6 @@
 import WalletUnlockActions from "actions/WalletUnlockActions";
 import WalletDb from "stores/WalletDb";
-import {Aes, ChainValidation, TransactionBuilder, TransactionHelper, FetchChain} from "graphenejs-lib/es";
+import {Aes, ChainValidation, TransactionBuilder, TransactionHelper, FetchChain} from "bitsharesjs/es";
 
 class ApplicationApi {
 
diff --git a/web/app/api/DebugApi.js b/web/app/api/DebugApi.js
index 3d2068c3d5..c4fcdd28af 100644
--- a/web/app/api/DebugApi.js
+++ b/web/app/api/DebugApi.js
@@ -1,4 +1,4 @@
-import { SerializerValidation, types} from "graphenejs-lib/es";
+import { SerializerValidation, types} from "bitsharesjs/es";
 var config = require("chain/serializer_config");
 
 class DebugApi {
diff --git a/web/app/api/WalletApi.js b/web/app/api/WalletApi.js
index 9dcf7fbf9c..fd12544bda 100644
--- a/web/app/api/WalletApi.js
+++ b/web/app/api/WalletApi.js
@@ -1,4 +1,4 @@
-import {SerializerValidation, TransactionBuilder, TransactionHelper} from "graphenejs-lib/es";
+import {SerializerValidation, TransactionBuilder, TransactionHelper} from "bitsharesjs/es";
 import ApplicationApi from "./ApplicationApi";
 
 class WalletApi {
diff --git a/web/app/api/accountApi.js b/web/app/api/accountApi.js
index 072363aa14..50b1f8f858 100644
--- a/web/app/api/accountApi.js
+++ b/web/app/api/accountApi.js
@@ -1,4 +1,4 @@
-import {Apis} from "graphenejs-ws";
+import {Apis} from "bitsharesjs-ws";
 
 class Api {
 
diff --git a/web/app/components/Account/AccountAssetCreate.jsx b/web/app/components/Account/AccountAssetCreate.jsx
index 1ac6c9f8e1..a7fe2333a2 100644
--- a/web/app/components/Account/AccountAssetCreate.jsx
+++ b/web/app/components/Account/AccountAssetCreate.jsx
@@ -4,7 +4,7 @@ import classnames from "classnames";
 import AssetActions from "actions/AssetActions";
 import HelpContent from "../Utility/HelpContent";
 import utils from "common/utils";
-import {ChainStore, ChainValidation} from "graphenejs-lib/es";
+import {ChainStore, ChainValidation} from "bitsharesjs/es";
 import FormattedAsset from "../Utility/FormattedAsset";
 import counterpart from "counterpart";
 import ChainTypes from "../Utility/ChainTypes";
diff --git a/web/app/components/Account/AccountAssetUpdate.jsx b/web/app/components/Account/AccountAssetUpdate.jsx
index f1b6fdc12c..5571e9d46f 100644
--- a/web/app/components/Account/AccountAssetUpdate.jsx
+++ b/web/app/components/Account/AccountAssetUpdate.jsx
@@ -4,7 +4,7 @@ import classnames from "classnames";
 import AssetActions from "actions/AssetActions";
 import HelpContent from "../Utility/HelpContent";
 import utils from "common/utils";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import FormattedAsset from "../Utility/FormattedAsset";
 import FormattedFee from "../Utility/FormattedFee";
 import counterpart from "counterpart";
@@ -597,6 +597,7 @@ class AccountAssetUpdate extends React.Component {
                                         </div>
                                         <div>
                                             <h5><Translate content="exchange.price" />: <FormattedPrice
+                                                invert
                                                 style={{fontWeight: "bold"}}
                                                 quote_amount={cr_quote_amount}
                                                 quote_asset={core_exchange_rate.quote.asset_id}
diff --git a/web/app/components/Account/AccountMembership.jsx b/web/app/components/Account/AccountMembership.jsx
index 8e360a4e50..b8824f1ce0 100644
--- a/web/app/components/Account/AccountMembership.jsx
+++ b/web/app/components/Account/AccountMembership.jsx
@@ -1,7 +1,7 @@
 import React from "react";
 import {Link} from "react-router/es";
 import Translate from "react-translate-component";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import ChainTypes from "../Utility/ChainTypes";
 import BindToChainState from "../Utility/BindToChainState";
 import Statistics from "./Statistics";
diff --git a/web/app/components/Account/AccountOrders.jsx b/web/app/components/Account/AccountOrders.jsx
index 598078db98..ba2a883de8 100644
--- a/web/app/components/Account/AccountOrders.jsx
+++ b/web/app/components/Account/AccountOrders.jsx
@@ -4,7 +4,7 @@ import {OrderRow, TableHeader} from "../Exchange/MyOpenOrders";
 import market_utils from "common/market_utils";
 import counterpart from "counterpart";
 import MarketsActions from "actions/MarketsActions";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import MarketLink from "../Utility/MarketLink";
 
 class AccountOrders extends React.Component {
diff --git a/web/app/components/Account/AccountOverview.jsx b/web/app/components/Account/AccountOverview.jsx
index 45d6af060e..7eb3b89502 100644
--- a/web/app/components/Account/AccountOverview.jsx
+++ b/web/app/components/Account/AccountOverview.jsx
@@ -9,7 +9,7 @@ import AssetName from "../Utility/AssetName";
 import CollateralPosition from "../Blockchain/CollateralPosition";
 import { RecentTransactions } from "./RecentTransactions";
 import Proposals from "components/Account/Proposals";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import SettingsActions from "actions/SettingsActions";
 import assetUtils from "common/asset_utils";
 import counterpart from "counterpart";
diff --git a/web/app/components/Account/AccountPermissions.jsx b/web/app/components/Account/AccountPermissions.jsx
index c8d3b0e405..5d4083a48b 100644
--- a/web/app/components/Account/AccountPermissions.jsx
+++ b/web/app/components/Account/AccountPermissions.jsx
@@ -6,7 +6,7 @@ import utils from "common/utils";
 import accountUtils from "common/account_utils";
 import WalletApi from "api/WalletApi";
 import WalletDb from "stores/WalletDb.js";
-import {PublicKey} from "graphenejs-lib/es";;
+import {PublicKey} from "bitsharesjs/es";;
 import AccountPermissionsList from "./AccountPermissionsList";
 import PubKeyInput from "../Forms/PubKeyInput";
 import {Tabs, Tab} from "../Utility/Tabs";
diff --git a/web/app/components/Account/AccountSelector.jsx b/web/app/components/Account/AccountSelector.jsx
index 3d8c67083a..05f3873afd 100644
--- a/web/app/components/Account/AccountSelector.jsx
+++ b/web/app/components/Account/AccountSelector.jsx
@@ -2,7 +2,7 @@ import React from "react";
 import utils from "common/utils";
 import AccountImage from "../Account/AccountImage";
 import Translate from "react-translate-component";
-import {ChainStore, PublicKey, ChainValidation} from "graphenejs-lib/es";
+import {ChainStore, PublicKey, ChainValidation} from "bitsharesjs/es";
 import ChainTypes from "../Utility/ChainTypes";
 import BindToChainState from "../Utility/BindToChainState";
 import classnames from "classnames";
diff --git a/web/app/components/Account/AccountVesting.jsx b/web/app/components/Account/AccountVesting.jsx
index fc61d69cb1..1e2772e6bf 100644
--- a/web/app/components/Account/AccountVesting.jsx
+++ b/web/app/components/Account/AccountVesting.jsx
@@ -1,10 +1,10 @@
 import React from "react";
 import Translate from "react-translate-component";
 import FormattedAsset from "../Utility/FormattedAsset";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import utils from "common/utils";
 import WalletActions from "actions/WalletActions";
-import {Apis} from "graphenejs-ws";
+import {Apis} from "bitsharesjs-ws";
 
 class VestingBalance extends React.Component {
 
diff --git a/web/app/components/Account/AccountVoting.jsx b/web/app/components/Account/AccountVoting.jsx
index 4b85daaa62..6d28813fc1 100644
--- a/web/app/components/Account/AccountVoting.jsx
+++ b/web/app/components/Account/AccountVoting.jsx
@@ -5,7 +5,7 @@ import counterpart from "counterpart";
 import accountUtils from "common/account_utils";
 import WalletApi from "api/WalletApi";
 import WalletDb from "stores/WalletDb.js";
-import {ChainStore, FetchChainObjects} from "graphenejs-lib/es";
+import {ChainStore, FetchChainObjects} from "bitsharesjs/es";
 import WorkerApproval from "./WorkerApproval";
 import AccountVotingProxy from "./AccountVotingProxy";
 import AccountsList from "./AccountsList";
diff --git a/web/app/components/Account/AccountVotingProxy.jsx b/web/app/components/Account/AccountVotingProxy.jsx
index 379e08f581..f093d3822d 100644
--- a/web/app/components/Account/AccountVotingProxy.jsx
+++ b/web/app/components/Account/AccountVotingProxy.jsx
@@ -5,7 +5,7 @@ import ChainTypes from "../Utility/ChainTypes";
 import Translate from "react-translate-component";
 import AccountImage from "../Account/AccountImage";
 import LinkToAccountById from "../Blockchain/LinkToAccountById";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 
 class AccountVotingProxy extends React.Component {
 
diff --git a/web/app/components/Account/AccountsList.jsx b/web/app/components/Account/AccountsList.jsx
index 0ac604ee49..4815996d09 100644
--- a/web/app/components/Account/AccountsList.jsx
+++ b/web/app/components/Account/AccountsList.jsx
@@ -2,7 +2,7 @@ import React from "react";
 import AccountSelector from "./AccountSelector";
 import Translate from "react-translate-component";
 import AccountImage from "./AccountImage";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import ChainTypes from "../Utility/ChainTypes";
 import FormattedAsset from "../Utility/FormattedAsset";
 import BindToChainState from "../Utility/BindToChainState";
diff --git a/web/app/components/Account/CreateAccount.jsx b/web/app/components/Account/CreateAccount.jsx
index 9e1a9c30b5..49870845c7 100644
--- a/web/app/components/Account/CreateAccount.jsx
+++ b/web/app/components/Account/CreateAccount.jsx
@@ -14,7 +14,7 @@ import TransactionConfirmStore from "stores/TransactionConfirmStore";
 import LoadingIndicator from "../LoadingIndicator";
 import WalletActions from "actions/WalletActions";
 import Translate from "react-translate-component";
-import {ChainStore, FetchChain} from "graphenejs-lib/es";
+import {ChainStore, FetchChain} from "bitsharesjs/es";
 import {BackupCreate} from "../Wallet/Backup";
 import ReactTooltip from "react-tooltip";
 import utils from "common/utils";
diff --git a/web/app/components/Account/NestedApprovalState.jsx b/web/app/components/Account/NestedApprovalState.jsx
index 4818b0b972..cf468ad040 100644
--- a/web/app/components/Account/NestedApprovalState.jsx
+++ b/web/app/components/Account/NestedApprovalState.jsx
@@ -6,7 +6,7 @@ import Icon from "../Icon/Icon";
 import LinkToAccountById from "../Blockchain/LinkToAccountById";
 import pu from "common/permission_utils";
 import {cloneDeep} from "lodash";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 
 class AccountPermissionTree extends React.Component {
 
diff --git a/web/app/components/Account/Proposals.jsx b/web/app/components/Account/Proposals.jsx
index 4c6f35df78..4b19942e7f 100644
--- a/web/app/components/Account/Proposals.jsx
+++ b/web/app/components/Account/Proposals.jsx
@@ -7,7 +7,7 @@ import ChainTypes from "components/Utility/ChainTypes";
 import utils from "common/utils";
 import ProposalApproveModal from "../Modal/ProposalApproveModal";
 import NestedApprovalState from "../Account/NestedApprovalState";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import counterpart from "counterpart";
 
 class Proposals extends Component {
diff --git a/web/app/components/Account/RecentTransactions.jsx b/web/app/components/Account/RecentTransactions.jsx
index 7582db75a8..03fb70ecb3 100644
--- a/web/app/components/Account/RecentTransactions.jsx
+++ b/web/app/components/Account/RecentTransactions.jsx
@@ -5,7 +5,7 @@ import Operation from "../Blockchain/Operation";
 import ChainTypes from "../Utility/ChainTypes";
 import BindToChainState from "../Utility/BindToChainState";
 import utils from "common/utils";
-import {ChainTypes as grapheneChainTypes} from "graphenejs-lib/es";
+import {ChainTypes as grapheneChainTypes} from "bitsharesjs/es";
 import TransitionWrapper from "../Utility/TransitionWrapper";
 import ps from "perfect-scrollbar";
 import counterpart from "counterpart";
diff --git a/web/app/components/Blockchain/Asset.jsx b/web/app/components/Blockchain/Asset.jsx
index 6c7c2458be..7a43488ab8 100644
--- a/web/app/components/Blockchain/Asset.jsx
+++ b/web/app/components/Blockchain/Asset.jsx
@@ -12,7 +12,7 @@ import HelpContent from "../Utility/HelpContent";
 import Icon from "../Icon/Icon";
 import assetUtils from "common/asset_utils";
 import utils from "common/utils";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 
 class AssetFlag extends React.Component {
     render()
diff --git a/web/app/components/Blockchain/Fees.jsx b/web/app/components/Blockchain/Fees.jsx
index 74beb464f6..cf7e5f5f9f 100644
--- a/web/app/components/Blockchain/Fees.jsx
+++ b/web/app/components/Blockchain/Fees.jsx
@@ -8,7 +8,7 @@ import ChainTypes from "../Utility/ChainTypes";
 import BindToChainState from "../Utility/BindToChainState";
 import FormattedAsset from "../Utility/FormattedAsset";
 import {EquivalentValueComponent} from "../Utility/EquivalentValueComponent";
-import {ChainStore, ChainTypes as grapheneChainTypes} from "graphenejs-lib/es";
+import {ChainStore, ChainTypes as grapheneChainTypes} from "bitsharesjs/es";
 const {operations} = grapheneChainTypes;
 let ops = Object.keys(operations);
 
diff --git a/web/app/components/Blockchain/Operation.jsx b/web/app/components/Blockchain/Operation.jsx
index 20d653ad1a..7405dfbfc6 100644
--- a/web/app/components/Blockchain/Operation.jsx
+++ b/web/app/components/Blockchain/Operation.jsx
@@ -12,7 +12,7 @@ import LinkToAssetById from "../Blockchain/LinkToAssetById";
 import BindToChainState from "../Utility/BindToChainState";
 import ChainTypes from "../Utility/ChainTypes";
 import TranslateWithLinks from "../Utility/TranslateWithLinks";
-import {ChainStore, ChainTypes as grapheneChainTypes} from "graphenejs-lib/es";
+import {ChainStore, ChainTypes as grapheneChainTypes} from "bitsharesjs/es";
 import account_constants from "chain/account_constants";
 import MemoText from "./MemoText";
 import ProposedOperation from "./ProposedOperation";
diff --git a/web/app/components/Blockchain/ProposedOperation.jsx b/web/app/components/Blockchain/ProposedOperation.jsx
index d0d936f6d8..44d0f799cc 100644
--- a/web/app/components/Blockchain/ProposedOperation.jsx
+++ b/web/app/components/Blockchain/ProposedOperation.jsx
@@ -10,7 +10,7 @@ import LinkToAccountById from "../Blockchain/LinkToAccountById";
 import LinkToAssetById from "../Blockchain/LinkToAssetById";
 import BindToChainState from "../Utility/BindToChainState";
 import FormattedPrice from "../Utility/FormattedPrice";
-import {ChainStore, ChainTypes as grapheneChainTypes} from "graphenejs-lib/es";
+import {ChainStore, ChainTypes as grapheneChainTypes} from "bitsharesjs/es";
 import account_constants from "chain/account_constants";
 import MemoText from "./MemoText";
 import TranslateWithLinks from "../Utility/TranslateWithLinks";
diff --git a/web/app/components/Blockchain/Transaction.jsx b/web/app/components/Blockchain/Transaction.jsx
index 98ad77585c..e9cb7658c3 100644
--- a/web/app/components/Blockchain/Transaction.jsx
+++ b/web/app/components/Blockchain/Transaction.jsx
@@ -16,7 +16,7 @@ import Icon from "../Icon/Icon";
 import PrivateKeyStore from "stores/PrivateKeyStore";
 import WalletUnlockActions from "actions/WalletUnlockActions";
 import ProposedOperation from "./ProposedOperation";
-import {ChainTypes} from "graphenejs-lib/es";
+import {ChainTypes} from "bitsharesjs/es";
 let {operations} = ChainTypes;
 import ReactTooltip from "react-tooltip";
 
diff --git a/web/app/components/Blockchain/TransactionConfirm.jsx b/web/app/components/Blockchain/TransactionConfirm.jsx
index 63aad79d70..f0a947253a 100644
--- a/web/app/components/Blockchain/TransactionConfirm.jsx
+++ b/web/app/components/Blockchain/TransactionConfirm.jsx
@@ -11,7 +11,7 @@ import LoadingIndicator from "../LoadingIndicator";
 import WalletDb from "stores/WalletDb";
 import AccountStore from "stores/AccountStore";
 import AccountSelect from "components/Forms/AccountSelect";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import utils from "common/utils";
 
 class TransactionConfirm extends React.Component {
diff --git a/web/app/components/Chat/Chat.jsx b/web/app/components/Chat/Chat.jsx
index 3e2edaeac2..33c6f9a676 100644
--- a/web/app/components/Chat/Chat.jsx
+++ b/web/app/components/Chat/Chat.jsx
@@ -3,7 +3,7 @@ import { connect } from "alt-react";
 import AccountStore from "stores/AccountStore";
 import Translate from "react-translate-component";
 import Icon from "../Icon/Icon";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import {debounce} from "lodash";
 import SettingsActions from "actions/SettingsActions";
 import SettingsStore from "stores/SettingsStore";
@@ -13,7 +13,7 @@ import counterpart from "counterpart";
 import LoadingIndicator from "../LoadingIndicator";
 import AccountActions from "actions/AccountActions";
 import TransactionConfirmStore from "stores/TransactionConfirmStore";
-import {FetchChainObjects} from "graphenejs-lib/es";;
+import {FetchChainObjects} from "bitsharesjs/es";;
 
 const PROD = true;
 const hostConfig = PROD ? { // Prod config
diff --git a/web/app/components/Console/Console.jsx b/web/app/components/Console/Console.jsx
index 945747dae6..46a0f1cc86 100644
--- a/web/app/components/Console/Console.jsx
+++ b/web/app/components/Console/Console.jsx
@@ -1,5 +1,5 @@
 import React, {Component} from "react";
-import {Apis} from "graphenejs-ws";
+import {Apis} from "bitsharesjs-ws";
 import ApplicationApi from "api/ApplicationApi";
 import WalletApi from "api/WalletApi";
 import DebugApi from "api/DebugApi";
diff --git a/web/app/components/Dashboard/AccountCard.jsx b/web/app/components/Dashboard/AccountCard.jsx
index aa8bae3627..7f5a9b3c14 100644
--- a/web/app/components/Dashboard/AccountCard.jsx
+++ b/web/app/components/Dashboard/AccountCard.jsx
@@ -4,7 +4,7 @@ import AccountImage from "../Account/AccountImage";
 import ChainTypes from "../Utility/ChainTypes";
 import BindToChainState from "../Utility/BindToChainState";
 import AccountStore from "stores/AccountStore";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 
 /**
  *  @brief displays the summary of a given account in a condenced view (for the dashboard)
diff --git a/web/app/components/Dashboard/DashboardList.jsx b/web/app/components/Dashboard/DashboardList.jsx
index a5cd70f14f..7d251ea3cb 100644
--- a/web/app/components/Dashboard/DashboardList.jsx
+++ b/web/app/components/Dashboard/DashboardList.jsx
@@ -8,7 +8,7 @@ import ChainTypes from "../Utility/ChainTypes";
 import BindToChainState from "../Utility/BindToChainState";
 import SettingsActions from "actions/SettingsActions";
 import Icon from "../Icon/Icon";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import TotalBalanceValue from "../Utility/TotalBalanceValue";
 import AccountStore from "stores/AccountStore";
 import counterpart from "counterpart";
diff --git a/web/app/components/DepositWithdraw/blocktrades/BlockTradesGatewayDepositRequest.jsx b/web/app/components/DepositWithdraw/blocktrades/BlockTradesGatewayDepositRequest.jsx
index 957fad1caa..994baac5b1 100644
--- a/web/app/components/DepositWithdraw/blocktrades/BlockTradesGatewayDepositRequest.jsx
+++ b/web/app/components/DepositWithdraw/blocktrades/BlockTradesGatewayDepositRequest.jsx
@@ -1,6 +1,6 @@
 import React from "react";
 import Translate from "react-translate-component";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import ChainTypes from "components/Utility/ChainTypes";
 import BindToChainState from "components/Utility/BindToChainState";
 import WithdrawModalBlocktrades from "./WithdrawModalBlocktrades";
diff --git a/web/app/components/DepositWithdraw/transwiser/TranswiserWithdrawModal.jsx b/web/app/components/DepositWithdraw/transwiser/TranswiserWithdrawModal.jsx
index 39dfac1e13..38f9e8043d 100644
--- a/web/app/components/DepositWithdraw/transwiser/TranswiserWithdrawModal.jsx
+++ b/web/app/components/DepositWithdraw/transwiser/TranswiserWithdrawModal.jsx
@@ -2,7 +2,7 @@ import React from "react";
 import Trigger from "react-foundation-apps/src/trigger";
 import Translate from "react-translate-component";
 import ChainTypes from "components/Utility/ChainTypes";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import BindToChainState from "components/Utility/BindToChainState";
 import utils from "common/utils";
 import BalanceComponent from "components/Utility/BalanceComponent";
diff --git a/web/app/components/Exchange/Exchange.jsx b/web/app/components/Exchange/Exchange.jsx
index 93919db00b..df895e6781 100644
--- a/web/app/components/Exchange/Exchange.jsx
+++ b/web/app/components/Exchange/Exchange.jsx
@@ -16,7 +16,7 @@ import BorrowModal from "../Modal/BorrowModal";
 import notify from "actions/NotificationActions";
 import AccountNotifications from "../Notifier/NotifierContainer";
 import Ps from "perfect-scrollbar";
-import { ChainStore, FetchChain } from "graphenejs-lib/es";
+import { ChainStore, FetchChain } from "bitsharesjs/es";
 import SettingsActions from "actions/SettingsActions";
 import cnames from "classnames";
 import market_utils from "common/market_utils";
diff --git a/web/app/components/Exchange/ExchangeContainer.jsx b/web/app/components/Exchange/ExchangeContainer.jsx
index 55d32a6886..b5cbe8fac6 100644
--- a/web/app/components/Exchange/ExchangeContainer.jsx
+++ b/web/app/components/Exchange/ExchangeContainer.jsx
@@ -6,7 +6,7 @@ import AltContainer from "alt-container";
 import Exchange from "./Exchange";
 import ChainTypes from "../Utility/ChainTypes";
 import LoadingIndicator from "../LoadingIndicator";
-import { EmitterInstance } from "graphenejs-lib/es";
+import { EmitterInstance } from "bitsharesjs/es";
 import BindToChainState from "../Utility/BindToChainState";
 import MarketsActions from "actions/MarketsActions";
 
diff --git a/web/app/components/Exchange/MarketHistory.jsx b/web/app/components/Exchange/MarketHistory.jsx
index b7dd22530e..812ce8d72b 100644
--- a/web/app/components/Exchange/MarketHistory.jsx
+++ b/web/app/components/Exchange/MarketHistory.jsx
@@ -13,7 +13,7 @@ import SettingsStore from "stores/SettingsStore";
 import { connect } from "alt-react";
 import TransitionWrapper from "../Utility/TransitionWrapper";
 import AssetName from "../Utility/AssetName";
-import { ChainTypes as grapheneChainTypes } from "graphenejs-lib/es";
+import { ChainTypes as grapheneChainTypes } from "bitsharesjs/es";
 const {operations} = grapheneChainTypes;
 
 class MarketHistory extends React.Component {
diff --git a/web/app/components/Explorer/Assets.jsx b/web/app/components/Explorer/Assets.jsx
index 956c24924a..475fc77a6b 100644
--- a/web/app/components/Explorer/Assets.jsx
+++ b/web/app/components/Explorer/Assets.jsx
@@ -11,7 +11,7 @@ import counterpart from "counterpart";
 import FormattedAsset from "../Utility/FormattedAsset";
 import AssetName from "../Utility/AssetName";
 import {Tabs, Tab} from "../Utility/Tabs";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 
 class Assets extends React.Component {
 
diff --git a/web/app/components/Explorer/CommitteeMembers.jsx b/web/app/components/Explorer/CommitteeMembers.jsx
index 95a243e1cb..361e5e9bba 100644
--- a/web/app/components/Explorer/CommitteeMembers.jsx
+++ b/web/app/components/Explorer/CommitteeMembers.jsx
@@ -3,7 +3,7 @@ import Immutable from "immutable";
 import AccountImage from "../Account/AccountImage";
 import ChainTypes from "../Utility/ChainTypes";
 import BindToChainState from "../Utility/BindToChainState";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import FormattedAsset from "../Utility/FormattedAsset";
 import Translate from "react-translate-component";
 import { connect } from "alt-react";
diff --git a/web/app/components/Explorer/Witnesses.jsx b/web/app/components/Explorer/Witnesses.jsx
index 52164d0f27..e56abb1692 100644
--- a/web/app/components/Explorer/Witnesses.jsx
+++ b/web/app/components/Explorer/Witnesses.jsx
@@ -3,7 +3,7 @@ import Immutable from "immutable";
 import AccountImage from "../Account/AccountImage";
 import ChainTypes from "../Utility/ChainTypes";
 import BindToChainState from "../Utility/BindToChainState";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import FormattedAsset from "../Utility/FormattedAsset";
 import Translate from "react-translate-component";
 import TimeAgo from "../Utility/TimeAgo";
diff --git a/web/app/components/Forms/AccountNameInput.jsx b/web/app/components/Forms/AccountNameInput.jsx
index a5805ce1ac..1a9b408cec 100644
--- a/web/app/components/Forms/AccountNameInput.jsx
+++ b/web/app/components/Forms/AccountNameInput.jsx
@@ -3,7 +3,7 @@ import {PropTypes} from "react";
 import classNames from "classnames";
 import AccountActions from "actions/AccountActions";
 import AccountStore from "stores/AccountStore";
-import {ChainValidation} from "graphenejs-lib/es";
+import {ChainValidation} from "bitsharesjs/es";
 import Translate from "react-translate-component";
 import counterpart from "counterpart";
 import AltContainer from "alt-container";
diff --git a/web/app/components/Forms/PubKeyInput.jsx b/web/app/components/Forms/PubKeyInput.jsx
index 00ac92cb4e..384dccee50 100644
--- a/web/app/components/Forms/PubKeyInput.jsx
+++ b/web/app/components/Forms/PubKeyInput.jsx
@@ -2,7 +2,7 @@ import React from "react";
 import classnames from "classnames";
 import Translate from "react-translate-component";
 import PrivateKeyView from "components/PrivateKeyView";
-import {PublicKey} from "graphenejs-lib/es";
+import {PublicKey} from "bitsharesjs/es";
 import Icon from "../Icon/Icon";
 
 /**
diff --git a/web/app/components/InitError.jsx b/web/app/components/InitError.jsx
index b583775143..24fc832074 100644
--- a/web/app/components/InitError.jsx
+++ b/web/app/components/InitError.jsx
@@ -5,7 +5,7 @@ import SettingsStore from "stores/SettingsStore";
 import Translate from "react-translate-component";
 import WebsocketAddModal from "./Settings/WebsocketAddModal";
 import SettingsActions from "actions/SettingsActions";
-import {Apis} from "graphenejs-ws";
+import {Apis} from "bitsharesjs-ws";
 
 class InitError extends React.Component {
 
diff --git a/web/app/components/Layout/Footer.jsx b/web/app/components/Layout/Footer.jsx
index 461dc6b594..11d5844c17 100644
--- a/web/app/components/Layout/Footer.jsx
+++ b/web/app/components/Layout/Footer.jsx
@@ -5,7 +5,7 @@ import BindToChainState from "../Utility/BindToChainState";
 import ChainTypes from "../Utility/ChainTypes";
 import CachedPropertyStore from "stores/CachedPropertyStore";
 import BlockchainStore from "stores/BlockchainStore";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import WalletDb from "stores/WalletDb";
 import TimeAgo from "../Utility/TimeAgo";
 import Icon from "../Icon/Icon";
diff --git a/web/app/components/Modal/BorrowModal.jsx b/web/app/components/Modal/BorrowModal.jsx
index 33a4875b3b..7c5d3aff4e 100755
--- a/web/app/components/Modal/BorrowModal.jsx
+++ b/web/app/components/Modal/BorrowModal.jsx
@@ -16,7 +16,7 @@ import FormattedPrice from "../Utility/FormattedPrice";
 import counterpart from "counterpart";
 import HelpContent from "../Utility/HelpContent";
 import Immutable from "immutable";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 
 let wallet_api = new WalletApi();
 
diff --git a/web/app/components/Modal/ProposalApproveModal.jsx b/web/app/components/Modal/ProposalApproveModal.jsx
index d98442556d..2ee2c484b5 100644
--- a/web/app/components/Modal/ProposalApproveModal.jsx
+++ b/web/app/components/Modal/ProposalApproveModal.jsx
@@ -11,7 +11,7 @@ import WalletDb from "stores/WalletDb";
 import WalletApi from "api/WalletApi";
 import NestedApprovalState from "../Account/NestedApprovalState";
 import pu from "common/permission_utils";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 
 let wallet_api = new WalletApi();
 
diff --git a/web/app/components/Modal/SettleModal.jsx b/web/app/components/Modal/SettleModal.jsx
index 8ee77aea3e..e60f628e71 100644
--- a/web/app/components/Modal/SettleModal.jsx
+++ b/web/app/components/Modal/SettleModal.jsx
@@ -10,7 +10,7 @@ import BalanceComponent from "../Utility/BalanceComponent";
 import WalletApi from "api/WalletApi";
 import WalletDb from "stores/WalletDb";
 import counterpart from "counterpart";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import AmountSelector from "../Utility/AmountSelector";
 
 let wallet_api = new WalletApi();
diff --git a/web/app/components/Notifier/Notifier.jsx b/web/app/components/Notifier/Notifier.jsx
index 98ed97e896..c8b7530f56 100644
--- a/web/app/components/Notifier/Notifier.jsx
+++ b/web/app/components/Notifier/Notifier.jsx
@@ -5,7 +5,7 @@ import Operation from "../Blockchain/Operation";
 import Immutable from "immutable";
 import ChainTypes from "../Utility/ChainTypes";
 import BindToChainState from "../Utility/BindToChainState";
-import {ChainTypes as GraphChainTypes} from "graphenejs-lib/es";
+import {ChainTypes as GraphChainTypes} from "bitsharesjs/es";
 let {operations} = GraphChainTypes;
 
 let ops = Object.keys(operations);
diff --git a/web/app/components/SyncError.jsx b/web/app/components/SyncError.jsx
index 249fc9dcce..a6d66e7ad9 100644
--- a/web/app/components/SyncError.jsx
+++ b/web/app/components/SyncError.jsx
@@ -4,7 +4,7 @@ import BlockchainStore from "stores/BlockchainStore";
 import SettingsStore from "stores/SettingsStore";
 import Translate from "react-translate-component";
 import SettingsActions from "actions/SettingsActions";
-import {Apis} from "graphenejs-ws";
+import {Apis} from "bitsharesjs-ws";
 import Icon from "./Icon/Icon";
 import WebsocketAddModal from "./Settings/WebsocketAddModal";
 
diff --git a/web/app/components/Transfer/Invoice.jsx b/web/app/components/Transfer/Invoice.jsx
index c9ac66b286..6ba4dc21c9 100644
--- a/web/app/components/Transfer/Invoice.jsx
+++ b/web/app/components/Transfer/Invoice.jsx
@@ -5,7 +5,7 @@ import AccountActions from "actions/AccountActions";
 import AccountSelector from "../Account/AccountSelector";
 import AccountInfo from "../Account/AccountInfo";
 import BalanceComponent from "../Utility/BalanceComponent";
-import {ChainStore, FetchChainObjects} from "graphenejs-lib/es";;
+import {ChainStore, FetchChainObjects} from "bitsharesjs/es";;
 import NotificationActions from "actions/NotificationActions";
 import TransactionConfirmStore from "stores/TransactionConfirmStore";
 import {decompress} from "lzma";
diff --git a/web/app/components/Transfer/Transfer.jsx b/web/app/components/Transfer/Transfer.jsx
index bbfa742f53..384e3409c6 100644
--- a/web/app/components/Transfer/Transfer.jsx
+++ b/web/app/components/Transfer/Transfer.jsx
@@ -11,7 +11,7 @@ import counterpart from "counterpart";
 import TransactionConfirmStore from "stores/TransactionConfirmStore";
 import { RecentTransactions } from "../Account/RecentTransactions";
 import Immutable from "immutable";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 
 class Transfer extends React.Component {
 
diff --git a/web/app/components/Utility/AmountSelector.jsx b/web/app/components/Utility/AmountSelector.jsx
index 10bf900837..19f51066bb 100755
--- a/web/app/components/Utility/AmountSelector.jsx
+++ b/web/app/components/Utility/AmountSelector.jsx
@@ -1,6 +1,6 @@
 import React from "react";
 import Translate from "react-translate-component";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import ChainTypes from "../Utility/ChainTypes";
 import BindToChainState from "../Utility/BindToChainState";
 import FormattedAsset from "./FormattedAsset";
diff --git a/web/app/components/Utility/AssetSelector.jsx b/web/app/components/Utility/AssetSelector.jsx
index 56ef2e3dfc..16da531e08 100644
--- a/web/app/components/Utility/AssetSelector.jsx
+++ b/web/app/components/Utility/AssetSelector.jsx
@@ -1,6 +1,6 @@
 import React from "react";
 import Translate from "react-translate-component";
-import {ChainValidation} from "graphenejs-lib/es";
+import {ChainValidation} from "bitsharesjs/es";
 import ChainTypes from "../Utility/ChainTypes";
 import BindToChainState from "../Utility/BindToChainState";
 import counterpart from "counterpart";
diff --git a/web/app/components/Utility/BindToChainState.jsx b/web/app/components/Utility/BindToChainState.jsx
index aa9b083ff3..e851528a02 100644
--- a/web/app/components/Utility/BindToChainState.jsx
+++ b/web/app/components/Utility/BindToChainState.jsx
@@ -1,6 +1,6 @@
 import React from "react";
 import {curry, flow, reject, clone, pairs, omit, get, pick} from "lodash";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import ChainTypes from "./ChainTypes";
 import utils from "common/utils";
 import LoadingIndicator from "../LoadingIndicator";
diff --git a/web/app/components/Utility/ChainTypes.js b/web/app/components/Utility/ChainTypes.js
index 38e48cf8be..4d34ca4105 100644
--- a/web/app/components/Utility/ChainTypes.js
+++ b/web/app/components/Utility/ChainTypes.js
@@ -1,6 +1,6 @@
 import utils from "common/utils";
 import Immutable from "immutable";
-import { ChainTypes as grapheneChainTypes} from "graphenejs-lib/es";
+import { ChainTypes as grapheneChainTypes} from "bitsharesjs/es";
 const {object_type} = grapheneChainTypes;
 
 function createChainableTypeChecker(validate) {
diff --git a/web/app/components/Utility/EquivalentValueComponent.jsx b/web/app/components/Utility/EquivalentValueComponent.jsx
index 92487a5bd8..cbf7a94b6f 100644
--- a/web/app/components/Utility/EquivalentValueComponent.jsx
+++ b/web/app/components/Utility/EquivalentValueComponent.jsx
@@ -4,7 +4,7 @@ import ChainTypes from "./ChainTypes";
 import BindToChainState from "./BindToChainState";
 import utils from "common/utils";
 import MarketsActions from "actions/MarketsActions";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import { connect } from "alt-react";
 import MarketsStore from "stores/MarketsStore";
 import Translate from "react-translate-component";
diff --git a/web/app/components/Utility/FormattedAsset.jsx b/web/app/components/Utility/FormattedAsset.jsx
index 0dcc0c4704..b904a23ae1 100755
--- a/web/app/components/Utility/FormattedAsset.jsx
+++ b/web/app/components/Utility/FormattedAsset.jsx
@@ -8,7 +8,7 @@ import BindToChainState from "./BindToChainState";
 import Popover from "react-popover";
 import HelpContent from "./HelpContent";
 import AssetName from "./AssetName";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 
 /**
  *  Given an amount and an asset, render it with proper precision
diff --git a/web/app/components/Utility/FormattedPrice.jsx b/web/app/components/Utility/FormattedPrice.jsx
index ff21bc89aa..071910802e 100644
--- a/web/app/components/Utility/FormattedPrice.jsx
+++ b/web/app/components/Utility/FormattedPrice.jsx
@@ -78,8 +78,8 @@ class FormattedPrice extends React.Component {
           marketDirections, marketId, hide_symbols, noPopOver} = this.props;
 
         let invertPrice = marketDirections.get(marketId);
-
-        if( invertPrice && !callPrice ) {
+        console.log("invertPrice", invertPrice);
+        if( (invertPrice && !callPrice) || this.props.invert) {
             let tmp = base_asset;
             base_asset = quote_asset;
             quote_asset = tmp;
diff --git a/web/app/components/Utility/TimeAgo.jsx b/web/app/components/Utility/TimeAgo.jsx
index 788ab54ced..4bf69b8c23 100644
--- a/web/app/components/Utility/TimeAgo.jsx
+++ b/web/app/components/Utility/TimeAgo.jsx
@@ -1,6 +1,6 @@
 import React from "react";
 import {FormattedRelative} from "react-intl";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 
 class TimeAgo extends React.Component {
 
diff --git a/web/app/components/Utility/TotalBalanceValue.jsx b/web/app/components/Utility/TotalBalanceValue.jsx
index 258b1d84c8..bb190bf670 100644
--- a/web/app/components/Utility/TotalBalanceValue.jsx
+++ b/web/app/components/Utility/TotalBalanceValue.jsx
@@ -4,7 +4,7 @@ import ChainTypes from "./ChainTypes";
 import BindToChainState from "./BindToChainState";
 import utils from "common/utils";
 import MarketsActions from "actions/MarketsActions";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import { connect } from "alt-react";
 import MarketsStore from "stores/MarketsStore";
 import SettingsStore from "stores/SettingsStore";
diff --git a/web/app/components/Wallet/Backup.jsx b/web/app/components/Wallet/Backup.jsx
index 69d8a62070..4ee989c122 100644
--- a/web/app/components/Wallet/Backup.jsx
+++ b/web/app/components/Wallet/Backup.jsx
@@ -10,8 +10,8 @@ import notify from "actions/NotificationActions";
 import {saveAs} from "file-saver";
 import cname from "classnames";
 import Translate from "react-translate-component";
-import {ChainConfig} from "graphenejs-ws";
-import {PrivateKey} from "graphenejs-lib/es";
+import {ChainConfig} from "bitsharesjs-ws";
+import {PrivateKey} from "bitsharesjs/es";
 
 const connectObject = {
     listenTo() {
diff --git a/web/app/components/Wallet/BackupBrainkey.jsx b/web/app/components/Wallet/BackupBrainkey.jsx
index db6ebf744c..a734116a2d 100644
--- a/web/app/components/Wallet/BackupBrainkey.jsx
+++ b/web/app/components/Wallet/BackupBrainkey.jsx
@@ -3,7 +3,7 @@ import {FormattedDate} from "react-intl";
 import Translate from "react-translate-component";
 import WalletActions from "actions/WalletActions";
 import WalletDb from "stores/WalletDb";
-import {hash} from "graphenejs-lib/es";
+import {hash} from "bitsharesjs/es";
 
 export default class BackupBrainkey extends Component {
 
diff --git a/web/app/components/Wallet/BrainkeyInput.jsx b/web/app/components/Wallet/BrainkeyInput.jsx
index 6811f3f625..8ea2d95de3 100644
--- a/web/app/components/Wallet/BrainkeyInput.jsx
+++ b/web/app/components/Wallet/BrainkeyInput.jsx
@@ -1,6 +1,6 @@
 import React, {PropTypes, Component} from "react";
 import cname from "classnames";
-import {hash, key} from "graphenejs-lib/es";
+import {hash, key} from "bitsharesjs/es";
 
 var dictionary_set;
 
diff --git a/web/app/components/Wallet/ImportKeys.jsx b/web/app/components/Wallet/ImportKeys.jsx
index e96e9c207d..1221272838 100644
--- a/web/app/components/Wallet/ImportKeys.jsx
+++ b/web/app/components/Wallet/ImportKeys.jsx
@@ -2,8 +2,8 @@ import React, {Component} from "react";
 import { connect } from "alt-react";
 import cname from "classnames";
 import notify from "actions/NotificationActions";
-import {PrivateKey, Aes, PublicKey, hash} from "graphenejs-lib/es";
-import {ChainConfig} from "graphenejs-ws";
+import {PrivateKey, Aes, PublicKey, hash} from "bitsharesjs/es";
+import {ChainConfig} from "bitsharesjs-ws";
 import PrivateKeyStore from "stores/PrivateKeyStore";
 import WalletUnlockActions from "actions/WalletUnlockActions";
 import WalletCreate from "components/Wallet/WalletCreate";
diff --git a/web/app/components/Wallet/WalletUnlockModal.jsx b/web/app/components/Wallet/WalletUnlockModal.jsx
index 571091ff12..87e8dc6e5b 100644
--- a/web/app/components/Wallet/WalletUnlockModal.jsx
+++ b/web/app/components/Wallet/WalletUnlockModal.jsx
@@ -10,7 +10,7 @@ import AltContainer from "alt-container";
 import WalletDb from "stores/WalletDb";
 import WalletUnlockStore from "stores/WalletUnlockStore";
 import WalletUnlockActions from "actions/WalletUnlockActions";
-import {Apis} from "graphenejs-ws";
+import {Apis} from "bitsharesjs-ws";
 
 class WalletUnlockModal extends React.Component {
 
diff --git a/web/app/dl_cli_index.js b/web/app/dl_cli_index.js
index 5ff67da0d6..8c9e5d44df 100644
--- a/web/app/dl_cli_index.js
+++ b/web/app/dl_cli_index.js
@@ -3,8 +3,8 @@ import WalletManagerStore from 'stores/WalletManagerStore'
 import AccountStore from 'stores/AccountStore'
 import PrivateKeyStore from 'stores/PrivateKeyStore'
 
-import {ChainStore, PrivateKey, PublicKey, Aes, key} from "graphenejs-lib/es";
-import {Apis, ChainConfig} from "graphenejs-ws";
+import {ChainStore, PrivateKey, PublicKey, Aes, key} from "bitsharesjs/es";
+import {Apis, ChainConfig} from "bitsharesjs-ws";
 import BackupActions from "actions/BackupActions"
 import WalletActions from "actions/WalletActions"
 
diff --git a/web/app/idb-instance.js b/web/app/idb-instance.js
index 44757cfd2f..3a95729d2c 100644
--- a/web/app/idb-instance.js
+++ b/web/app/idb-instance.js
@@ -1,4 +1,4 @@
-import {Apis} from "graphenejs-ws";
+import {Apis} from "bitsharesjs-ws";
 import idb_helper from "idb-helper";
 import iDBRoot from "idb-root";
 
diff --git a/web/app/stores/AccountRefsStore.js b/web/app/stores/AccountRefsStore.js
index 252bfe61a8..290f6f6c1b 100644
--- a/web/app/stores/AccountRefsStore.js
+++ b/web/app/stores/AccountRefsStore.js
@@ -2,7 +2,7 @@ import alt from "alt-instance";
 import iDB from "idb-instance";
 import Immutable from "immutable";
 import BaseStore from "./BaseStore";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import PrivateKeyStore from "stores/PrivateKeyStore";
 import PrivateKeyActions from "actions/PrivateKeyActions";
 
diff --git a/web/app/stores/AccountStore.js b/web/app/stores/AccountStore.js
index bf7f0bc1dd..fcc61be9cb 100644
--- a/web/app/stores/AccountStore.js
+++ b/web/app/stores/AccountStore.js
@@ -4,8 +4,8 @@ import alt from "alt-instance";
 import AccountActions from "actions/AccountActions";
 import iDB from "idb-instance";
 import PrivateKeyStore from "./PrivateKeyStore";
-import {ChainStore, ChainValidation, FetchChain} from "graphenejs-lib/es";
-import {Apis} from "graphenejs-ws";
+import {ChainStore, ChainValidation, FetchChain} from "bitsharesjs/es";
+import {Apis} from "bitsharesjs-ws";
 import AccountRefsStore from "stores/AccountRefsStore";
 import AddressIndex from "stores/AddressIndex";
 import SettingsStore from "stores/SettingsStore";
diff --git a/web/app/stores/AddressIndex.js b/web/app/stores/AddressIndex.js
index 86eec22014..871e786fff 100644
--- a/web/app/stores/AddressIndex.js
+++ b/web/app/stores/AddressIndex.js
@@ -1,7 +1,7 @@
 import alt from "alt-instance";
 import iDB from "idb-instance";
-import {key} from "graphenejs-lib/es";
-import {ChainConfig} from "graphenejs-ws";
+import {key} from "bitsharesjs/es";
+import {ChainConfig} from "bitsharesjs-ws";
 import Immutable from "immutable";
 import BaseStore from "stores/BaseStore";
 
diff --git a/web/app/stores/BackupStore.js b/web/app/stores/BackupStore.js
index f7daa744d9..1d2c9f8a2e 100644
--- a/web/app/stores/BackupStore.js
+++ b/web/app/stores/BackupStore.js
@@ -1,7 +1,7 @@
 import alt from "alt-instance";
 import BackupActions from "actions/BackupActions";
 import BaseStore from "stores/BaseStore";
-import {hash, PublicKey} from "graphenejs-lib/es";
+import {hash, PublicKey} from "bitsharesjs/es";
 
 class BackupStore extends BaseStore {
 
diff --git a/web/app/stores/BalanceClaimActiveStore.js b/web/app/stores/BalanceClaimActiveStore.js
index ccb5ceb700..b4f246f4ca 100644
--- a/web/app/stores/BalanceClaimActiveStore.js
+++ b/web/app/stores/BalanceClaimActiveStore.js
@@ -1,8 +1,8 @@
 import alt from "alt-instance";
 import Immutable from "immutable";
 import BaseStore from "stores/BaseStore";
-import {key} from "graphenejs-lib/es";
-import {Apis} from "graphenejs-ws";
+import {key} from "bitsharesjs/es";
+import {Apis} from "bitsharesjs-ws";
 import iDB from "idb-instance";
 import BalanceClaimActiveActions from "actions/BalanceClaimActiveActions";
 import TransactionConfirmActions from "actions/TransactionConfirmActions";
diff --git a/web/app/stores/BlockchainStore.js b/web/app/stores/BlockchainStore.js
index 07f8c6f58f..9cbb7a9f35 100644
--- a/web/app/stores/BlockchainStore.js
+++ b/web/app/stores/BlockchainStore.js
@@ -1,7 +1,7 @@
 var Immutable = require("immutable");
 import alt from "alt-instance";
 import BlockchainActions from "actions/BlockchainActions";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 
 import {
     Block
diff --git a/web/app/stores/BrainkeyStore.js b/web/app/stores/BrainkeyStore.js
index b410fd82ca..539a7724e1 100644
--- a/web/app/stores/BrainkeyStore.js
+++ b/web/app/stores/BrainkeyStore.js
@@ -1,6 +1,6 @@
 import alt from "alt-instance";
 import Immutable from "immutable";
-import {ChainStore, key} from "graphenejs-lib/es";
+import {ChainStore, key} from "bitsharesjs/es";
 import BaseStore from "stores/BaseStore";
 import BrainkeyActions from "actions/BrainkeyActions";
 
diff --git a/web/app/stores/MarketsStore.js b/web/app/stores/MarketsStore.js
index 4342635b7b..2eec5e15d2 100644
--- a/web/app/stores/MarketsStore.js
+++ b/web/app/stores/MarketsStore.js
@@ -3,7 +3,7 @@ var alt = require("alt-instance");
 import MarketsActions from "actions/MarketsActions";
 import market_utils from "common/market_utils";
 import ls from "common/localStorage";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import utils from "common/utils";
 import {LimitOrder, CallOrder, FeedPrice, SettleOrder, Asset,
     didOrdersChange} from "common/MarketClasses";
diff --git a/web/app/stores/PrivateKeyStore.js b/web/app/stores/PrivateKeyStore.js
index 3328f183f9..8bf988118c 100644
--- a/web/app/stores/PrivateKeyStore.js
+++ b/web/app/stores/PrivateKeyStore.js
@@ -8,7 +8,7 @@ import {PrivateKeyTcomb} from "./tcomb_structs";
 import PrivateKeyActions from "actions/PrivateKeyActions";
 import CachedPropertyActions from "actions/CachedPropertyActions";
 import AddressIndex from "stores/AddressIndex";
-import {PublicKey, ChainStore, Aes} from "graphenejs-lib/es";
+import {PublicKey, ChainStore, Aes} from "bitsharesjs/es";
 
 /** No need to wait on the promises returned by this store as long as
     this.state.privateKeyStorage_error == false and
diff --git a/web/app/stores/WalletDb.js b/web/app/stores/WalletDb.js
index 823ae399ff..52fb420bf8 100644
--- a/web/app/stores/WalletDb.js
+++ b/web/app/stores/WalletDb.js
@@ -10,8 +10,8 @@ import {WalletTcomb} from "./tcomb_structs";
 import TransactionConfirmActions from "actions/TransactionConfirmActions";
 import WalletUnlockActions from "actions/WalletUnlockActions";
 import PrivateKeyActions from "actions/PrivateKeyActions";
-import {ChainStore, PrivateKey, key, Aes} from "graphenejs-lib/es";
-import {Apis, ChainConfig} from "graphenejs-ws";
+import {ChainStore, PrivateKey, key, Aes} from "bitsharesjs/es";
+import {Apis, ChainConfig} from "bitsharesjs-ws";
 import AddressIndex from "stores/AddressIndex";
 
 let aes_private;
diff --git a/web/app/stores/WalletManagerStore.js b/web/app/stores/WalletManagerStore.js
index 8753359be9..1f4a872d4f 100644
--- a/web/app/stores/WalletManagerStore.js
+++ b/web/app/stores/WalletManagerStore.js
@@ -6,7 +6,7 @@ import BalanceClaimActiveStore from "stores/BalanceClaimActiveStore";
 import CachedPropertyStore from "stores/CachedPropertyStore";
 import PrivateKeyActions from "actions/PrivateKeyActions";
 import WalletActions from "actions/WalletActions";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import BaseStore from "stores/BaseStore";
 import iDB from "idb-instance";
 import Immutable from "immutable";
diff --git a/web/conf/webpack.config.js b/web/conf/webpack.config.js
index 916cf8502d..de13ef634a 100644
--- a/web/conf/webpack.config.js
+++ b/web/conf/webpack.config.js
@@ -107,7 +107,7 @@ module.exports = function(options) {
 
     var config = {
         entry: {
-            // vendor: ["react", "react-dom", "highcharts/highstock", "graphenejs-lib", "lodash"],
+            // vendor: ["react", "react-dom", "highcharts/highstock", "bitsharesjs", "lodash"],
             app: options.prod ?
             path.resolve(root_dir, "app/Main.js") :
             [
@@ -231,7 +231,7 @@ module.exports = function(options) {
     //     "classnames", "react-router", "highcharts/highstock", "counterpart", "react-translate-component",
     //     "perfect-scrollbar", "jdenticon", "react-notification-system", "react-tooltip",
     //     "whatwg-fetch", "alt", "react-json-inspector",
-    //     "immutable", "graphenejs-lib"
+    //     "immutable", "bitsharesjs"
     // ];
 
     return config;
diff --git a/web/lib/chain/GenesisFilter.js b/web/lib/chain/GenesisFilter.js
index c7f4534a8d..24926b5cc7 100644
--- a/web/lib/chain/GenesisFilter.js
+++ b/web/lib/chain/GenesisFilter.js
@@ -1,4 +1,4 @@
-import {hash, key} from "graphenejs-lib/es";
+import {hash, key} from "bitsharesjs/es";
 
 var bts_genesiskeys_bloom_url = undefined
 try {
diff --git a/web/lib/common/account_utils.js b/web/lib/common/account_utils.js
index 2f96df55ee..339a1b76b3 100644
--- a/web/lib/common/account_utils.js
+++ b/web/lib/common/account_utils.js
@@ -1,4 +1,4 @@
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import utils from "./utils";
 
 export default class AccountUtils {
diff --git a/web/lib/common/market_utils.js b/web/lib/common/market_utils.js
index 3fe3195545..a9c9f16701 100644
--- a/web/lib/common/market_utils.js
+++ b/web/lib/common/market_utils.js
@@ -1,5 +1,5 @@
 import utils from "./utils";
-import {ChainStore, ChainTypes} from "graphenejs-lib/es";
+import {ChainStore, ChainTypes} from "bitsharesjs/es";
 let {object_type} = ChainTypes;
 let opTypes = Object.keys(object_type);
 
diff --git a/web/lib/common/permission_utils.js b/web/lib/common/permission_utils.js
index 46815a7b25..d31ee8fa9e 100644
--- a/web/lib/common/permission_utils.js
+++ b/web/lib/common/permission_utils.js
@@ -1,4 +1,4 @@
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import Immutable from "immutable";
 
 let KeyAuth = function(auth) {
diff --git a/web/lib/common/utils.js b/web/lib/common/utils.js
index db0f255bdd..2f5a818104 100644
--- a/web/lib/common/utils.js
+++ b/web/lib/common/utils.js
@@ -2,7 +2,7 @@ var numeral = require("numeral");
 
 let id_regex = /\b\d+\.\d+\.(\d+)\b/;
 
-import {ChainTypes} from "graphenejs-lib/es";
+import {ChainTypes} from "bitsharesjs/es";
 var {object_type, operations} = ChainTypes;
 
 var Utils = {
diff --git a/web/lib/workers/AddressIndexWorker.js b/web/lib/workers/AddressIndexWorker.js
index 50df4d2697..24e13730d9 100644
--- a/web/lib/workers/AddressIndexWorker.js
+++ b/web/lib/workers/AddressIndexWorker.js
@@ -1,4 +1,4 @@
-import {key} from "graphenejs-lib/es";
+import {key} from "bitsharesjs/es";
 
 onmessage = function(event) {
     try {
diff --git a/web/lib/workers/AesWorker.js b/web/lib/workers/AesWorker.js
index 870f5ed00a..ab66760ed2 100644
--- a/web/lib/workers/AesWorker.js
+++ b/web/lib/workers/AesWorker.js
@@ -1,5 +1,5 @@
 require("babel-polyfill");
-import {Aes} from "graphenejs-lib/es";
+import {Aes} from "bitsharesjs/es";
 
 onmessage = function(event) { try {
     console.log("AesWorker start");
diff --git a/web/package.json b/web/package.json
index 8cd169a57e..bde404b300 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,8 +1,8 @@
 {
-  "name": "Graphene-UI",
+  "name": "Bitshares-UI",
   "version": "1.1.0",
-  "description": "Advanced wallet interface for graphene based blockchains (Bishares, Muse..)",
-  "homepage": "https://github.com/cryptonomex/graphene_ui",
+  "description": "Advanced wallet interface for the Bitshares financial blockchain.",
+  "homepage": "https://github.com/bitshares/bitshares-ui",
   "author": "Cryptonomex, Inc.",
   "license": "LicenseRef-LICENSE",
   "engines": {
@@ -11,7 +11,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/cryptonomex/graphene_ui"
+    "url": "git://github.com/bitshares/bitshares-ui"
   },
   "scripts": {
     "test": "NODE_ENV=test jest",
@@ -40,7 +40,6 @@
     "file-saver": "^1.3.3",
     "foundation-apps": "git+https://github.com/zurb/foundation-apps.git",
     "fractional": "^1.0.0",
-    "graphenejs-lib": "^0.5.1",
     "highcharts": "4.2.6",
     "immutable": "^3.8.1",
     "indexeddbshim": "^2.0.4",
diff --git a/web/test/test_helper.coffee b/web/test/test_helper.coffee
index 17fd199be3..bc66aee480 100644
--- a/web/test/test_helper.coffee
+++ b/web/test/test_helper.coffee
@@ -5,7 +5,7 @@ WalletDb = require "../app/stores/WalletDb"
 AccountActions = require "../app/actions/AccountActions"
 PrivateKeyStore = require "../app/stores/PrivateKeyStore"
 
-PrivateKey = require("graphenejs-lib").PrivateKey;
+PrivateKey = require("bitsharesjs").PrivateKey;
 
 # register listener
 require "../app/stores/WalletUnlockStore"