diff --git a/_data/sidebar.yml b/_data/sidebar.yml
index bbac8fbc34..96a1569c76 100644
--- a/_data/sidebar.yml
+++ b/_data/sidebar.yml
@@ -29,4 +29,4 @@ Swarm and friends:
   - POC series: /docs/swarm---POC-series
   - dev progress: /docs/swarm-dev-progress
   - roadmap: /docs/swarm-roadmap
-  - IPFS & SWARM: /docs/IPFS-&-SWARM
\ No newline at end of file
+  - IPFS & SWARM: /docs/IPFS--SWARM
\ No newline at end of file
diff --git a/docs/Contract-Tutorial.md b/docs/Contract-Tutorial.md
index b77749873d..74d3d6eaec 100644
--- a/docs/Contract-Tutorial.md
+++ b/docs/Contract-Tutorial.md
@@ -106,7 +106,7 @@ If you have the SolC Solidity Compiler installed,  you need now reformat by remo
 
 #### Linking your compiler in Geth
 
-Now [go back to the console](Geth) and type this command to install solC, replacing _path/to/solc_ to the path that you got on the last command you did:
+Now [go back to the console](/docs/geth) and type this command to install solC, replacing _path/to/solc_ to the path that you got on the last command you did:
 
     admin.setSolc("path/to/solc")
 
diff --git a/docs/IPFS--SWARM.md b/docs/IPFS--SWARM.md
index 1afcda2977..a18b555ec2 100644
--- a/docs/IPFS--SWARM.md
+++ b/docs/IPFS--SWARM.md
@@ -1 +1 @@
-see here https://github.com/ethersphere/go-ethereum/wiki/IPFS-&-SWARM 
+see here https://github.com/ethersphere/go-ethereum/wiki/IPFS--SWARM 
diff --git a/docs/Managing-your-accounts.md b/docs/Managing-your-accounts.md
index 7456cc1375..a2878e3396 100644
--- a/docs/Managing-your-accounts.md
+++ b/docs/Managing-your-accounts.md
@@ -24,7 +24,7 @@ or import). Without it you are not able to unlock your account.
 Note that exporting your key in unencrypted format is NOT supported.
 
 Keys are stored under `<DATADIR>/keystore`. Make sure you backup your keys regularly! See
-[DATADIR backup & restore](Backup-&-restore)
+[DATADIR backup & restore](Backup--restore)
 for more information. If a custom datadir and keystore option are given the keystore
 option takes preference over the datadir option.
 
diff --git a/docs/Geth.md b/docs/geth.md
similarity index 94%
rename from docs/Geth.md
rename to docs/geth.md
index d029797c1e..72531bfe77 100644
--- a/docs/Geth.md
+++ b/docs/geth.md
@@ -17,7 +17,7 @@ Supported Platforms are Linux, Mac Os and Windows.
 We support two types of installation: binary or scripted install for users. 
 See [Install instructions](Building-Ethereum) for binary and scripted installs.
 
-Developers and community enthusiast are advised to read the [Developers' Guide](Developers%27-Guide), which contains detailed instructions for manual build from source (on any platform) as well as detailed tips on testing, monitoring, contributing, debugging and submitting pull requests on github.
+Developers and community enthusiast are advised to read the [Developers' Guide](Developers-Guide), which contains detailed instructions for manual build from source (on any platform) as well as detailed tips on testing, monitoring, contributing, debugging and submitting pull requests on github.
 
 ## Interfaces
 
@@ -28,7 +28,7 @@ Developers and community enthusiast are advised to read the [Developers' Guide](
 ## Basic Use Case Documentation
 
 * [Managing accounts](Managing-your-accounts)
-* [Mining](mining)
+* [Mining](Mining)
 
 **Note** buying and selling ether through exchanges is not discussed here. 
 
diff --git a/docs/index.md b/docs/index.md
index 98c721bd9f..65580c1f45 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -11,7 +11,7 @@ Main entry points:
 * [Command Line Options](/docs/Command-Line-Options)
 * [JavaScript Console](/docs/JavaScript-Console)
 * [Private Network](/docs/Private-network)
-* [Developers' Guide](/docs/Developers'-Guide)
+* [Developers' Guide](/docs/Developers-Guide)
 * [Whisper v6](/docs/Whisper)
 
 Sidebar lists all pages.
diff --git a/docs/other-documents.md b/docs/other-documents.md
index e1011445d1..015b7b6867 100644
--- a/docs/other-documents.md
+++ b/docs/other-documents.md
@@ -1,14 +1,13 @@
 - [Accounts key-storage specification](/docs/Accounts---key-storage-specification)
 - [Connecting to the network](/docs/Connecting-to-the-network)
 - [Creating your own Ethereum apps using Eth go](/docs/Creating-your-own-Ethereum-apps-using-Eth-go)
-- [Developer guide](/docs/Developer-Guide)
 - [Disclaimer](/docs/Disclaimer)
 - [Ethereum Specification](/docs/Ethereum-Specification)
 - [Ethereum on Android](/docs/Ethereum-on-Android)
 - [GAs Price Oracle](/docs/Gas-Price-Oracle)
-- [Go ethereum management API's](/docs/Go-ethereum-management-API's)
+- [Go ethereum management API's](/docs/Go-ethereum-management-APIs)
 - [Installing Geth](/docs/Installing-Geth)
-- [(Japanese) Contracts and Transactions](/docs/(Japanese)-Contracts-and-Transactions)
+- [(Japanese) Contracts and Transactions](/docs/Japanese-Contracts-and-Transactions)
 - [Mobile/Account management](/docs/Mobile/Account-management)
 - [Mobile/Introduction](/docs/Mobile/Introduction)
 - [Mobile Clients/Libraries and Inproc Ethereum Nodes](/docs/Mobile-Clients/Libraries-and-Inproc-Ethereum-Nodes)
@@ -18,6 +17,6 @@
 - [Provisional JS API](/docs/Provisional-JS-API)
 - [RPC PUB-SUB](/docs/RPC-PUB-SUB)
 - [Sending ethere](/docs/Sending-ether)
-- [Setting up Ethereum (Native)](/docs/Setting-up-Ethereum-(Native))
+- [Setting up Ethereum (Native)](/docs/Setting-up-Ethereum-Native)
 - [Tracing/Introduction](/docs/Tracing/Introduction)
 - [URL Scheme](/docs/URL-Scheme)