diff --git a/circuits/circuits/ofac/ofac_name.circom b/circuits/circuits/ofac/ofac_name.circom
index 919cfa927..6c45fee17 100644
--- a/circuits/circuits/ofac/ofac_name.circom
+++ b/circuits/circuits/ofac/ofac_name.circom
@@ -7,7 +7,7 @@ include "../utils/getCommonLength.circom";
 include "../utils/validatePassport.circom";
 include "../utils/smt.circom";
 
-template ProveNameNotInOfac(nLevels) {
+template OFAC_NAME(nLevels) {
     signal input secret;
     signal input attestation_id;
     signal input pubkey_leaf;
@@ -49,4 +49,4 @@ template ProveNameNotInOfac(nLevels) {
     
 }
 
-component main { public [ merkle_root,smt_root ] } = ProveNameNotInOfac(16);
+component main { public [ merkle_root,smt_root ] } = OFAC_NAME(16);
diff --git a/circuits/circuits/ofac/ofac_nameDob.circom b/circuits/circuits/ofac/ofac_name_dob.circom
similarity index 94%
rename from circuits/circuits/ofac/ofac_nameDob.circom
rename to circuits/circuits/ofac/ofac_name_dob.circom
index 22c4332d0..54a71db7c 100644
--- a/circuits/circuits/ofac/ofac_nameDob.circom
+++ b/circuits/circuits/ofac/ofac_name_dob.circom
@@ -8,7 +8,7 @@ include "../utils/getCommonLength.circom";
 include "../utils/validatePassport.circom";
 include "../utils/smt.circom";
 
-template ProveNameDobNotInOfac(nLevels) {
+template OFAC_NAME_DOB(nLevels) {
     signal input secret;
     signal input attestation_id;
     signal input pubkey_leaf;
@@ -56,4 +56,4 @@ template ProveNameDobNotInOfac(nLevels) {
     proofLevel <== 2;
 }
 
-component main { public [ merkle_root,smt_root ] } = ProveNameDobNotInOfac(16);
+component main { public [ merkle_root,smt_root ] } = OFAC_NAME_DOB(16);
diff --git a/circuits/circuits/ofac/ofac_passportNo.circom b/circuits/circuits/ofac/ofac_passport_number.circom
similarity index 93%
rename from circuits/circuits/ofac/ofac_passportNo.circom
rename to circuits/circuits/ofac/ofac_passport_number.circom
index fd6180389..832732867 100644
--- a/circuits/circuits/ofac/ofac_passportNo.circom
+++ b/circuits/circuits/ofac/ofac_passport_number.circom
@@ -9,7 +9,7 @@ include "../utils/getCommonLength.circom";
 include "../utils/validatePassport.circom";
 include "../utils/smt.circom";
 
-template ProvePassportNotInOfac(nLevels) {
+template OFAC_PASSPORT_NUMBER(nLevels) {
     signal input secret;
     signal input attestation_id;
     signal input pubkey_leaf;
@@ -45,4 +45,4 @@ template ProvePassportNotInOfac(nLevels) {
     proofLevel <== 3;
 }
 
-component main { public [ merkle_root,smt_root ] } = ProvePassportNotInOfac(16);
+component main { public [ merkle_root,smt_root ] } = OFAC_PASSPORT_NUMBER(16);
diff --git a/circuits/tests/ofac/ofac_verify.test.ts b/circuits/tests/ofac/ofac.test.ts
similarity index 96%
rename from circuits/tests/ofac/ofac_verify.test.ts
rename to circuits/tests/ofac/ofac.test.ts
index d77b66f7d..6dde2708d 100644
--- a/circuits/tests/ofac/ofac_verify.test.ts
+++ b/circuits/tests/ofac/ofac.test.ts
@@ -77,7 +77,7 @@ tree.insert(BigInt(mockInputs.commitment));
 // 3. Invalid proof : Correct path but wrong corresponding siblings ; fails due to calculatedRoot != smt_root
 
 // Level 3 : Passport match in OfacList
-describe('start testing ofac_passportNo_verifier.circom', function () {
+describe('start testing ofac_passport_number.circom', function () {
   this.timeout(0);
   let passno_smt = new SMT(hash, true);
   let memSmtInputs: any;
@@ -85,7 +85,7 @@ describe('start testing ofac_passportNo_verifier.circom', function () {
 
   before(async () => {
     circuit = await wasm_tester(
-      path.join(__dirname, '../../circuits/ofac/ofac_passportNo_verifier.circom'),
+      path.join(__dirname, '../../circuits/ofac/ofac_passport_number.circom'),
       {
         include: [
           'node_modules',
@@ -167,7 +167,7 @@ describe('start testing ofac_passportNo_verifier.circom', function () {
 });
 
 // Level 2 : NameDob match in OfacList
-describe('start testing ofac_nameDob_verifier.circom', function () {
+describe('start testing ofac_name_dob.circom', function () {
   this.timeout(0);
   let namedob_smt = new SMT(hash, true);
   let memSmtInputs: any;
@@ -175,7 +175,7 @@ describe('start testing ofac_nameDob_verifier.circom', function () {
 
   before(async () => {
     circuit = await wasm_tester(
-      path.join(__dirname, '../../circuits/ofac/ofac_nameDob_verifier.circom'),
+      path.join(__dirname, '../../circuits/ofac/ofac_name_dob.circom'),
       {
         include: [
           'node_modules',
@@ -257,7 +257,7 @@ describe('start testing ofac_nameDob_verifier.circom', function () {
 });
 
 // Level 1 : Name match in OfacList
-describe('start testing ofac_name_verifier.circom', function () {
+describe('start testing ofac_name.circom', function () {
   this.timeout(0);
   let name_smt = new SMT(hash, true);
   let memSmtInputs: any;
@@ -265,7 +265,7 @@ describe('start testing ofac_name_verifier.circom', function () {
 
   before(async () => {
     circuit = await wasm_tester(
-      path.join(__dirname, '../../circuits/ofac/ofac_name_verifier.circom'),
+      path.join(__dirname, '../../circuits/ofac/ofac_name.circom'),
       {
         include: [
           'node_modules',