3 files changed, 10 insertions, 18 deletions
diff --git a/app/scripts/config.js b/app/scripts/config.js
index 67067cfd7..8e28db80e 100644
--- a/app/scripts/config.js
+++ b/app/scripts/config.js
@@ -1,18 +1,15 @@
 const MAINET_RPC_URL = 'https://mainnet.infura.io/metamask'
-const TESTNET_RPC_URL = 'https://rinkeby.infura.io/metamask'
-const KOVAN_RPC_URL = 'https://kovan.infura.io/metamask'
 const ROPSTEN_RPC_URL = 'https://ropsten.infura.io/metamask'
-const DEFAULT_RPC_URL = TESTNET_RPC_URL
+const KOVAN_RPC_URL = 'https://kovan.infura.io/metamask'
+const RINKEBY_RPC_URL = 'https://rinkeby.infura.io/metamask'
 
 global.METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
 
 module.exports = {
   network: {
-    default: DEFAULT_RPC_URL,
     mainnet: MAINET_RPC_URL,
-    testnet: TESTNET_RPC_URL,
-    morden: TESTNET_RPC_URL,
-    kovan: KOVAN_RPC_URL,
     ropsten: ROPSTEN_RPC_URL,
+    kovan: KOVAN_RPC_URL,
+    rinkeby: RINKEBY_RPC_URL,
   },
 }
diff --git a/app/scripts/first-time-state.js b/app/scripts/first-time-state.js
index 87a7bb7b5..29ec1d8d3 100644
--- a/app/scripts/first-time-state.js
+++ b/app/scripts/first-time-state.js
@@ -5,7 +5,7 @@
 module.exports = {
   config: {
     provider: {
-      type: 'testnet',
+      type: 'rinkeby',
     },
   },
 }
diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index 4ca02135a..d77cd2126 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -2,12 +2,10 @@ const MetamaskConfig = require('../config.js')
 const ethUtil = require('ethereumjs-util')
 const normalize = require('eth-sig-util').normalize
 
-const TESTNET_RPC = MetamaskConfig.network.testnet
 const MAINNET_RPC = MetamaskConfig.network.mainnet
-const MORDEN_RPC = MetamaskConfig.network.morden
-const KOVAN_RPC = MetamaskConfig.network.kovan
 const ROPSTEN_RPC = MetamaskConfig.network.ropsten
-
+const KOVAN_RPC = MetamaskConfig.network.kovan
+const RINKEBY_RPC = MetamaskConfig.network.rinkeby
 
 /* The config-manager is a convenience object
  * wrapping a pojo-migrator.
@@ -150,17 +148,14 @@ ConfigManager.prototype.getCurrentRpcAddress = function () {
     case 'ropsten':
       return ROPSTEN_RPC
 
-    case 'morden':
-      return MORDEN_RPC
-
     case 'kovan':
       return KOVAN_RPC
 
-    case 'testnet':
-      return TESTNET_RPC
+    case 'rinkeby':
+      return RINKEBY_RPC
 
     default:
-      return provider && provider.rpcTarget ? provider.rpcTarget : TESTNET_RPC
+      return provider && provider.rpcTarget ? provider.rpcTarget : RINKEBY_RPC
   }
 }