diff --git a/ethcore/src/client/registry.rs b/ethcore/src/client/registry.rs
index 9e60a1251d0..c8f750576fd 100644
--- a/ethcore/src/client/registry.rs
+++ b/ethcore/src/client/registry.rs
@@ -1,264 +1,338 @@
 // Autogenerated from JSON contract definition using Rust contract convertor.
-
+// Command line: --name=Registry --jsonabi=/Users/gav/registry.abi
+#![allow(unused_imports)]
 use std::string::String;
 use std::result::Result;
 use std::fmt;
 use {util, ethabi};
-use util::FixedHash;
-use util::Uint;
+use util::{FixedHash, Uint};
 
 pub struct Registry {
 	contract: ethabi::Contract,
 	pub address: util::Address,
-	do_call: Box<Fn(util::Address, Vec<u8>) -> Result<Vec<u8>, String> + Send + 'static>,
+	do_call: Box<Fn(util::Address, Vec<u8>) -> Result<Vec<u8>, String> + Send + Sync + 'static>,
 }
 impl Registry {
-	pub fn new<F>(address: util::Address, do_call: F) -> Self where F: Fn(util::Address, Vec<u8>) -> Result<Vec<u8>, String> + Send + 'static {
+	pub fn new<F>(address: util::Address, do_call: F) -> Self
+		where F: Fn(util::Address, Vec<u8>) -> Result<Vec<u8>, String> + Send + Sync + 'static {
 		Registry {
-			contract: ethabi::Contract::new(ethabi::Interface::load(b"[{\"constant\":false,\"inputs\":[{\"name\":\"_new\",\"type\":\"address\"}],\"name\":\"setOwner\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_name\",\"type\":\"string\"}],\"name\":\"confirmReverse\",\"outputs\":[{\"name\":\"success\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_name\",\"type\":\"bytes32\"}],\"name\":\"reserve\",\"outputs\":[{\"name\":\"success\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_name\",\"type\":\"bytes32\"},{\"name\":\"_key\",\"type\":\"string\"},{\"name\":\"_value\",\"type\":\"bytes32\"}],\"name\":\"set\",\"outputs\":[{\"name\":\"success\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_name\",\"type\":\"bytes32\"}],\"name\":\"drop\",\"outputs\":[{\"name\":\"success\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_name\",\"type\":\"bytes32\"},{\"name\":\"_key\",\"type\":\"string\"}],\"name\":\"getAddress\",\"outputs\":[{\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_amount\",\"type\":\"uint256\"}],\"name\":\"setFee\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_name\",\"type\":\"bytes32\"},{\"name\":\"_to\",\"type\":\"address\"}],\"name\":\"transfer\",\"outputs\":[{\"name\":\"success\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_name\",\"type\":\"bytes32\"}],\"name\":\"reserved\",\"outputs\":[{\"name\":\"reserved\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"drain\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_name\",\"type\":\"string\"},{\"name\":\"_who\",\"type\":\"address\"}],\"name\":\"proposeReverse\",\"outputs\":[{\"name\":\"success\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_name\",\"type\":\"bytes32\"},{\"name\":\"_key\",\"type\":\"string\"}],\"name\":\"getUint\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_name\",\"type\":\"bytes32\"},{\"name\":\"_key\",\"type\":\"string\"}],\"name\":\"get\",\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"fee\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_name\",\"type\":\"bytes32\"}],\"name\":\"getOwner\",\"outputs\":[{\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"\",\"type\":\"address\"}],\"name\":\"reverse\",\"outputs\":[{\"name\":\"\",\"type\":\"string\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_name\",\"type\":\"bytes32\"},{\"name\":\"_key\",\"type\":\"string\"},{\"name\":\"_value\",\"type\":\"uint256\"}],\"name\":\"setUint\",\"outputs\":[{\"name\":\"success\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"removeReverse\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_name\",\"type\":\"bytes32\"},{\"name\":\"_key\",\"type\":\"string\"},{\"name\":\"_value\",\"type\":\"address\"}],\"name\":\"setAddress\",\"outputs\":[{\"name\":\"success\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"Drained\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"FeeChanged\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"name\",\"type\":\"bytes32\"},{\"indexed\":true,\"name\":\"owner\",\"type\":\"address\"}],\"name\":\"Reserved\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"name\",\"type\":\"bytes32\"},{\"indexed\":true,\"name\":\"oldOwner\",\"type\":\"address\"},{\"indexed\":true,\"name\":\"newOwner\",\"type\":\"address\"}],\"name\":\"Transferred\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"name\",\"type\":\"bytes32\"},{\"indexed\":true,\"name\":\"owner\",\"type\":\"address\"}],\"name\":\"Dropped\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"name\",\"type\":\"bytes32\"},{\"indexed\":true,\"name\":\"owner\",\"type\":\"address\"},{\"indexed\":true,\"name\":\"key\",\"type\":\"string\"},{\"indexed\":false,\"name\":\"plainKey\",\"type\":\"string\"}],\"name\":\"DataChanged\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"name\",\"type\":\"string\"},{\"indexed\":true,\"name\":\"reverse\",\"type\":\"address\"}],\"name\":\"ReverseProposed\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"name\",\"type\":\"string\"},{\"indexed\":true,\"name\":\"reverse\",\"type\":\"address\"}],\"name\":\"ReverseConfirmed\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"name\",\"type\":\"string\"},{\"indexed\":true,\"name\":\"reverse\",\"type\":\"address\"}],\"name\":\"ReverseRemoved\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"old\",\"type\":\"address\"},{\"indexed\":true,\"name\":\"current\",\"type\":\"address\"}],\"name\":\"NewOwner\",\"type\":\"event\"}]").expect("JSON is autogenerated; qed")),
+			contract: ethabi::Contract::new(ethabi::Interface::load(b"[{\"constant\":true,\"inputs\":[{\"name\":\"_data\",\"type\":\"address\"}],\"name\":\"canReverse\",\"outputs\":[{\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_new\",\"type\":\"address\"}],\"name\":\"setOwner\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_name\",\"type\":\"bytes32\"},{\"name\":\"_key\",\"type\":\"string\"},{\"name\":\"_value\",\"type\":\"bytes32\"}],\"name\":\"setData\",\"outputs\":[{\"name\":\"success\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_name\",\"type\":\"string\"}],\"name\":\"confirmReverse\",\"outputs\":[{\"name\":\"success\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_name\",\"type\":\"bytes32\"}],\"name\":\"reserve\",\"outputs\":[{\"name\":\"success\",\"type\":\"bool\"}],\"payable\":true,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_name\",\"type\":\"bytes32\"}],\"name\":\"drop\",\"outputs\":[{\"name\":\"success\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_name\",\"type\":\"bytes32\"},{\"name\":\"_key\",\"type\":\"string\"}],\"name\":\"getAddress\",\"outputs\":[{\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_amount\",\"type\":\"uint256\"}],\"name\":\"setFee\",\"outputs\":[{\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_name\",\"type\":\"bytes32\"},{\"name\":\"_to\",\"type\":\"address\"}],\"name\":\"transfer\",\"outputs\":[{\"name\":\"success\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_name\",\"type\":\"bytes32\"},{\"name\":\"_key\",\"type\":\"string\"}],\"name\":\"getData\",\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_name\",\"type\":\"bytes32\"}],\"name\":\"reserved\",\"outputs\":[{\"name\":\"reserved\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"drain\",\"outputs\":[{\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_name\",\"type\":\"string\"},{\"name\":\"_who\",\"type\":\"address\"}],\"name\":\"proposeReverse\",\"outputs\":[{\"name\":\"success\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_name\",\"type\":\"bytes32\"}],\"name\":\"hasReverse\",\"outputs\":[{\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_name\",\"type\":\"bytes32\"},{\"name\":\"_key\",\"type\":\"string\"}],\"name\":\"getUint\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"fee\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_name\",\"type\":\"bytes32\"}],\"name\":\"getOwner\",\"outputs\":[{\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_name\",\"type\":\"bytes32\"}],\"name\":\"getReverse\",\"outputs\":[{\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"_data\",\"type\":\"address\"}],\"name\":\"reverse\",\"outputs\":[{\"name\":\"\",\"type\":\"string\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_name\",\"type\":\"bytes32\"},{\"name\":\"_key\",\"type\":\"string\"},{\"name\":\"_value\",\"type\":\"uint256\"}],\"name\":\"setUint\",\"outputs\":[{\"name\":\"success\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_name\",\"type\":\"string\"},{\"name\":\"_who\",\"type\":\"address\"}],\"name\":\"confirmReverseAs\",\"outputs\":[{\"name\":\"success\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"removeReverse\",\"outputs\":[],\"payable\":false,\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_name\",\"type\":\"bytes32\"},{\"name\":\"_key\",\"type\":\"string\"},{\"name\":\"_value\",\"type\":\"address\"}],\"name\":\"setAddress\",\"outputs\":[{\"name\":\"success\",\"type\":\"bool\"}],\"payable\":false,\"type\":\"function\"}]").expect("JSON is autogenerated; qed")),
 			address: address,
 			do_call: Box::new(do_call),
 		}
 	}
 	fn as_string<T: fmt::Debug>(e: T) -> String { format!("{:?}", e) }
 	
