diff --git a/README.md b/README.md
index dadafcbc6..fe3ec304d 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Ethereum
 
 [![Build Status](https://travis-ci.org/ethereum/go-ethereum.png?branch=master)](https://travis-ci.org/ethereum/go-ethereum)
 
-Ethereum Go (c) [0255c7881](https://github.com/ethereum/go-ethereum#copy)
+Ethereum Go developer client (c) [0255c7881](https://github.com/ethereum/go-ethereum#copy)
 
 A fair warning; Ethereum is not yet to be used in production. There's no
 test-net and you aren't mining real blocks (just one which is the genesis block).
diff --git a/dev_console.go b/dev_console.go
index 1817ca9a8..6beafc447 100644
--- a/dev_console.go
+++ b/dev_console.go
@@ -122,7 +122,7 @@ func (i *Console) ParseInput(input string) bool {
 			fmt.Printf("%q\n", d)
 		case "getaddr":
 			encoded, _ := hex.DecodeString(tokens[1])
-			d := i.ethereum.BlockManager.BlockChain().LastBlock.State().Get(string(encoded))
+			d := i.ethereum.BlockManager.CurrentBlock.State().Get(string(encoded))
 			if d != "" {
 				decoder := ethutil.NewRlpDecoder([]byte(d))
 				fmt.Println(decoder)
diff --git a/ethereum.go b/ethereum.go
index 2d79659b0..e434f3c8e 100644
--- a/ethereum.go
+++ b/ethereum.go
@@ -95,7 +95,7 @@ func main() {
 				time.Sleep(blockTime * time.Second)
 
 				block := ethchain.CreateBlock(
-					ethereum.BlockManager.BlockChain().LastBlock.State().Root,
+					ethereum.BlockManager.CurrentBlock.State().Root,
 					ethereum.BlockManager.LastBlockHash,
 					"123",
 					big.NewInt(1),