diff --git a/pkg/onions/adaddress/address.go b/pkg/onions/adaddress/adaddress.go
similarity index 98%
rename from pkg/onions/adaddress/address.go
rename to pkg/onions/adaddress/adaddress.go
index e2436b8a..2caa9628 100644
--- a/pkg/onions/adaddress/address.go
+++ b/pkg/onions/adaddress/adaddress.go
@@ -68,9 +68,7 @@ func (x *Ad) Decode(s *splice.Splice) (e error) {
 }
 
 func (x *Ad) Encode(s *splice.Splice) (e error) {
-	log.T.S("encoding", reflect.TypeOf(x),
-		x.ID, x.Sig,
-	)
+	log.T.S("encoding", reflect.TypeOf(x), x)
 	x.Splice(s)
 	return
 }
diff --git a/pkg/onions/adaddress/address_test.go b/pkg/onions/adaddress/adaddress_test.go
similarity index 96%
rename from pkg/onions/adaddress/address_test.go
rename to pkg/onions/adaddress/adaddress_test.go
index 333109a7..2243a056 100644
--- a/pkg/onions/adaddress/address_test.go
+++ b/pkg/onions/adaddress/adaddress_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/indra-labs/indra/pkg/util/splice"
 	"github.com/multiformats/go-multiaddr"
 	"testing"
+	"time"
 )
 
 func TestNew(t *testing.T) {
@@ -23,7 +24,7 @@ func TestNew(t *testing.T) {
 	if ma, e = multiaddr.NewMultiaddr("/ip4/127.0.0.1/tcp/4242"); fails(e) {
 		t.FailNow()
 	}
-	aa := New(id, pr, ma)
+	aa := New(id, pr, ma, time.Now().Add(time.Hour*24*7))
 	s := splice.New(aa.Len())
 	if e = aa.Encode(s); fails(e) {
 		t.FailNow()
diff --git a/pkg/onions/adpeer/adpeer.go b/pkg/onions/adpeer/adpeer.go
index 06f7851f..780ae2e4 100644
--- a/pkg/onions/adpeer/adpeer.go
+++ b/pkg/onions/adpeer/adpeer.go
@@ -24,7 +24,7 @@ var (
 )
 
 const (
-	Magic = "peer"
+	Magic = "pead"
 	Len   = adproto.Len +
 		slice.Uint32Len
 )
diff --git a/pkg/onions/adproto/adproto.go b/pkg/onions/adproto/adproto.go
index 6701676b..d7e922e8 100644
--- a/pkg/onions/adproto/adproto.go
+++ b/pkg/onions/adproto/adproto.go
@@ -23,7 +23,7 @@ var (
 )
 
 const (
-	Magic = "prot"
+	Magic = "prad"
 	Len   = magic.Len +
 		nonce.IDLen +
 		crypto.PubKeyLen +