+	/// Auto-generated from: `{"constant":true,"inputs":[{"name":"_data","type":"address"}],"name":"canReverse","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"}`
+	#[allow(dead_code)]
+	pub fn can_reverse(&self, _data: &util::Address) -> Result<bool, String>
+		 {
+		let call = self.contract.function("canReverse".into()).map_err(Self::as_string)?;
+		let data = call.encode_call(
+			vec![ethabi::Token::Address(_data.clone().0)]
+		).map_err(Self::as_string)?;
+		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
+		let mut result = output.into_iter().rev().collect::<Vec<_>>();
+		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r }))
+	}
+
 	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"type":"function"}`
 	#[allow(dead_code)]
-	pub fn set_owner(&self, _new: &util::Address) -> Result<(), String> { 
+	pub fn set_owner(&self, _new: &util::Address) -> Result<(), String>
+		 {
 		let call = self.contract.function("setOwner".into()).map_err(Self::as_string)?;
 		let data = call.encode_call(
 			vec![ethabi::Token::Address(_new.clone().0)]
 		).map_err(Self::as_string)?;
 		call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
 		
-		Ok(()) 
+		Ok(())
 	}
 
-	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_name","type":"string"}],"name":"confirmReverse","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"}`
+	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"},{"name":"_value","type":"bytes32"}],"name":"setData","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"}`
 	#[allow(dead_code)]
