diff --git a/lockable.go b/lockable.go
index 235fbbf..806544a 100644
--- a/lockable.go
+++ b/lockable.go
@@ -69,7 +69,7 @@ type BaseLockableStateJSON struct {
   Owner *NodeID `json:"owner"`
   Dependencies []NodeID `json:"dependencies"`
   Requirements []NodeID `json:"requirements"`
-  HolderState *BaseLockHolderState `json:"holder_state"`
+  HolderState *BaseLockHolderState `json:"holder"`
 }
 
 func (state * BaseLockableState) MarshalJSON() ([]byte, error) {
diff --git a/thread.go b/thread.go
index 96d82e1..03ced49 100644
--- a/thread.go
+++ b/thread.go
@@ -73,7 +73,7 @@ type BaseThreadState struct {
 type BaseThreadStateJSON struct {
   Parent *NodeID `json:"parent"`
   Children map[NodeID]interface{} `json:"children"`
-  LockableState *BaseLockableState `json:"lockable_state"`
+  LockableState *BaseLockableState `json:"lockable"`
 }
 
 func (state * BaseThreadState) MarshalJSON() ([]byte, error) {