diff --git a/circuits/credentialAtomicQueryV3Universal-16-16-64.circom b/circuits/credentialAtomicQueryV3Universal-16-16-64.circom
index c06fbd5..fa06147 100644
--- a/circuits/credentialAtomicQueryV3Universal-16-16-64.circom
+++ b/circuits/credentialAtomicQueryV3Universal-16-16-64.circom
@@ -14,15 +14,6 @@ circuitQueryHash - hash of the query
 component main{public [requestID,
     issuerID,
     issuerClaimNonRevState,
-    claimSchema,
-    slotIndex,
-    claimPathKey,
-    operator,
-    value,
-    valueArraySize,
     timestamp,
-    isRevocationChecked,
     proofType,
-    verifierID,
-    nullifierSessionID
 ]} = credentialAtomicQueryV3Universal(16, 16, 64); // issuerLevels, claimLevels, maxValueArraySize
diff --git a/circuits/credentialAtomicQueryV3Universal.circom b/circuits/credentialAtomicQueryV3Universal.circom
index 5538023..5e62628 100644
--- a/circuits/credentialAtomicQueryV3Universal.circom
+++ b/circuits/credentialAtomicQueryV3Universal.circom
@@ -14,15 +14,6 @@ circuitQueryHash - hash of the query
 component main{public [requestID,
     issuerID,
     issuerClaimNonRevState,
-    claimSchema,
-    slotIndex,
-    claimPathKey,
-    operator,
-    value,
-    valueArraySize,
     timestamp,
-    isRevocationChecked,
-    proofType,
-    verifierID,
-    nullifierSessionID
+    proofType
 ]} = credentialAtomicQueryV3Universal(40, 32, 64); // issuerLevels, claimLevels, maxValueArraySize