-	pub fn confirm_reverse(&self, _name: &str) -> Result<bool, String> { 
-		let call = self.contract.function("confirmReverse".into()).map_err(Self::as_string)?;
+	pub fn set_data(&self, _name: &util::H256, _key: &str, _value: &util::H256) -> Result<bool, String>
+		 {
+		let call = self.contract.function("setData".into()).map_err(Self::as_string)?;
 		let data = call.encode_call(
-			vec![ethabi::Token::String(_name.to_owned())]
+			vec![ethabi::Token::FixedBytes(_name.as_ref().to_owned()), ethabi::Token::String(_key.to_owned()), ethabi::Token::FixedBytes(_value.as_ref().to_owned())]
 		).map_err(Self::as_string)?;
 		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
 		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r })) 
+		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r }))
 	}
 
-	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_name","type":"bytes32"}],"name":"reserve","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"}`
+	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_name","type":"string"}],"name":"confirmReverse","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"}`
 	#[allow(dead_code)]
-	pub fn reserve(&self, _name: &util::H256) -> Result<bool, String> { 
-		let call = self.contract.function("reserve".into()).map_err(Self::as_string)?;
+	pub fn confirm_reverse(&self, _name: &str) -> Result<bool, String>
+		 {
+		let call = self.contract.function("confirmReverse".into()).map_err(Self::as_string)?;
 		let data = call.encode_call(
-			vec![ethabi::Token::FixedBytes(_name.as_ref().to_owned())]
+			vec![ethabi::Token::String(_name.to_owned())]
 		).map_err(Self::as_string)?;
 		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
 		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r })) 
+		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r }))
 	}
 
-	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"},{"name":"_value","type":"bytes32"}],"name":"set","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"}`
+	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_name","type":"bytes32"}],"name":"reserve","outputs":[{"name":"success","type":"bool"}],"payable":true,"type":"function"}`
 	#[allow(dead_code)]
