diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a7855bcc42..9e0118060b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 
 Everyone is very welcome to contribute on the codebase of Remix. Please reach us in [Gitter](https://gitter.im/ethereum/remix)!
 
-The easiest way to work on `remix-debugger` or `remix-solidity` is to pull the `browser-solidity` (Remix IDE) repository (https://github.com/ethereum/browser-solidity) which has a strong Remix integration. Then, in `browser-solidity`, execute `npm install`, `npm pull remix`, `npm link remix`. 
+The easiest way to work on `remix-debugger` or `remix-solidity` is to pull the `remix-ide` (Remix IDE) repository (https://github.com/ethereum/remix-ide) which has a strong Remix integration. Then, in `remix-ide`, execute `npm install`, `npm pull remix`, `npm link remix`. 
 then `npm run build && npm run serve` to start a new Remix IDE instance (you can browse `127.0.0.1:8080`).
 
 To interact with the Remix code:
@@ -13,7 +13,7 @@ To interact with the Remix code:
 
 3. For Decoding local and state variables: follow 2), then expand (is not already) the `Solidity State` and `Solidity Locals` panels, the content of thoses panel are provided by the `remix-solidity/decoder` library.
 
-**Reminder**: the Remix repository contains tools used to debug transactions, one of these tools being a debugger. The [`browser-solidity` repository](https://github.com/ethereum/browser-solidity) contains the Remix IDE (online version remix.ethereum.org), which make use of the Remix repository for the debugging features.
+**Reminder**: the Remix repository contains tools used to debug transactions, one of these tools being a debugger. The [`remix-ide` repository](https://github.com/ethereum/remix-ide) contains the Remix IDE (online version remix.ethereum.org), which make use of the Remix repository for the debugging features.
 
 ## Coding style
 
diff --git a/README.md b/README.md
index e0f3d83665..a2d4561903 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 Ethereum tools for the web.
 
-*Are you looking for the Remix IDE? Follow [this link](https://github.com/ethereum/browser-solidity)!*
+*Are you looking for the Remix IDE? Follow [this link](https://github.com/ethereum/remix-ide)!*
 
 + [What is Remix?](#what-is-remix)
 + [How to use Remix](#how-to-use)
@@ -15,7 +15,7 @@ Ethereum tools for the web.
 
 **Remix** is a suite of tools to interact with the Ethereum blockchain in order to debug transactions, stored in this Git repository. A Remix transaction Web debugger is available [here](http://ethereum.github.io/remix), and its source code is part of this repository.
 
-The **Remix IDE** is an IDE for Solidity dApp developers, powered by Remix. The Remix IDE repository **is available [here](https://github.com/ethereum/browser-solidity)**, and an online version is available at https://remix.ethereum.org.
+The **Remix IDE** is an IDE for Solidity dApp developers, powered by Remix. The Remix IDE repository **is available [here](https://github.com/ethereum/remix-ide)**, and an online version is available at https://remix.ethereum.org.
 
 ## <a name="how-to-use"></a>How to use Remix
 
diff --git a/remix-lib/src/util.js b/remix-lib/src/util.js
index 53fbf99ca4..2c3f1169c3 100644
--- a/remix-lib/src/util.js
+++ b/remix-lib/src/util.js
@@ -217,7 +217,7 @@ function findCallInternal (index, rootCall, callsPath) {
   return ret
 }
 
-/* util extracted out from browser-solidity. @TODO split this file, cause it mix real util fn with solidity related stuff ... */
+/* util extracted out from remix-ide. @TODO split this file, cause it mix real util fn with solidity related stuff ... */
 function groupBy (arr, key) {
   return arr.reduce((sum, item) => {
     const groupByVal = item[key]
diff --git a/remix-solidity/src/analysis/modules/gasCosts.js b/remix-solidity/src/analysis/modules/gasCosts.js
index d27d17c0e1..d9d09cfa4c 100644
--- a/remix-solidity/src/analysis/modules/gasCosts.js
+++ b/remix-solidity/src/analysis/modules/gasCosts.js
@@ -10,7 +10,7 @@ function gasCosts () {
   * stop visiting when cb return true
   * @param {Function} cb    - callback
   */
-  // @TODO has been copied from browser-solidity repo ! should fix that soon !
+  // @TODO has been copied from remix-ide repo ! should fix that soon !
 function visitContracts (contracts, cb) {
   for (var file in contracts) {
     for (var name in contracts[file]) {
diff --git a/remix-solidity/test/analysis/staticAnalysisIssues-test.js b/remix-solidity/test/analysis/staticAnalysisIssues-test.js
index c79618d8b8..c46db46c20 100644
--- a/remix-solidity/test/analysis/staticAnalysisIssues-test.js
+++ b/remix-solidity/test/analysis/staticAnalysisIssues-test.js
@@ -16,7 +16,7 @@ function compile (fileName) {
 }
 
 test('staticAnalysisIssues.functionParameterPassingError', function (t) {
-  // https://github.com/ethereum/browser-solidity/issues/889#issuecomment-351746474
+  // https://github.com/ethereum/remix-ide/issues/889#issuecomment-351746474
   t.plan(2)
   var res = compile('functionParameters.sol')