diff --git a/packages/embark-test-runner/src/test.js b/packages/embark-test-runner/src/test.js
index 71d860a70..cc7413cd3 100644
--- a/packages/embark-test-runner/src/test.js
+++ b/packages/embark-test-runner/src/test.js
@@ -297,8 +297,7 @@ class Test {
       function setConfig(next) {
         contractConfig = prepareContractsConfig(contractConfig);
         self.events.request('config:contractsConfig:set',
-          // TODO find out what versions_default is where it went
-          {contracts: contractConfig.contracts, versions: self.versions_default}, next);
+          {contracts: contractConfig.contracts}, next);
       },
       function getAccounts(next) {
         self.events.request('blockchain:getAccounts', (err, accounts) => {
diff --git a/packages/embark/src/lib/core/config.js b/packages/embark/src/lib/core/config.js
index 36c65d410..367bc4446 100644
--- a/packages/embark/src/lib/core/config.js
+++ b/packages/embark/src/lib/core/config.js
@@ -28,7 +28,7 @@ import {getBlockchainDefaults, getContractDefaults} from './configDefaults';
 const DEFAULT_CONFIG_PATH = 'config/';
 const PACKAGE = require('../../../package.json');
 
-// TODO add URL here when post or page is publicated
+// TODO add URL here when post or page is published
 const embark5ChangesUrl = 'https://...';
 
 var Config = function(options) {
diff --git a/site/source/docs/blockchain_configuration.md b/site/source/docs/blockchain_configuration.md
index d55ba9c3d..68cca7ff9 100644
--- a/site/source/docs/blockchain_configuration.md
+++ b/site/source/docs/blockchain_configuration.md
@@ -46,7 +46,7 @@ Option | Type: `default` | Value
 `client` | string: `geth` |  Client to use for the Ethereum node. Currently supported: `geth` and `parity`
 `miningMode` | string: `dev` |  The mining mode to use for the node.<br/>`dev`: This is a special mode where the node uses a development account as defaultAccount. This account is already funded and transactions are faster.<br/>`auto`: Uses a mining script to mine only when needed.<br/>`always`: Miner is always on.<br/>`off`: Turns off the miner
 `endpoint` | string |  Endpoint to connect to. Works for external endpoints (like Infura) and local ones too (only for nodes started by `embark run`)
-`accounts` | array |  Accounts array for the node and to deploy. When no account is given, defaults to one node account. For more details, go [here](http://localhost:4000/docs/blockchain_accounts_configuration.html)
+`accounts` | array |  Accounts array for the node and to deploy. When no account is given, defaults to one node account. For more details, go [here](/docs/blockchain_accounts_configuration.html)
 
 ## Advanced parameters
 
diff --git a/site/source/docs/contracts_configuration.md b/site/source/docs/contracts_configuration.md
index 616a5e651..dc13477e3 100644
--- a/site/source/docs/contracts_configuration.md
+++ b/site/source/docs/contracts_configuration.md
@@ -8,7 +8,7 @@ As many decentralized applications are powered by Smart Contracts, configuring a
 
 Unless specified differently in our application's `embark.json`, Smart Contracts are configured either in the `config/contracts.js` file, or, if we're dealing with a [Smart Contract only app](create_project.html#Creating-%E2%80%9Ccontracts-only%E2%80%9D-apps), the `./contracts.js` file in the root of our project.
 
-A Smart Contract configuration is placed in an environment's `contracts` property, with the name of the Smart Contract being the identifier. The following code creates a configuration for the `SimpleStorage` contract in the `development` environment:
+A Smart Contract configuration is placed in an environment's `deploy` property, with the name of the Smart Contract being the identifier. The following code creates a configuration for the `SimpleStorage` contract in the `development` environment:
 
 ```
 module.exports = {
@@ -133,8 +133,8 @@ In order to give users full control over which Smart Contracts should be deploye
 
 There are two possible strategy options: 
 
-- **implicit** - This is the default. Using the `implicit` strategy, Embark tries to deploy all Smart Contracts configured in the `contracts` configuration, including its (3rd-party) dependencies.
-- **explicit** - Setting this option to `explicit` tells Embark to deploy the Smart Contracts specified in the `contracts` configuration without their dependencies. This can be combined with [disabling deployment](#Disabling-deployment) of individual Smart Contracts for fine control.
+- **implicit** - This is the default. Using the `implicit` strategy, Embark tries to deploy all Smart Contracts configured in the `deploy` configuration, including its (3rd-party) dependencies.
+- **explicit** - Setting this option to `explicit` tells Embark to deploy the Smart Contracts specified in the `deploy` configuration without their dependencies. This can be combined with [disabling deployment](#Disabling-deployment) of individual Smart Contracts for fine control.
 
 ```
 strategy: 'explicit' // 'implicit' is the default
diff --git a/site/source/docs/contracts_imports.md b/site/source/docs/contracts_imports.md
index 30d92a97c..e54c92dd8 100644
--- a/site/source/docs/contracts_imports.md
+++ b/site/source/docs/contracts_imports.md
@@ -10,7 +10,7 @@ The following features are currently only supported for Smart Contracts written
 
 ## Importing files
 
-If using Solidity it's possible to import other Smart Contract files inside a source file from the application's folders that are not explicitly defined in the `contracts` property of `embark.json`.
+If using Solidity it's possible to import other Smart Contract files inside a source file from the application's folders that are not explicitly defined in the `deploy` property of `embark.json`.
 
 ```
 import "another_folder/another_test.sol";
diff --git a/site/source/docs/contracts_testing.md b/site/source/docs/contracts_testing.md
index 39c69a4b8..07a5d9090 100644
--- a/site/source/docs/contracts_testing.md
+++ b/site/source/docs/contracts_testing.md
@@ -74,7 +74,7 @@ $ embark test --gasDetails
 
 ## Test environment
 
-When running tests, the default [environment}(http://localhost:4000/docs/environments.html) is `test`. You can obviously change this using the `--env` flag.
+When running tests, the default [environment}(/docs/environments.html) is `test`. You can obviously change this using the `--env` flag.
 
 The special thing with the `test` environment is that if you do not have a `test` section in your module configuration, that module with be disabled (`enabled: false`). This is done to speed up the test as if you don't need a module, it is disabled.
 
@@ -187,7 +187,7 @@ config({
 
 ## Configuring modules
 
-You can configure the different Embark modules directly in your test file. The available modules are: [storage](/docs/storage_configuration.html), [namesystem](http://localhost:4000/docs/naming_configuration.html) and [communication](/docs/messages_configuration.html).
+You can configure the different Embark modules directly in your test file. The available modules are: [storage](/docs/storage_configuration.html), [namesystem](/docs/naming_configuration.html) and [communication](/docs/messages_configuration.html).
 
 All configuration options for the respective modules are available. Also, the configurations you put inside the `config` function are merged inside the ones that are in the configuration file (meaning that you don't have to put all the provider options if they are already in the default configs).