From 4f7929fa7d56f6a08178819eb006cbb487a0a940 Mon Sep 17 00:00:00 2001
From: Bas van Kervel <basvankervel@ziggo.nl>
Date: Fri, 5 Jun 2015 10:09:42 +0200
Subject: [PATCH] renamed net_version to net_id

---
 cmd/console/js.go | 1 +
 rpc/api/net.go    | 4 ++--
 rpc/api/net_js.go | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cmd/console/js.go b/cmd/console/js.go
index a1908a789c..25eb3e71d4 100644
--- a/cmd/console/js.go
+++ b/cmd/console/js.go
@@ -142,6 +142,7 @@ var eth = web3.eth;
 var shh = web3.shh;
 var db  = web3.db;
 var net = web3.network;
+var miner = web3.miner;
   `)
 
 	if err != nil {
diff --git a/rpc/api/net.go b/rpc/api/net.go
index 0bc3ef3283..ba6abb5fbe 100644
--- a/rpc/api/net.go
+++ b/rpc/api/net.go
@@ -10,7 +10,7 @@ import (
 var (
 	// mapping between methods and handlers
 	netMapping = map[string]nethandler{
-		"net_version":   (*net).Version,
+		"net_id":        (*net).NetworkVersion,
 		"net_peerCount": (*net).PeerCount,
 		"net_listening": (*net).IsListening,
 		"net_peers":     (*net).Peers,
@@ -63,7 +63,7 @@ func (self *net) Id() string {
 }
 
 // Network version
-func (self *net) Version(req *shared.Request) (interface{}, error) {
+func (self *net) NetworkVersion(req *shared.Request) (interface{}, error) {
 	return self.xeth.NetworkVersion(), nil
 }
 
diff --git a/rpc/api/net_js.go b/rpc/api/net_js.go
index 0a0c831cdb..6ba0624d83 100644
--- a/rpc/api/net_js.go
+++ b/rpc/api/net_js.go
@@ -6,8 +6,8 @@ web3.extend({
 	methods:
 	[
 		new web3.extend.Method({
-			name: 'version',
-			call: 'net_version',
+			name: 'id',
+			call: 'net_id',
 			params: 0,
 			inputFormatter: [],
 			outputFormatter: web3.extend.formatters.formatOutputString