Rename pubkey to public_key