diff --git a/circuits/linkedMultiQuery10.circom b/circuits/linkedMultiQuery.circom
similarity index 100%
rename from circuits/linkedMultiQuery10.circom
rename to circuits/linkedMultiQuery.circom
diff --git a/circuits/universal/credentialAtomicQueryV3Universal.circom b/circuits/universal/credentialAtomicQueryV3Universal.circom
index dc74abc..58092ef 100644
--- a/circuits/universal/credentialAtomicQueryV3Universal.circom
+++ b/circuits/universal/credentialAtomicQueryV3Universal.circom
@@ -122,7 +122,7 @@ template credentialAtomicQueryV3Universal(issuerLevels, claimLevels, maxValueArr
     // on root stored in the index or value slot
     // if it is not set verification is performed on according to the slotIndex. Value selected from the
     // provided slot. For example if slotIndex is `1` value gets from `i_1` slot. If `4` from `v_1`.
-signal {binary} merklized;
+    signal {binary} merklized;
     
     /////////////////////////////////////////////////////////////////
     // Claim checks
diff --git a/test/linked/linked.test.ts b/test/linked/linked.test.ts
index 7b74780..9e18f01 100644
--- a/test/linked/linked.test.ts
+++ b/test/linked/linked.test.ts
@@ -4,7 +4,7 @@ import {describe} from "mocha";
 const path = require("path");
 const wasmTester = require("circom_tester").wasm;
 
-describe("Test linkedMultiQuery10.circom", function () {
+describe("Test linkedMultiQuery.circom", function () {
 
     this.timeout(600000);
 
@@ -12,7 +12,7 @@ describe("Test linkedMultiQuery10.circom", function () {
 
     before(async () => {
         circuit = await wasmTester(
-            path.join(__dirname, "../../circuits", "linkedMultiQuery10.circom"),
+            path.join(__dirname, "../../circuits", "linkedMultiQuery.circom"),
             {
                 output: path.join(__dirname, "circuits", "build"),
                 recompile: true,
diff --git a/testvectorgen/credentials/v3-universal/v3_universal_test.go b/testvectorgen/credentials/v3-universal/v3_universal_test.go
index 03deb9a..0d0c6b4 100644
--- a/testvectorgen/credentials/v3-universal/v3_universal_test.go
+++ b/testvectorgen/credentials/v3-universal/v3_universal_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"math/big"
-	"strconv"
 	"testing"
 
 	"test/utils"
@@ -99,27 +98,17 @@ type Inputs struct {
 }
 
 type Outputs struct {
-	RequestID              string   `json:"requestID"`
-	UserID                 string   `json:"userID"`
-	IssuerID               string   `json:"issuerID"`
-	IssuerClaimNonRevState string   `json:"issuerClaimNonRevState"`
-	ClaimSchema            string   `json:"claimSchema"`
-	SlotIndex              string   `json:"slotIndex"`
-	Operator               int      `json:"operator"`
-	ClaimPathKey           string   `json:"claimPathKey"`
-	Value                  []string `json:"value"`
-	ValueArraySize         int      `json:"valueArraySize"`
-	Timestamp              string   `json:"timestamp"`
-	Merklized              string   `json:"merklized"`
-	ProofType              string   `json:"proofType"` // 1 for sig, 2 for mtp
-	IsRevocationChecked    string   `json:"isRevocationChecked"`
-	IssuerState            string   `json:"issuerState"`
-	LinkID                 string   `json:"linkID"`
-	VerifierID             string   `json:"verifierID"`
-	NullifierSessionID     string   `json:"nullifierSessionID"`
-	OperatorOutput         string   `json:"operatorOutput"`
-	Nullifier              string   `json:"nullifier"`
-	CircuitQueryHash       string   `json:"circuitQueryHash"`
+	RequestID              string `json:"requestID"`
+	UserID                 string `json:"userID"`
+	IssuerID               string `json:"issuerID"`
+	IssuerClaimNonRevState string `json:"issuerClaimNonRevState"`
+	Timestamp              string `json:"timestamp"`
+	ProofType              string `json:"proofType"` // 1 for sig, 2 for mtp
+	IssuerState            string `json:"issuerState"`
+	LinkID                 string `json:"linkID"`
+	OperatorOutput         string `json:"operatorOutput"`
+	Nullifier              string `json:"nullifier"`
+	CircuitQueryHash       string `json:"circuitQueryHash"`
 }
 
 type TestData struct {
@@ -564,21 +553,11 @@ func generateTestDataWithOperatorAndRevCheck(t *testing.T, desc string, isUserID
 		UserID:                 userProfileID.BigInt().String(),
 		IssuerID:               issuer.ID.BigInt().String(),
 		IssuerClaimNonRevState: issuer.State(t).String(),
-		ClaimSchema:            "180410020913331409885634153623124536270",
-		SlotIndex:              strconv.Itoa(slotIndex),
-		ClaimPathKey:           claimPathKey,
-		Operator:               operator,
-		Value:                  valueInput,
-		ValueArraySize:         valueArrSize,
 		Timestamp:              timestamp,
-		Merklized:              merklized,
-		IsRevocationChecked:    strconv.Itoa(isRevocationChecked),
 		ProofType:              proofType,
 		IssuerState:            issuerState,
 		LinkID:                 linkID,
 		OperatorOutput:         operatorOutput,
-		VerifierID:             inputs.VerifierID,
-		NullifierSessionID:     inputs.NullifierSessionID,
 		Nullifier:              nullifier,
 		CircuitQueryHash:       circuitQueryHash,
 	}
@@ -713,20 +692,10 @@ func generateJSONLD_NON_INCLUSION_TestData(t *testing.T, isUserIDProfile, isSubj
 		UserID:                 userProfileID.BigInt().String(),
 		IssuerID:               issuer.ID.BigInt().String(),
 		IssuerClaimNonRevState: issuerClaimNonRevState.String(),
-		ClaimSchema:            "180410020913331409885634153623124536270",
-		SlotIndex:              "0",
-		Operator:               utils.NOOP,
-		ClaimPathKey:           pathKey.String(),
-		Value:                  utils.PrepareStrArray([]string{}, 64),
-		ValueArraySize:         0,
 		Timestamp:              timestamp,
-		Merklized:              "1",
 		IssuerState:            issuerAuthState.String(),
-		IsRevocationChecked:    "1",
 		ProofType:              "1",
 		LinkID:                 "0",
-		VerifierID:             inputs.VerifierID,
-		NullifierSessionID:     inputs.NullifierSessionID,
 		OperatorOutput:         "0",
 		Nullifier:              "0",
 		CircuitQueryHash:       circuitQueryHash,
@@ -740,7 +709,7 @@ func generateJSONLD_NON_INCLUSION_TestData(t *testing.T, isUserIDProfile, isSubj
 	require.NoError(t, err)
 
 	utils.SaveTestVector(t, fileName, string(jsonData))
-}	
+}
 
 func calculateCircuitQueryHash(t *testing.T, inputs Inputs, merklized string, pathKey *big.Int) (string, error) {
 	merklizedBigInt, ok := big.NewInt(0).SetString(merklized, 10)