diff --git a/varion/network.config b/varion/network.config
index 6f908e78..36f81ffa 100644
--- a/varion/network.config
+++ b/varion/network.config
@@ -29,7 +29,7 @@ CC_SRC_LANGUAGE="go"
 CC_VERSION="1.0.1"
 
 # chaincode name defaults to "NA" (-ccn)
-CC_NAME="varion"
+CC_NAME="varion-contract"
 
 # default to running the docker commands for the CCAAS (-ccaasdocker)
 CCAAS_DOCKER_RUN=true
diff --git a/varion/scripts/deployCC.sh b/varion/scripts/deployCC.sh
index 25f1e664..52d977c8 100755
--- a/varion/scripts/deployCC.sh
+++ b/varion/scripts/deployCC.sh
@@ -112,10 +112,7 @@ approveForMyOrg export
 commitChaincodeDefinition farmer pulper huller export
 
 ## query on both orgs to see that the definition committed successfully
-queryCommitted farmer
-queryCommitted pulper
-queryCommitted huller
-queryCommitted export
+queryCommitted farmer pulper huller export
 
 ## Invoke the chaincode - this does require that the chaincode have the 'initLedger'
 ## method defined
diff --git a/varion/scripts/envVar.sh b/varion/scripts/envVar.sh
index dca494d0..f7f39aee 100755
--- a/varion/scripts/envVar.sh
+++ b/varion/scripts/envVar.sh
@@ -32,12 +32,10 @@ setGlobals() {
   else
     USING_ORG="${OVERRIDE_ORG}"
   fi
-  infoln "Using organization ${USING_ORG}"
   if [ $USING_ORG == "farmer" ]; then
     export CORE_PEER_LOCALMSPID=FarmerMSP
     export CORE_PEER_TLS_ROOTCERT_FILE=$PEER0_FARMER_CA
     export CORE_PEER_MSPCONFIGPATH=${TEST_NETWORK_HOME}/organizations/peerOrganizations/farmer.varion.com/users/Admin@farmer.varion.com/msp
-    infoln "mspconfigpath = ${CORE_PEER_MSPCONFIGPATH}"
     export CORE_PEER_ADDRESS=localhost:7051
   elif [ $USING_ORG == "pulper" ]; then
     export CORE_PEER_LOCALMSPID=PulperMSP
@@ -75,13 +73,21 @@ parsePeerConnectionParameters() {
     ## Set peer addresses
     if [ -z "$PEERS" ]
     then
-	PEERS="$PEER"
+    	PEERS="$PEER"
     else
-	PEERS="$PEERS $PEER"
+	    PEERS="$PEERS $PEER"
     fi
     PEER_CONN_PARMS=("${PEER_CONN_PARMS[@]}" --peerAddresses $CORE_PEER_ADDRESS)
     ## Set path to TLS certificate
-    CA=PEER0_$1_CA
+    if [ $1 == "farmer" ]; then
+      CA=PEER0_FARMER_CA
+    elif [ $1 == "pulper" ]; then
+      CA=PEER0_PULPER_CA
+    elif [ $1 == "huller" ]; then
+      CA=PEER0_HULLER_CA
+    elif [ $1 == "export" ]; then
+      CA=PEER0_EXPORT_CA
+    fi
     TLSINFO=(--tlsRootCertFiles "${!CA}")
     PEER_CONN_PARMS=("${PEER_CONN_PARMS[@]}" "${TLSINFO[@]}")
     # shift by one to get to the next organization