-	pub fn set(&self, _name: &util::H256, _key: &str, _value: &util::H256) -> Result<bool, String> { 
-		let call = self.contract.function("set".into()).map_err(Self::as_string)?;
+	pub fn reserve(&self, _name: &util::H256) -> Result<bool, String>
+		 {
+		let call = self.contract.function("reserve".into()).map_err(Self::as_string)?;
 		let data = call.encode_call(
-			vec![ethabi::Token::FixedBytes(_name.as_ref().to_owned()), ethabi::Token::String(_key.to_owned()), ethabi::Token::FixedBytes(_value.as_ref().to_owned())]
+			vec![ethabi::Token::FixedBytes(_name.as_ref().to_owned())]
 		).map_err(Self::as_string)?;
 		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
 		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r })) 
+		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r }))
 	}
 
 	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_name","type":"bytes32"}],"name":"drop","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"}`
 	#[allow(dead_code)]
-	pub fn drop(&self, _name: &util::H256) -> Result<bool, String> { 
+	pub fn drop(&self, _name: &util::H256) -> Result<bool, String>
+		 {
 		let call = self.contract.function("drop".into()).map_err(Self::as_string)?;
 		let data = call.encode_call(
 			vec![ethabi::Token::FixedBytes(_name.as_ref().to_owned())]
 		).map_err(Self::as_string)?;
 		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
 		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r })) 
+		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r }))
 	}
 
 	/// Auto-generated from: `{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"getAddress","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"}`
 	#[allow(dead_code)]
-	pub fn get_address(&self, _name: &util::H256, _key: &str) -> Result<util::Address, String> { 
+	pub fn get_address(&self, _name: &util::H256, _key: &str) -> Result<util::Address, String>
+		 {
 		let call = self.contract.function("getAddress".into()).map_err(Self::as_string)?;
 		let data = call.encode_call(
 			vec![ethabi::Token::FixedBytes(_name.as_ref().to_owned()), ethabi::Token::String(_key.to_owned())]
 		).map_err(Self::as_string)?;
 		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
 		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_address().ok_or("Invalid type returned")?; util::Address::from(r) })) 
+		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_address().ok_or("Invalid type returned")?; util::Address::from(r) }))
 	}
 
-	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_amount","type":"uint256"}],"name":"setFee","outputs":[],"payable":false,"type":"function"}`
+	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_amount","type":"uint256"}],"name":"setFee","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"}`
 	#[allow(dead_code)]
-	pub fn set_fee(&self, _amount: util::U256) -> Result<(), String> { 
+	pub fn set_fee(&self, _amount: util::U256) -> Result<bool, String>
+		 {
 		let call = self.contract.function("setFee".into()).map_err(Self::as_string)?;
 		let data = call.encode_call(
 			vec![ethabi::Token::Uint({ let mut r = [0u8; 32]; _amount.to_big_endian(&mut r); r })]
 		).map_err(Self::as_string)?;
-		call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-		
-		Ok(()) 
+		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
+		let mut result = output.into_iter().rev().collect::<Vec<_>>();
+		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r }))
 	}
 
 	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_to","type":"address"}],"name":"transfer","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"}`
 	#[allow(dead_code)]
-	pub fn transfer(&self, _name: &util::H256, _to: &util::Address) -> Result<bool, String> { 
+	pub fn transfer(&self, _name: &util::H256, _to: &util::Address) -> Result<bool, String>
+		 {
 		let call = self.contract.function("transfer".into()).map_err(Self::as_string)?;
 		let data = call.encode_call(
 			vec![ethabi::Token::FixedBytes(_name.as_ref().to_owned()), ethabi::Token::Address(_to.clone().0)]
 		).map_err(Self::as_string)?;
 		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
 		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r })) 
+		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r }))
 	}
 
 	/// Auto-generated from: `{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"}`
 	#[allow(dead_code)]
-	pub fn owner(&self) -> Result<util::Address, String> { 
+	pub fn owner(&self) -> Result<util::Address, String>
+		 {
 		let call = self.contract.function("owner".into()).map_err(Self::as_string)?;
 		let data = call.encode_call(
 			vec![]
 		).map_err(Self::as_string)?;
 		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
 		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_address().ok_or("Invalid type returned")?; util::Address::from(r) })) 
