More dancing around wpt structures
Handle json naming correctly