diff --git a/src/transaction/makeOutput.js b/src/transaction/makeOutput.js
index 5edf426..d937570 100644
--- a/src/transaction/makeOutput.js
+++ b/src/transaction/makeOutput.js
@@ -17,7 +17,7 @@ export default function makeOutput(condition, amount = '1') {
                 publicKeys.push(details.public_key)
             }
         } else if (details.type === 'threshold-sha-256') {
-            details.subfulfillments.map(getPublicKeys)
+            details.subconditions.map(getPublicKeys)
         }
     }
     getPublicKeys(condition.details)
diff --git a/src/transaction/utils/ccJsonLoad.js b/src/transaction/utils/ccJsonLoad.js
index 5e9a02f..941dfae 100644
--- a/src/transaction/utils/ccJsonLoad.js
+++ b/src/transaction/utils/ccJsonLoad.js
@@ -22,12 +22,12 @@ export default function ccJsonLoad(conditionJson) {
         if (conditionJson.type === 'threshold-sha-256') {
             fulfillment = new cc.ThresholdSha256()
             fulfillment.threshold = conditionJson.threshold
-            conditionJson.subfulfillments.forEach((subfulfillmentJson) => {
-                const subfulfillment = ccJsonLoad(subfulfillmentJson)
-                if ('getConditionUri' in subfulfillment) {
-                    fulfillment.addSubfulfillment(subfulfillment)
-                } else if ('serializeUri' in subfulfillment) {
-                    fulfillment.addSubcondition(subfulfillment)
+            conditionJson.subconditions.forEach((subconditionJson) => {
+                const subcondition = ccJsonLoad(subconditionJson)
+                if ('getConditionUri' in subcondition) {
+                    fulfillment.addSubfulfillment(subcondition)
+                } else if ('serializeUri' in subcondition) {
+                    fulfillment.addSubcondition(subcondition)
                 }
             })
         }
@@ -35,9 +35,6 @@ export default function ccJsonLoad(conditionJson) {
         if (conditionJson.type === 'ed25519-sha-256') {
             fulfillment = new cc.Ed25519Sha256()
             fulfillment.publicKey = new Buffer(base58.decode(conditionJson.public_key))
-            if (conditionJson.signature) {
-                fulfillment.signature = new Buffer(base58.decode(conditionJson.signature))
-            }
         }
         return fulfillment
     }
diff --git a/src/transaction/utils/ccJsonify.js b/src/transaction/utils/ccJsonify.js
index a33d0b6..3325c6c 100644
--- a/src/transaction/utils/ccJsonify.js
+++ b/src/transaction/utils/ccJsonify.js
@@ -35,7 +35,7 @@ export default function ccJsonify(fulfillment) {
             'details': {
                 'type': 'threshold-sha-256',
                 'threshold': fulfillment.threshold,
-                'subfulfillments': fulfillment.subconditions.map((subcondition) => {
+                'subconditions': fulfillment.subconditions.map((subcondition) => {
                     const subconditionJson = ccJsonify(subcondition.body)
                     return subconditionJson.details
                 })
@@ -48,7 +48,6 @@ export default function ccJsonify(fulfillment) {
         jsonBody.details.type = 'ed25519-sha-256'
 
         if ('publicKey' in fulfillment) {
-            jsonBody.details.signature = null
             jsonBody.details.public_key = base58.encode(fulfillment.publicKey)
         }
     }
diff --git a/test/transaction/test_cryptoconditions.js b/test/transaction/test_cryptoconditions.js
index 4419451..2c11054 100644
--- a/test/transaction/test_cryptoconditions.js
+++ b/test/transaction/test_cryptoconditions.js
@@ -9,7 +9,6 @@ test('Ed25519 condition encoding', t => {
         details: {
             type: 'ed25519-sha-256',
             public_key: publicKey,
-            signature: null,
         },
         uri: 'ni:///sha-256;uLdVX7FEjLWVDkAkfMAkEqPPwFqZj7qfiGE152t_x5c?fpt=ed25519-sha-256&cost=131072'
     }
@@ -28,16 +27,14 @@ test('Threshold condition encoding', t => {
             details: {
                 type: 'threshold-sha-256',
                 threshold: 1,
-                subfulfillments: [
+                subconditions: [
                     {
                         type: 'ed25519-sha-256',
                         public_key: publicKey,
-                        signature: null,
                     },
                     {
                         type: 'ed25519-sha-256',
                         public_key: publicKey,
-                        signature: null,
                     }
                 ]
             },