+		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_address().ok_or("Invalid type returned")?; util::Address::from(r) }))
+	}
+
+	/// Auto-generated from: `{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"getData","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"}`
+	#[allow(dead_code)]
+	pub fn get_data(&self, _name: &util::H256, _key: &str) -> Result<util::H256, String>
+		 {
+		let call = self.contract.function("getData".into()).map_err(Self::as_string)?;
+		let data = call.encode_call(
+			vec![ethabi::Token::FixedBytes(_name.as_ref().to_owned()), ethabi::Token::String(_key.to_owned())]
+		).map_err(Self::as_string)?;
+		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
+		let mut result = output.into_iter().rev().collect::<Vec<_>>();
+		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_fixed_bytes().ok_or("Invalid type returned")?; util::H256::from_slice(r.as_ref()) }))
 	}
 
 	/// Auto-generated from: `{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"reserved","outputs":[{"name":"reserved","type":"bool"}],"payable":false,"type":"function"}`
 	#[allow(dead_code)]
-	pub fn reserved(&self, _name: &util::H256) -> Result<bool, String> { 
+	pub fn reserved(&self, _name: &util::H256) -> Result<bool, String>
+		 {
 		let call = self.contract.function("reserved".into()).map_err(Self::as_string)?;
 		let data = call.encode_call(
 			vec![ethabi::Token::FixedBytes(_name.as_ref().to_owned())]
 		).map_err(Self::as_string)?;
 		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
 		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r })) 
+		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r }))
 	}
 
-	/// Auto-generated from: `{"constant":false,"inputs":[],"name":"drain","outputs":[],"payable":false,"type":"function"}`
+	/// Auto-generated from: `{"constant":false,"inputs":[],"name":"drain","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"}`
 	#[allow(dead_code)]
-	pub fn drain(&self) -> Result<(), String> { 
+	pub fn drain(&self) -> Result<bool, String>
+		 {
 		let call = self.contract.function("drain".into()).map_err(Self::as_string)?;
 		let data = call.encode_call(
 			vec![]
 		).map_err(Self::as_string)?;
-		call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
-		
-		Ok(()) 
+		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
+		let mut result = output.into_iter().rev().collect::<Vec<_>>();
+		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r }))
 	}
 
 	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_name","type":"string"},{"name":"_who","type":"address"}],"name":"proposeReverse","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"}`
 	#[allow(dead_code)]
-	pub fn propose_reverse(&self, _name: &str, _who: &util::Address) -> Result<bool, String> { 
+	pub fn propose_reverse(&self, _name: &str, _who: &util::Address) -> Result<bool, String>
+		 {
 		let call = self.contract.function("proposeReverse".into()).map_err(Self::as_string)?;
 		let data = call.encode_call(
 			vec![ethabi::Token::String(_name.to_owned()), ethabi::Token::Address(_who.clone().0)]
 		).map_err(Self::as_string)?;
 		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
 		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r })) 
+		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r }))
 	}
 
-	/// Auto-generated from: `{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"getUint","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"}`
+	/// Auto-generated from: `{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"hasReverse","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"}`
 	#[allow(dead_code)]
-	pub fn get_uint(&self, _name: &util::H256, _key: &str) -> Result<util::U256, String> { 
-		let call = self.contract.function("getUint".into()).map_err(Self::as_string)?;
+	pub fn has_reverse(&self, _name: &util::H256) -> Result<bool, String>
+		 {
+		let call = self.contract.function("hasReverse".into()).map_err(Self::as_string)?;
 		let data = call.encode_call(
-			vec![ethabi::Token::FixedBytes(_name.as_ref().to_owned()), ethabi::Token::String(_key.to_owned())]
+			vec![ethabi::Token::FixedBytes(_name.as_ref().to_owned())]
 		).map_err(Self::as_string)?;
 		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
 		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_uint().ok_or("Invalid type returned")?; util::U256::from(r.as_ref()) })) 
+		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r }))
 	}
 
-	/// Auto-generated from: `{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"get","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"}`
+	/// Auto-generated from: `{"constant":true,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"}],"name":"getUint","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"}`
 	#[allow(dead_code)]
-	pub fn get(&self, _name: &util::H256, _key: &str) -> Result<util::H256, String> { 
-		let call = self.contract.function("get".into()).map_err(Self::as_string)?;
+	pub fn get_uint(&self, _name: &util::H256, _key: &str) -> Result<util::U256, String>
+		 {
+		let call = self.contract.function("getUint".into()).map_err(Self::as_string)?;
 		let data = call.encode_call(
 			vec![ethabi::Token::FixedBytes(_name.as_ref().to_owned()), ethabi::Token::String(_key.to_owned())]
 		).map_err(Self::as_string)?;
 		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
 		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_fixed_bytes().ok_or("Invalid type returned")?; util::H256::from_slice(r.as_ref()) })) 
