diff --git a/cmd/yggdrasil/main.go b/cmd/yggdrasil/main.go
index 9278867b..fd8cd7b6 100644
--- a/cmd/yggdrasil/main.go
+++ b/cmd/yggdrasil/main.go
@@ -189,8 +189,8 @@ func main() {
 	var err error
 	switch {
 	case *version:
-		fmt.Println("Build name:", yggdrasil.GetBuildName())
-		fmt.Println("Build version:", yggdrasil.GetBuildVersion())
+		fmt.Println("Build name:", yggdrasil.BuildName())
+		fmt.Println("Build version:", yggdrasil.BuildVersion())
 		os.Exit(0)
 	case *autoconf:
 		// Use an autoconf-generated config, this will give us random keys and
@@ -269,8 +269,8 @@ func main() {
 	}()
 	// Make some nice output that tells us what our IPv6 address and subnet are.
 	// This is just logged to stdout for the user.
-	address := n.core.GetAddress()
-	subnet := n.core.GetSubnet()
+	address := n.core.Address()
+	subnet := n.core.Subnet()
 	logger.Infof("Your IPv6 address is %s", address.String())
 	logger.Infof("Your IPv6 subnet is %s", subnet.String())
 	// Catch interrupts from the operating system to exit gracefully.
diff --git a/src/yggdrasil/admin.go b/src/yggdrasil/admin.go
index 2db7ad4c..a9595f8c 100644
--- a/src/yggdrasil/admin.go
+++ b/src/yggdrasil/admin.go
@@ -642,14 +642,14 @@ func (a *admin) getData_getSelf() *admin_nodeInfo {
 	coords := table.self.getCoords()
 	self := admin_nodeInfo{
 		{"box_pub_key", hex.EncodeToString(a.core.boxPub[:])},
-		{"ip", a.core.GetAddress().String()},
-		{"subnet", a.core.GetSubnet().String()},
+		{"ip", a.core.Address().String()},
+		{"subnet", a.core.Subnet().String()},
 		{"coords", fmt.Sprint(coords)},
 	}
-	if name := GetBuildName(); name != "unknown" {
+	if name := BuildName(); name != "unknown" {
 		self = append(self, admin_pair{"build_name", name})
 	}
-	if version := GetBuildVersion(); version != "unknown" {
+	if version := BuildVersion(); version != "unknown" {
 		self = append(self, admin_pair{"build_version", version})
 	}
 
diff --git a/src/yggdrasil/core.go b/src/yggdrasil/core.go
index 8444050d..c0548e2b 100644
--- a/src/yggdrasil/core.go
+++ b/src/yggdrasil/core.go
@@ -267,12 +267,12 @@ func (c *Core) NewSigningKeys() (*crypto.SigPubKey, *crypto.SigPrivKey) {
 
 // NodeID gets the node ID.
 func (c *Core) NodeID() *crypto.NodeID {
-	return crypto.NodeID(&c.boxPub)
+	return crypto.GetNodeID(&c.boxPub)
 }
 
 // TreeID gets the tree ID.
 func (c *Core) TreeID() *crypto.TreeID {
-	return crypto.TreeID(&c.sigPub)
+	return crypto.GetTreeID(&c.sigPub)
 }
 
 // Address gets the IPv6 address of the Yggdrasil node. This is always a /128
diff --git a/src/yggdrasil/dht.go b/src/yggdrasil/dht.go
index 5427aca9..b081c92d 100644
--- a/src/yggdrasil/dht.go
+++ b/src/yggdrasil/dht.go
@@ -86,7 +86,7 @@ func (t *dht) init(c *Core) {
 			e <- nil
 		}
 	}()
-	t.nodeID = *t.core.GetNodeID()
+	t.nodeID = *t.core.NodeID()
 	t.peers = make(chan *dhtInfo, 1024)
 	t.callbacks = make(map[dhtReqKey]dht_callbackInfo)
 	t.reset()
diff --git a/src/yggdrasil/nodeinfo.go b/src/yggdrasil/nodeinfo.go
index 963a2fc2..89b8b89f 100644
--- a/src/yggdrasil/nodeinfo.go
+++ b/src/yggdrasil/nodeinfo.go
@@ -101,8 +101,8 @@ func (m *nodeinfo) setNodeInfo(given interface{}, privacy bool) error {
 	m.myNodeInfoMutex.Lock()
 	defer m.myNodeInfoMutex.Unlock()
 	defaults := map[string]interface{}{
-		"buildname":     GetBuildName(),
-		"buildversion":  GetBuildVersion(),
+		"buildname":     BuildName(),
+		"buildversion":  BuildVersion(),
 		"buildplatform": runtime.GOOS,
 		"buildarch":     runtime.GOARCH,
 	}