Connect traces via longjohn
Rename internal structs