+		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_uint().ok_or("Invalid type returned")?; util::U256::from(r.as_ref()) }))
 	}
 
 	/// Auto-generated from: `{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"}`
 	#[allow(dead_code)]
-	pub fn fee(&self) -> Result<util::U256, String> { 
+	pub fn fee(&self) -> Result<util::U256, String>
+		 {
 		let call = self.contract.function("fee".into()).map_err(Self::as_string)?;
 		let data = call.encode_call(
 			vec![]
 		).map_err(Self::as_string)?;
 		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
 		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_uint().ok_or("Invalid type returned")?; util::U256::from(r.as_ref()) })) 
+		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_uint().ok_or("Invalid type returned")?; util::U256::from(r.as_ref()) }))
 	}
 
 	/// Auto-generated from: `{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"getOwner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"}`
 	#[allow(dead_code)]
-	pub fn get_owner(&self, _name: &util::H256) -> Result<util::Address, String> { 
+	pub fn get_owner(&self, _name: &util::H256) -> Result<util::Address, String>
+		 {
 		let call = self.contract.function("getOwner".into()).map_err(Self::as_string)?;
 		let data = call.encode_call(
 			vec![ethabi::Token::FixedBytes(_name.as_ref().to_owned())]
 		).map_err(Self::as_string)?;
 		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
 		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_address().ok_or("Invalid type returned")?; util::Address::from(r) })) 
+		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_address().ok_or("Invalid type returned")?; util::Address::from(r) }))
+	}
+
+	/// Auto-generated from: `{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"getReverse","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"}`
+	#[allow(dead_code)]
+	pub fn get_reverse(&self, _name: &util::H256) -> Result<util::Address, String>
+		 {
+		let call = self.contract.function("getReverse".into()).map_err(Self::as_string)?;
+		let data = call.encode_call(
+			vec![ethabi::Token::FixedBytes(_name.as_ref().to_owned())]
+		).map_err(Self::as_string)?;
+		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
+		let mut result = output.into_iter().rev().collect::<Vec<_>>();
+		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_address().ok_or("Invalid type returned")?; util::Address::from(r) }))
 	}
 
-	/// Auto-generated from: `{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"reverse","outputs":[{"name":"","type":"string"}],"payable":false,"type":"function"}`
+	/// Auto-generated from: `{"constant":true,"inputs":[{"name":"_data","type":"address"}],"name":"reverse","outputs":[{"name":"","type":"string"}],"payable":false,"type":"function"}`
 	#[allow(dead_code)]
-	pub fn reverse(&self, _1: &util::Address) -> Result<String, String> { 
+	pub fn reverse(&self, _data: &util::Address) -> Result<String, String>
+		 {
 		let call = self.contract.function("reverse".into()).map_err(Self::as_string)?;
 		let data = call.encode_call(
-			vec![ethabi::Token::Address(_1.clone().0)]
+			vec![ethabi::Token::Address(_data.clone().0)]
 		).map_err(Self::as_string)?;
 		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
 		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_string().ok_or("Invalid type returned")?; r })) 
+		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_string().ok_or("Invalid type returned")?; r }))
 	}
 
 	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"},{"name":"_value","type":"uint256"}],"name":"setUint","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"}`
 	#[allow(dead_code)]
-	pub fn set_uint(&self, _name: &util::H256, _key: &str, _value: util::U256) -> Result<bool, String> { 
+	pub fn set_uint(&self, _name: &util::H256, _key: &str, _value: util::U256) -> Result<bool, String>
+		 {
 		let call = self.contract.function("setUint".into()).map_err(Self::as_string)?;
 		let data = call.encode_call(
 			vec![ethabi::Token::FixedBytes(_name.as_ref().to_owned()), ethabi::Token::String(_key.to_owned()), ethabi::Token::Uint({ let mut r = [0u8; 32]; _value.to_big_endian(&mut r); r })]
 		).map_err(Self::as_string)?;
 		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
 		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r })) 
+		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r }))
+	}
+
+	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_name","type":"string"},{"name":"_who","type":"address"}],"name":"confirmReverseAs","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"}`
+	#[allow(dead_code)]
+	pub fn confirm_reverse_as(&self, _name: &str, _who: &util::Address) -> Result<bool, String>
+		 {
+		let call = self.contract.function("confirmReverseAs".into()).map_err(Self::as_string)?;
+		let data = call.encode_call(
+			vec![ethabi::Token::String(_name.to_owned()), ethabi::Token::Address(_who.clone().0)]
+		).map_err(Self::as_string)?;
+		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
+		let mut result = output.into_iter().rev().collect::<Vec<_>>();
+		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r }))
 	}
 
 	/// Auto-generated from: `{"constant":false,"inputs":[],"name":"removeReverse","outputs":[],"payable":false,"type":"function"}`
 	#[allow(dead_code)]
-	pub fn remove_reverse(&self) -> Result<(), String> { 
+	pub fn remove_reverse(&self) -> Result<(), String>
+		 {
 		let call = self.contract.function("removeReverse".into()).map_err(Self::as_string)?;
 		let data = call.encode_call(
 			vec![]
 		).map_err(Self::as_string)?;
 		call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
 		
-		Ok(()) 
+		Ok(())
 	}
 
 	/// Auto-generated from: `{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_key","type":"string"},{"name":"_value","type":"address"}],"name":"setAddress","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"}`
 	#[allow(dead_code)]
-	pub fn set_address(&self, _name: &util::H256, _key: &str, _value: &util::Address) -> Result<bool, String> { 
+	pub fn set_address(&self, _name: &util::H256, _key: &str, _value: &util::Address) -> Result<bool, String>
+		 {
 		let call = self.contract.function("setAddress".into()).map_err(Self::as_string)?;
 		let data = call.encode_call(
 			vec![ethabi::Token::FixedBytes(_name.as_ref().to_owned()), ethabi::Token::String(_key.to_owned()), ethabi::Token::Address(_value.clone().0)]
 		).map_err(Self::as_string)?;
 		let output = call.decode_output((self.do_call)(self.address.clone(), data)?).map_err(Self::as_string)?;
 		let mut result = output.into_iter().rev().collect::<Vec<_>>();
-		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r })) 
+		Ok(({ let r = result.pop().ok_or("Invalid return arity")?; let r = r.to_bool().ok_or("Invalid type returned")?; r }))
 	}
-}
\ No newline at end of file
+}
+
diff --git a/ethcore/src/ethereum/mod.rs b/ethcore/src/ethereum/mod.rs
index 3d336ce9fd9..63de423ef56 100644
--- a/ethcore/src/ethereum/mod.rs
+++ b/ethcore/src/ethereum/mod.rs
@@ -42,13 +42,13 @@ fn load(b: &[u8]) -> Spec {
 	Spec::load(b).expect("chain spec is invalid")
 }
 
-/// Create a new Olympic chain spec.
+/// Create a new Foundation Olympic chain spec.
 pub fn new_olympic() -> Spec { load(include_bytes!("../../res/ethereum/olympic.json")) }
 
-/// Create a new Frontier mainnet chain spec.
+/// Create a new Foundation Mainnet chain spec.
 pub fn new_foundation() -> Spec { load(include_bytes!("../../res/ethereum/foundation.json")) }
 
-/// Create a new Frontier mainnet chain spec without the DAO hardfork.
+/// Create a new Classic Mainnet chain spec without the DAO hardfork.
 pub fn new_classic() -> Spec { load(include_bytes!("../../res/ethereum/classic.json")) }
 
 /// Create a new Expanse mainnet chain spec.
@@ -57,25 +57,25 @@ pub fn new_expanse() -> Spec { load(include_bytes!("../../res/ethereum/expanse.j
 /// Create a new Kovan testnet chain spec.
 pub fn new_kovan() -> Spec { load(include_bytes!("../../res/ethereum/kovan.json")) }
 
-/// Create a new Frontier chain spec as though it never changes to Homestead.
+/// Create a new Foundation Frontier-era chain spec as though it never changes to Homestead.
 pub fn new_frontier_test() -> Spec { load(include_bytes!("../../res/ethereum/frontier_test.json")) }
 
-/// Create a new Homestead chain spec as though it never changed from Frontier.
+/// Create a new Foundation Homestead-era chain spec as though it never changed from Frontier.
 pub fn new_homestead_test() -> Spec { load(include_bytes!("../../res/ethereum/homestead_test.json")) }
 
-/// Create a new Homestead-EIP150 chain spec as though it never changed from Homestead/Frontier.
+/// Create a new Foundation Homestead-EIP150-era chain spec as though it never changed from Homestead/Frontier.
 pub fn new_eip150_test() -> Spec { load(include_bytes!("../../res/ethereum/eip150_test.json")) }
 
-/// Create a new Homestead-EIP150 chain spec as though it never changed from Homestead/Frontier.
+/// Create a new Foundation Homestead-EIP161-era chain spec as though it never changed from Homestead/Frontier.
 pub fn new_eip161_test() -> Spec { load(include_bytes!("../../res/ethereum/eip161_test.json")) }
 
-/// Create a new Frontier/Homestead/DAO chain spec with transition points at #5 and #8.
+/// Create a new Foundation Frontier/Homestead/DAO chain spec with transition points at #5 and #8.
 pub fn new_transition_test() -> Spec { load(include_bytes!("../../res/ethereum/transition_test.json")) }
 
-/// Create a new Frontier main net chain spec without genesis accounts.
+/// Create a new Foundation Mainnet chain spec without genesis accounts.
 pub fn new_mainnet_like() -> Spec { load(include_bytes!("../../res/ethereum/frontier_like_test.json")) }
 
-/// Create a new Ropsten chain spec.
+/// Create a new Foundation Ropsten chain spec.
 pub fn new_ropsten() -> Spec { load(include_bytes!("../../res/ethereum/ropsten.json")) }
 
 /// Create a new Morden chain spec.
diff --git a/scripts/contractABI.js b/scripts/contractABI.js
index a779ad0a2eb..36bdc6f3b68 100644
--- a/scripts/contractABI.js
+++ b/scripts/contractABI.js
@@ -41,11 +41,11 @@ ${convertContract(name, json, prefs)}
 function convertContract(name, json, prefs) {
 	return `${prefs._pub ? "pub " : ""}struct ${name} {
 	contract: ethabi::Contract,
-	address: util::Address,
+	pub address: util::Address,
 	${prefs._explicit_do_call ? "" : `do_call: Box<Fn(util::Address, Vec<u8>) -> Result<Vec<u8>, String> + Send${prefs._sync ? " + Sync " : ""}+ 'static>,`}
 }
 impl ${name} {
-	pub fn new${prefs._explicit_do_call ? "" : "<F>"}(address: util::Address${prefs._explicit_do_call ? "" : `", do_call: F"`}) -> Self
+	pub fn new${prefs._explicit_do_call ? "" : "<F>"}(address: util::Address${prefs._explicit_do_call ? "" : `, do_call: F`}) -> Self
 		${prefs._explicit_do_call ? "" : `where F: Fn(util::Address, Vec<u8>) -> Result<Vec<u8>, String> + Send ${prefs._sync ? "+ Sync " : ""}+ 'static`} {
 		${name} {
 			contract: ethabi::Contract::new(ethabi::Interface::load(b"${JSON.stringify(json.filter(a => a.type == 'function')).replaceAll('"', '\\"')}").expect("JSON is autogenerated; qed")),
@@ -233,19 +233,23 @@ function convertFunction(json, _prefs) {
 let prefs = {"_pub": true, "_": {"_client": {"string": true}, "_platform": {"string": true}}, "_sync": true};
 // default contract json ABI
 let jsonabi = [{"constant":true,"inputs":[],"name":"getValidators","outputs":[{"name":"","type":"address[]"}],"payable":false,"type":"function"}];
+// default name
+let name = 'Contract';
 
 // parse command line options
 for (let i = 1; i < process.argv.length; ++i) {
 	let arg = process.argv[i];
-	if (arg.indexOf("--jsonabi") == 0) {
+	if (arg.indexOf("--jsonabi=") == 0) {
 		jsonabi = arg.slice(10);
 		if (fs.existsSync(jsonabi)) {
 			jsonabi = JSON.parse(fs.readFileSync(jsonabi).toString());
 		}
 	} else if (arg.indexOf("--explicit-do-call") == 0) {
 		prefs._explicit_do_call = true;
+	} else if (arg.indexOf("--name=") == 0) {
+		name = arg.slice(7);
 	}
 }
 
-let out = makeContractFile("Contract", jsonabi, prefs);
+let out = makeContractFile(name, jsonabi, prefs);
 console.log(`${out}`);