diff --git a/sway-core/src/language/ty/ast_node.rs b/sway-core/src/language/ty/ast_node.rs
index f988836d757..09bfe0f0b4f 100644
--- a/sway-core/src/language/ty/ast_node.rs
+++ b/sway-core/src/language/ty/ast_node.rs
@@ -125,12 +125,12 @@ impl TypeCheckFinalization for TyAstNode {
 }
 
 impl CollectTypesMetadata for TyAstNode {
-    fn collect_types_metadata(
+    fn collect_metadata_types(
         &self,
         handler: &Handler,
         ctx: &mut CollectTypesMetadataContext,
     ) -> Result<Vec<TypeMetadata>, ErrorEmitted> {
-        self.content.collect_types_metadata(handler, ctx)
+        self.content.collect_metadata_types(handler, ctx)
     }
 }
 
@@ -409,15 +409,15 @@ impl TypeCheckFinalization for TyAstNodeContent {
 }
 
 impl CollectTypesMetadata for TyAstNodeContent {
-    fn collect_types_metadata(
+    fn collect_metadata_types(
         &self,
         handler: &Handler,
         ctx: &mut CollectTypesMetadataContext,
     ) -> Result<Vec<TypeMetadata>, ErrorEmitted> {
         use TyAstNodeContent::*;
         match self {
-            Declaration(decl) => decl.collect_types_metadata(handler, ctx),
-            Expression(expr) => expr.collect_types_metadata(handler, ctx),
+            Declaration(decl) => decl.collect_metadata_types(handler, ctx),
+            Expression(expr) => expr.collect_metadata_types(handler, ctx),
             SideEffect(_) => Ok(vec![]),
             Error(_, _) => Ok(vec![]),
         }
diff --git a/sway-core/src/language/ty/declaration/declaration.rs b/sway-core/src/language/ty/declaration/declaration.rs
index e3adb11ce4e..470d65a7572 100644
--- a/sway-core/src/language/ty/declaration/declaration.rs
+++ b/sway-core/src/language/ty/declaration/declaration.rs
@@ -396,7 +396,7 @@ impl DebugWithEngines for TyDecl {
 
 impl CollectTypesMetadata for TyDecl {
     // this is only run on entry nodes, which must have all well-formed types
-    fn collect_types_metadata(
+    fn collect_metadata_types(
         &self,
         handler: &Handler,
         ctx: &mut CollectTypesMetadataContext,
@@ -404,24 +404,24 @@ impl CollectTypesMetadata for TyDecl {
         let decl_engine = ctx.engines.de();
         let metadata = match self {
             TyDecl::VariableDecl(decl) => {
-                let mut body = decl.body.collect_types_metadata(handler, ctx)?;
+                let mut body = decl.body.collect_metadata_types(handler, ctx)?;
                 body.append(
                     &mut decl
                         .type_ascription
                         .type_id
-                        .collect_types_metadata(handler, ctx)?,
+                        .collect_metadata_types(handler, ctx)?,
                 );
                 body
             }
             TyDecl::FunctionDecl(FunctionDecl { decl_id, .. }) => {
                 let decl = decl_engine.get_function(decl_id);
-                decl.collect_types_metadata(handler, ctx)?
+                decl.collect_metadata_types(handler, ctx)?
             }
             TyDecl::ConstantDecl(ConstantDecl { decl_id, .. }) => {
                 let decl = decl_engine.get_constant(decl_id);
                 let TyConstantDecl { value, .. } = &*decl;
                 if let Some(value) = value {
-                    value.collect_types_metadata(handler, ctx)?
+                    value.collect_metadata_types(handler, ctx)?
                 } else {
                     return Ok(vec![]);
                 }
@@ -430,7 +430,7 @@ impl CollectTypesMetadata for TyDecl {
                 let decl = decl_engine.get_configurable(decl_id);
                 let TyConfigurableDecl { value, .. } = &*decl;
                 if let Some(value) = value {
-                    value.collect_types_metadata(handler, ctx)?
+                    value.collect_metadata_types(handler, ctx)?
                 } else {
                     return Ok(vec![]);
                 }
diff --git a/sway-core/src/language/ty/declaration/function.rs b/sway-core/src/language/ty/declaration/function.rs
index f6304845c35..a6dba082b1e 100644
--- a/sway-core/src/language/ty/declaration/function.rs
+++ b/sway-core/src/language/ty/declaration/function.rs
@@ -249,30 +249,30 @@ impl MonomorphizeHelper for TyFunctionDecl {
 }
 
 impl CollectTypesMetadata for TyFunctionDecl {
-    fn collect_types_metadata(
+    fn collect_metadata_types(
         &self,
         handler: &Handler,
         ctx: &mut CollectTypesMetadataContext,
     ) -> Result<Vec<TypeMetadata>, ErrorEmitted> {
         let mut body = vec![];
         for content in self.body.contents.iter() {
-            body.append(&mut content.collect_types_metadata(handler, ctx)?);
+            body.append(&mut content.collect_metadata_types(handler, ctx)?);
         }
         body.append(
             &mut self
                 .return_type
                 .type_id
-                .collect_types_metadata(handler, ctx)?,
+                .collect_metadata_types(handler, ctx)?,
         );
         for type_param in self.type_parameters.iter() {
-            body.append(&mut type_param.type_id.collect_types_metadata(handler, ctx)?);
+            body.append(&mut type_param.type_id.collect_metadata_types(handler, ctx)?);
         }
         for param in self.parameters.iter() {
             body.append(
                 &mut param
                     .type_argument
                     .type_id
-                    .collect_types_metadata(handler, ctx)?,
+                    .collect_metadata_types(handler, ctx)?,
             );
         }
         Ok(body)
diff --git a/sway-core/src/language/ty/expression/expression.rs b/sway-core/src/language/ty/expression/expression.rs
index fc1b1b3a0f5..79184c88920 100644
--- a/sway-core/src/language/ty/expression/expression.rs
+++ b/sway-core/src/language/ty/expression/expression.rs
@@ -128,14 +128,14 @@ impl TypeCheckFinalization for TyExpression {
 }
 
 impl CollectTypesMetadata for TyExpression {
-    fn collect_types_metadata(
+    fn collect_metadata_types(
         &self,
         handler: &Handler,
         ctx: &mut CollectTypesMetadataContext,
     ) -> Result<Vec<TypeMetadata>, ErrorEmitted> {
         use TyExpressionVariant::*;
         let decl_engine = ctx.engines.de();
-        let mut res = self.return_type.collect_types_metadata(handler, ctx)?;
+        let mut res = self.return_type.collect_metadata_types(handler, ctx)?;
         match &self.expression {
             FunctionApplication {
                 arguments,
@@ -144,7 +144,7 @@ impl CollectTypesMetadata for TyExpression {
                 ..
             } => {
                 for arg in arguments.iter() {
-                    res.append(&mut arg.1.collect_types_metadata(handler, ctx)?);
+                    res.append(&mut arg.1.collect_metadata_types(handler, ctx)?);
                 }
                 let function_decl = decl_engine.get_function(fn_ref);
 
@@ -154,19 +154,19 @@ impl CollectTypesMetadata for TyExpression {
                 }
 
                 for content in function_decl.body.contents.iter() {
-                    res.append(&mut content.collect_types_metadata(handler, ctx)?);
+                    res.append(&mut content.collect_metadata_types(handler, ctx)?);
                 }
                 ctx.call_site_pop();
             }
             Tuple { fields } => {
                 for field in fields.iter() {
-                    res.append(&mut field.collect_types_metadata(handler, ctx)?);
+                    res.append(&mut field.collect_metadata_types(handler, ctx)?);
                 }
             }
             AsmExpression { registers, .. } => {
                 for register in registers.iter() {
                     if let Some(init) = register.initializer.as_ref() {
-                        res.append(&mut init.collect_types_metadata(handler, ctx)?);
+                        res.append(&mut init.collect_metadata_types(handler, ctx)?);
                     }
                 }
             }
@@ -187,42 +187,42 @@ impl CollectTypesMetadata for TyExpression {
                     }
                 }
                 for field in fields.iter() {
-                    res.append(&mut field.value.collect_types_metadata(handler, ctx)?);
+                    res.append(&mut field.value.collect_metadata_types(handler, ctx)?);
                 }
             }
             LazyOperator { lhs, rhs, .. } => {
-                res.append(&mut lhs.collect_types_metadata(handler, ctx)?);
-                res.append(&mut rhs.collect_types_metadata(handler, ctx)?);
+                res.append(&mut lhs.collect_metadata_types(handler, ctx)?);
+                res.append(&mut rhs.collect_metadata_types(handler, ctx)?);
             }
             Array {
                 elem_type: _,
                 contents,
             } => {
                 for content in contents.iter() {
-                    res.append(&mut content.collect_types_metadata(handler, ctx)?);
+                    res.append(&mut content.collect_metadata_types(handler, ctx)?);
                 }
             }
             ArrayIndex { prefix, index } => {
-                res.append(&mut (**prefix).collect_types_metadata(handler, ctx)?);
-                res.append(&mut (**index).collect_types_metadata(handler, ctx)?);
+                res.append(&mut (**prefix).collect_metadata_types(handler, ctx)?);
+                res.append(&mut (**index).collect_metadata_types(handler, ctx)?);
             }
             CodeBlock(block) => {
                 for content in block.contents.iter() {
-                    res.append(&mut content.collect_types_metadata(handler, ctx)?);
+                    res.append(&mut content.collect_metadata_types(handler, ctx)?);
                 }
             }
             MatchExp { desugared, .. } => {
-                res.append(&mut desugared.collect_types_metadata(handler, ctx)?)
+                res.append(&mut desugared.collect_metadata_types(handler, ctx)?)
             }
             IfExp {
                 condition,
                 then,
                 r#else,
             } => {
-                res.append(&mut condition.collect_types_metadata(handler, ctx)?);
-                res.append(&mut then.collect_types_metadata(handler, ctx)?);
+                res.append(&mut condition.collect_metadata_types(handler, ctx)?);
+                res.append(&mut then.collect_metadata_types(handler, ctx)?);
                 if let Some(r#else) = r#else {
-                    res.append(&mut r#else.collect_types_metadata(handler, ctx)?);
+                    res.append(&mut r#else.collect_metadata_types(handler, ctx)?);
                 }
             }
             StructFieldAccess {
@@ -230,16 +230,16 @@ impl CollectTypesMetadata for TyExpression {
                 resolved_type_of_parent,
                 ..
             } => {
-                res.append(&mut prefix.collect_types_metadata(handler, ctx)?);
-                res.append(&mut resolved_type_of_parent.collect_types_metadata(handler, ctx)?);
+                res.append(&mut prefix.collect_metadata_types(handler, ctx)?);
+                res.append(&mut resolved_type_of_parent.collect_metadata_types(handler, ctx)?);
             }
             TupleElemAccess {
                 prefix,
                 resolved_type_of_parent,
                 ..
             } => {
-                res.append(&mut prefix.collect_types_metadata(handler, ctx)?);
-                res.append(&mut resolved_type_of_parent.collect_types_metadata(handler, ctx)?);
+                res.append(&mut prefix.collect_metadata_types(handler, ctx)?);
+                res.append(&mut resolved_type_of_parent.collect_metadata_types(handler, ctx)?);
             }
             EnumInstantiation {
                 enum_ref,
@@ -252,55 +252,55 @@ impl CollectTypesMetadata for TyExpression {
                     ctx.call_site_insert(type_param.type_id, call_path_binding.inner.suffix.span())
                 }
                 if let Some(contents) = contents {
-                    res.append(&mut contents.collect_types_metadata(handler, ctx)?);
+                    res.append(&mut contents.collect_metadata_types(handler, ctx)?);
                 }
                 for variant in enum_decl.variants.iter() {
                     res.append(
                         &mut variant
                             .type_argument
                             .type_id
-                            .collect_types_metadata(handler, ctx)?,
+                            .collect_metadata_types(handler, ctx)?,
                     );
                 }
                 for type_param in enum_decl.type_parameters.iter() {
-                    res.append(&mut type_param.type_id.collect_types_metadata(handler, ctx)?);
+                    res.append(&mut type_param.type_id.collect_metadata_types(handler, ctx)?);
                 }
             }
             AbiCast { address, .. } => {
-                res.append(&mut address.collect_types_metadata(handler, ctx)?);
+                res.append(&mut address.collect_metadata_types(handler, ctx)?);
             }
             IntrinsicFunction(kind) => {
-                res.append(&mut kind.collect_types_metadata(handler, ctx)?);
+                res.append(&mut kind.collect_metadata_types(handler, ctx)?);
             }
             EnumTag { exp } => {
-                res.append(&mut exp.collect_types_metadata(handler, ctx)?);
+                res.append(&mut exp.collect_metadata_types(handler, ctx)?);
             }
             UnsafeDowncast {
                 exp,
                 variant,
                 call_path_decl: _,
             } => {
-                res.append(&mut exp.collect_types_metadata(handler, ctx)?);
+                res.append(&mut exp.collect_metadata_types(handler, ctx)?);
                 res.append(
                     &mut variant
                         .type_argument
                         .type_id
-                        .collect_types_metadata(handler, ctx)?,
+                        .collect_metadata_types(handler, ctx)?,
                 );
             }
             WhileLoop { condition, body } => {
-                res.append(&mut condition.collect_types_metadata(handler, ctx)?);
+                res.append(&mut condition.collect_metadata_types(handler, ctx)?);
                 for content in body.contents.iter() {
-                    res.append(&mut content.collect_types_metadata(handler, ctx)?);
+                    res.append(&mut content.collect_metadata_types(handler, ctx)?);
                 }
             }
             ForLoop { desugared } => {
-                res.append(&mut desugared.collect_types_metadata(handler, ctx)?);
+                res.append(&mut desugared.collect_metadata_types(handler, ctx)?);
             }
             ImplicitReturn(exp) | Return(exp) => {
-                res.append(&mut exp.collect_types_metadata(handler, ctx)?)
+                res.append(&mut exp.collect_metadata_types(handler, ctx)?)
             }
-            Ref(exp) | Deref(exp) => res.append(&mut exp.collect_types_metadata(handler, ctx)?),
+            Ref(exp) | Deref(exp) => res.append(&mut exp.collect_metadata_types(handler, ctx)?),
             // storage access can never be generic
             // variable expressions don't ever have return types themselves, they're stored in
             // `TyExpression::return_type`. Variable expressions are just names of variables.
@@ -314,7 +314,7 @@ impl CollectTypesMetadata for TyExpression {
             | Continue
             | FunctionParameter => {}
             Reassignment(reassignment) => {
-                res.append(&mut reassignment.rhs.collect_types_metadata(handler, ctx)?);
+                res.append(&mut reassignment.rhs.collect_metadata_types(handler, ctx)?);
             }
         }
         Ok(res)
diff --git a/sway-core/src/language/ty/expression/intrinsic_function.rs b/sway-core/src/language/ty/expression/intrinsic_function.rs
index 681fa6da873..5433fc18a03 100644
--- a/sway-core/src/language/ty/expression/intrinsic_function.rs
+++ b/sway-core/src/language/ty/expression/intrinsic_function.rs
@@ -99,23 +99,23 @@ impl DebugWithEngines for TyIntrinsicFunctionKind {
 }
 
 impl CollectTypesMetadata for TyIntrinsicFunctionKind {
-    fn collect_types_metadata(
+    fn collect_metadata_types(
         &self,
         handler: &Handler,
         ctx: &mut CollectTypesMetadataContext,
     ) -> Result<Vec<TypeMetadata>, ErrorEmitted> {
-        let mut types_metadata = vec![];
+        let mut metadata_types = vec![];
         for type_arg in self.type_arguments.iter() {
-            types_metadata.append(&mut type_arg.type_id.collect_types_metadata(handler, ctx)?);
+            metadata_types.append(&mut type_arg.type_id.collect_metadata_types(handler, ctx)?);
         }
         for arg in self.arguments.iter() {
-            types_metadata.append(&mut arg.collect_types_metadata(handler, ctx)?);
+            metadata_types.append(&mut arg.collect_metadata_types(handler, ctx)?);
         }
 
         match self.kind {
             Intrinsic::Log => {
                 let logged_type = self.get_logged_type(ctx.experimental.new_encoding).unwrap();
-                types_metadata.push(TypeMetadata::LoggedType(
+                metadata_types.push(TypeMetadata::LoggedType(
                     LogId::new(logged_type.get_abi_type_str(
                         &AbiStrContext {
                             program_name: ctx.program_name.clone(),
@@ -130,7 +130,7 @@ impl CollectTypesMetadata for TyIntrinsicFunctionKind {
                 ));
             }
             Intrinsic::Smo => {
-                types_metadata.push(TypeMetadata::MessageType(
+                metadata_types.push(TypeMetadata::MessageType(
                     MessageId::new(ctx.message_id_counter()),
                     self.arguments[1].return_type,
                 ));
@@ -139,6 +139,6 @@ impl CollectTypesMetadata for TyIntrinsicFunctionKind {
             _ => {}
         }
 
-        Ok(types_metadata)
+        Ok(metadata_types)
     }
 }
diff --git a/sway-core/src/language/ty/program.rs b/sway-core/src/language/ty/program.rs
index 7d585533f18..329301c7a29 100644
--- a/sway-core/src/language/ty/program.rs
+++ b/sway-core/src/language/ty/program.rs
@@ -456,7 +456,7 @@ impl TyProgram {
 
 impl CollectTypesMetadata for TyProgram {
     /// Collect various type information such as unresolved types and types of logged data
-    fn collect_types_metadata(
+    fn collect_metadata_types(
         &self,
         handler: &Handler,
         ctx: &mut CollectTypesMetadataContext,
@@ -477,7 +477,7 @@ impl CollectTypesMetadata for TyProgram {
                 ..
             } => {
                 let main_function = decl_engine.get_function(main_function);
-                metadata.append(&mut main_function.collect_types_metadata(handler, ctx)?);
+                metadata.append(&mut main_function.collect_metadata_types(handler, ctx)?);
             }
             // For contracts, collect metadata for all the types starting with each ABI method as
             // an entry point.
@@ -487,12 +487,12 @@ impl CollectTypesMetadata for TyProgram {
             } => {
                 if let Some(main_function) = main_function {
                     let entry = decl_engine.get_function(main_function);
-                    metadata.append(&mut entry.collect_types_metadata(handler, ctx)?);
+                    metadata.append(&mut entry.collect_metadata_types(handler, ctx)?);
                 }
 
                 for entry in abi_entries.iter() {
                     let entry = decl_engine.get_function(entry);
-                    metadata.append(&mut entry.collect_types_metadata(handler, ctx)?);
+                    metadata.append(&mut entry.collect_metadata_types(handler, ctx)?);
                 }
             }
             // For libraries, collect metadata for all the types starting with each `pub` node as
@@ -507,7 +507,7 @@ impl CollectTypesMetadata for TyProgram {
                     for node in module.all_nodes.iter() {
                         let is_generic_function = node.is_generic_function(decl_engine);
                         if node.is_public(decl_engine) {
-                            let node_metadata = node.collect_types_metadata(handler, ctx)?;
+                            let node_metadata = node.collect_metadata_types(handler, ctx)?;
                             metadata.append(
                                 &mut node_metadata
                                     .iter()
@@ -535,7 +535,7 @@ impl CollectTypesMetadata for TyProgram {
         ) {
             for node in module.all_nodes.iter() {
                 if node.is_test_function(decl_engine) {
-                    metadata.append(&mut node.collect_types_metadata(handler, ctx)?);
+                    metadata.append(&mut node.collect_metadata_types(handler, ctx)?);
                 }
             }
         }
diff --git a/sway-core/src/lib.rs b/sway-core/src/lib.rs
index bdc7e683ceb..5bfcde77d4c 100644
--- a/sway-core/src/lib.rs
+++ b/sway-core/src/lib.rs
@@ -574,14 +574,14 @@ pub fn parsed_to_ast(
     };
 
     // Skip collecting metadata if we triggered an optimised build from LSP.
-    let types_metadata = if !lsp_config.as_ref().is_some_and(|lsp| lsp.optimized_build) {
+    let metadata_types = if !lsp_config.as_ref().is_some_and(|lsp| lsp.optimized_build) {
         // Collect information about the types used in this program
-        let types_metadata_result = typed_program.collect_types_metadata(
+        let metadata_types_result = typed_program.collect_metadata_types(
             handler,
             &mut CollectTypesMetadataContext::new(engines, experimental, package_name.to_string()),
         );
-        let types_metadata = match types_metadata_result {
-            Ok(types_metadata) => types_metadata,
+        let metadata_types = match metadata_types_result {
+            Ok(metadata_types) => metadata_types,
             Err(e) => {
                 handler.dedup();
                 return Err(e);
@@ -590,14 +590,14 @@ pub fn parsed_to_ast(
 
         typed_program
             .logged_types
-            .extend(types_metadata.iter().filter_map(|m| match m {
+            .extend(metadata_types.iter().filter_map(|m| match m {
                 TypeMetadata::LoggedType(log_id, type_id) => Some((*log_id, *type_id)),
                 _ => None,
             }));
 
         typed_program
             .messages_types
-            .extend(types_metadata.iter().filter_map(|m| match m {
+            .extend(metadata_types.iter().filter_map(|m| match m {
                 TypeMetadata::MessageType(message_id, type_id) => Some((*message_id, *type_id)),
                 _ => None,
             }));
@@ -621,7 +621,7 @@ pub fn parsed_to_ast(
             print_graph_url_format,
         );
 
-        types_metadata
+        metadata_types
     } else {
         vec![]
     };
@@ -669,7 +669,7 @@ pub fn parsed_to_ast(
     };
 
     // All unresolved types lead to compile errors.
-    for err in types_metadata.iter().filter_map(|m| match m {
+    for err in metadata_types.iter().filter_map(|m| match m {
         TypeMetadata::UnresolvedType(name, call_site_span_opt) => {
             Some(CompileError::UnableToInferGeneric {
                 ty: name.as_str().to_string(),
diff --git a/sway-core/src/type_system/ast_elements/trait_constraint.rs b/sway-core/src/type_system/ast_elements/trait_constraint.rs
index 67e56d481c6..51e52db8756 100644
--- a/sway-core/src/type_system/ast_elements/trait_constraint.rs
+++ b/sway-core/src/type_system/ast_elements/trait_constraint.rs
@@ -113,7 +113,7 @@ impl From<&Supertrait> for TraitConstraint {
 }
 
 impl CollectTypesMetadata for TraitConstraint {
-    fn collect_types_metadata(
+    fn collect_metadata_types(
         &self,
         handler: &Handler,
         ctx: &mut CollectTypesMetadataContext,
@@ -122,7 +122,7 @@ impl CollectTypesMetadata for TraitConstraint {
         handler.scope(|handler| {
             for type_arg in &self.type_arguments {
                 res.extend(
-                    match type_arg.type_id.collect_types_metadata(handler, ctx) {
+                    match type_arg.type_id.collect_metadata_types(handler, ctx) {
                         Ok(res) => res,
                         Err(_) => continue,
                     },
diff --git a/sway-core/src/type_system/id.rs b/sway-core/src/type_system/id.rs
index 9410fd2d6ac..652bab9f4ba 100644
--- a/sway-core/src/type_system/id.rs
+++ b/sway-core/src/type_system/id.rs
@@ -55,7 +55,7 @@ impl From<usize> for TypeId {
 }
 
 impl CollectTypesMetadata for TypeId {
-    fn collect_types_metadata(
+    fn collect_metadata_types(
         &self,
         _handler: &Handler,
         ctx: &mut CollectTypesMetadataContext,
diff --git a/sway-core/src/types/collect_types_metadata.rs b/sway-core/src/types/collect_types_metadata.rs
index 7f535787f9a..518fab8063d 100644
--- a/sway-core/src/types/collect_types_metadata.rs
+++ b/sway-core/src/types/collect_types_metadata.rs
@@ -127,7 +127,7 @@ impl<'cx> CollectTypesMetadataContext<'cx> {
 }
 
 pub(crate) trait CollectTypesMetadata {
-    fn collect_types_metadata(
+    fn collect_metadata_types(
         &self,
         handler: &Handler,
         ctx: &mut CollectTypesMetadataContext,
diff --git a/sway-core/src/types/mod.rs b/sway-core/src/types/mod.rs
index 6cf2ec6d39e..c0558956b86 100644
--- a/sway-core/src/types/mod.rs
+++ b/sway-core/src/types/mod.rs
@@ -1,3 +1,3 @@
-mod collect_types_metadata;
+mod collect_metadata_types;
 
-pub(crate) use collect_types_metadata::*;
+pub(crate) use collect_metadata_types::*;
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/blanket_impl/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/blanket_impl/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/blanket_impl/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/blanket_impl/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/blanket_impl_u16/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/blanket_impl_u16/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/blanket_impl_u16/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/blanket_impl_u16/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/break_in_strange_positions/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/break_in_strange_positions/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/break_in_strange_positions/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/break_in_strange_positions/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/continue_in_strange_positions/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/continue_in_strange_positions/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/continue_in_strange_positions/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/continue_in_strange_positions/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/abort_control_flow_good/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/abort_control_flow_good/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/abort_control_flow_good/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/abort_control_flow_good/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/aliased_imports/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/aliased_imports/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/aliased_imports/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/aliased_imports/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/array_basics/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/array_basics/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/array_basics/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/array_basics/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/array_generics/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/array_generics/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/array_generics/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/array_generics/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/asm_expr_basic/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/asm_expr_basic/json_abi_oracle_new_encoding.json
index e6cbe62d615..cd145340441 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/asm_expr_basic/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/asm_expr_basic/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/asm_without_return/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/asm_without_return/json_abi_oracle_new_encoding.json
index 6ba89864136..fc33fb8071d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/asm_without_return/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/asm_without_return/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bad_jumps/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bad_jumps/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bad_jumps/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bad_jumps/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bitwise_ops/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bitwise_ops/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bitwise_ops/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bitwise_ops/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_ops/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_ops/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_ops/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_ops/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/basic_func_decl/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/basic_func_decl/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/basic_func_decl/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/basic_func_decl/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/binary_and_hex_literals/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/binary_and_hex_literals/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/binary_and_hex_literals/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/binary_and_hex_literals/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/binop_intrinsics/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/binop_intrinsics/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/binop_intrinsics/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/binop_intrinsics/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/bitwise_not/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/bitwise_not/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/bitwise_not/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/bitwise_not/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/blanket_trait/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/blanket_trait/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/blanket_trait/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/blanket_trait/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/bool_and_or/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/bool_and_or/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/bool_and_or/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/bool_and_or/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/break_and_continue/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/break_and_continue/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/break_and_continue/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/break_and_continue/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/builtin_type_method_call/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/builtin_type_method_call/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/builtin_type_method_call/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/builtin_type_method_call/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/callpath_local_shadowing/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/callpath_local_shadowing/json_abi_oracle_new_encoding.json
index 6ba89864136..fc33fb8071d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/callpath_local_shadowing/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/callpath_local_shadowing/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/chained_if_let/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/chained_if_let/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/chained_if_let/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/chained_if_let/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json
index 2a56bd4ce5a..334a84c571a 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json
@@ -153,7 +153,7 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "components": [
         {
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_and_use_in_library/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_and_use_in_library/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_and_use_in_library/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_and_use_in_library/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_in_library/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_in_library/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_in_library/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_in_library/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_literal/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_literal/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_literal/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_literal/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_with_call_path/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_with_call_path/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_with_call_path/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_with_call_path/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_inits/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_inits/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_inits/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_inits/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/contract_caller_as_ret/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/contract_caller_as_ret/json_abi_oracle_new_encoding.json
index d505ce86cc5..4db6630875f 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/contract_caller_as_ret/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/contract_caller_as_ret/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/diverging_exprs/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/diverging_exprs/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/diverging_exprs/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/diverging_exprs/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/empty_method_initializer/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/empty_method_initializer/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/empty_method_initializer/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/empty_method_initializer/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_destructuring/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_destructuring/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_destructuring/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_destructuring/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let_large_type/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let_large_type/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let_large_type/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let_large_type/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_in_fn_decl/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_in_fn_decl/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_in_fn_decl/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_in_fn_decl/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_init_fn_call/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_init_fn_call/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_init_fn_call/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_init_fn_call/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_instantiation/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_instantiation/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_instantiation/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_instantiation/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_padding/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_padding/json_abi_oracle_new_encoding.json
index 9a9f92029fb..330ceb1e84d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_padding/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_padding/json_abi_oracle_new_encoding.json
@@ -20,7 +20,7 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "components": [
         {
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_type_inference/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_type_inference/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_type_inference/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_type_inference/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_variant_imports/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_variant_imports/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_variant_imports/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_variant_imports/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_and_neq/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_and_neq/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_and_neq/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_and_neq/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_intrinsic/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_intrinsic/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_intrinsic/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_intrinsic/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/fallback_only/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/fallback_only/json_abi_oracle_new_encoding.json
index fdae20048cd..f94cd99c92e 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/fallback_only/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/fallback_only/json_abi_oracle_new_encoding.json
@@ -7,5 +7,5 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/fix_opcode_bug/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/fix_opcode_bug/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/fix_opcode_bug/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/fix_opcode_bug/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/for_loops/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/for_loops/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/for_loops/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/for_loops/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/funcs_with_generic_types/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/funcs_with_generic_types/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/funcs_with_generic_types/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/funcs_with_generic_types/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_functions/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_functions/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_functions/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_functions/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self/json_abi_oracle_new_encoding.json
index e6cbe62d615..cd145340441 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self_where/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self_where/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self_where/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self_where/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_inside_generic/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_inside_generic/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_inside_generic/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_inside_generic/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_result_method/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_result_method/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_result_method/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_result_method/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_struct/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_struct/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_struct/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_struct/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_structs/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_structs/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_structs/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_structs/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_traits/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_traits/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_traits/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_traits/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_transpose/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_transpose/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_transpose/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_transpose/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_tuple_trait/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_tuple_trait/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_tuple_trait/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_tuple_trait/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_type_inference/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_type_inference/json_abi_oracle_new_encoding.json
index 6ba89864136..fc33fb8071d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_type_inference/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_type_inference/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_where_in_impl_self/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_where_in_impl_self/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_where_in_impl_self/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_where_in_impl_self/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_where_in_impl_self2/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_where_in_impl_self2/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_where_in_impl_self2/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_where_in_impl_self2/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/gtf_intrinsic/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/gtf_intrinsic/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/gtf_intrinsic/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/gtf_intrinsic/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/if_elseif_enum/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/if_elseif_enum/json_abi_oracle_new_encoding.json
index e6cbe62d615..cd145340441 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/if_elseif_enum/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/if_elseif_enum/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/if_implicit_unit/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/if_implicit_unit/json_abi_oracle_new_encoding.json
index 6ba89864136..fc33fb8071d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/if_implicit_unit/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/if_implicit_unit/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/if_let_no_side_effects/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/if_let_no_side_effects/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/if_let_no_side_effects/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/if_let_no_side_effects/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/implicit_casting/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/implicit_casting/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/implicit_casting/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/implicit_casting/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/implicit_return/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/implicit_return/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/implicit_return/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/implicit_return/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_method_from_other_file/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_method_from_other_file/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_method_from_other_file/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_method_from_other_file/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_star_name_clash/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_star_name_clash/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_star_name_clash/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_star_name_clash/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_trailing_comma/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_trailing_comma/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_trailing_comma/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_trailing_comma/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_with_different_callpaths/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_with_different_callpaths/json_abi_oracle_new_encoding.json
index 6ba89864136..fc33fb8071d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_with_different_callpaths/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_with_different_callpaths/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/impure_ifs/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/impure_ifs/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/impure_ifs/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/impure_ifs/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/inline_if_expr_const/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/inline_if_expr_const/json_abi_oracle_new_encoding.json
index 6ba89864136..fc33fb8071d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/inline_if_expr_const/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/inline_if_expr_const/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/insert_element_reg_reuse/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/insert_element_reg_reuse/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/insert_element_reg_reuse/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/insert_element_reg_reuse/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/integer_type_inference/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/integer_type_inference/json_abi_oracle_new_encoding.json
index 6ba89864136..fc33fb8071d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/integer_type_inference/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/integer_type_inference/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/is_prime/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/is_prime/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/is_prime/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/is_prime/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/is_reference_type/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/is_reference_type/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/is_reference_type/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/is_reference_type/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/left_to_right_func_args_evaluation/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/left_to_right_func_args_evaluation/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/left_to_right_func_args_evaluation/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/left_to_right_func_args_evaluation/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/local_impl_for_ord/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/local_impl_for_ord/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/local_impl_for_ord/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/local_impl_for_ord/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/logging/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/logging/json_abi_oracle_new_encoding.json
index 1f8a5a19847..80f291cf109 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/logging/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/logging/json_abi_oracle_new_encoding.json
@@ -58,7 +58,7 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "metadataTypeId": 0,
       "type": "()"
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_empty/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_empty/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_empty/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_empty/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_generics/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_generics/json_abi_oracle_new_encoding.json
index 2cf5f86404a..1044d63d4c3 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_generics/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_generics/json_abi_oracle_new_encoding.json
@@ -25,7 +25,7 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "components": [
         {
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_one_u64/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_one_u64/json_abi_oracle_new_encoding.json
index 82c8d31ddf0..f71f93cafcf 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_one_u64/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_one_u64/json_abi_oracle_new_encoding.json
@@ -24,5 +24,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_ref/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_ref/json_abi_oracle_new_encoding.json
index 6aef6e46eab..a830bfd39f5 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_ref/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_ref/json_abi_oracle_new_encoding.json
@@ -29,7 +29,7 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "components": [
         {
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_ref_copy/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_ref_copy/json_abi_oracle_new_encoding.json
index 912a245e98d..bb4676c683e 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_ref_copy/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_ref_copy/json_abi_oracle_new_encoding.json
@@ -33,7 +33,7 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "components": [
         {
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_ref_ref/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_ref_ref/json_abi_oracle_new_encoding.json
index 2e3cb6d4100..26468e616e0 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_ref_ref/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_ref_ref/json_abi_oracle_new_encoding.json
@@ -33,7 +33,7 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "components": [
         {
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_two_u64/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_two_u64/json_abi_oracle_new_encoding.json
index c31b63b5240..0ba63ef8536 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_two_u64/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_two_u64/json_abi_oracle_new_encoding.json
@@ -28,5 +28,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_various_types/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_various_types/json_abi_oracle_new_encoding.json
index c9aac407b0a..be7e97e7f52 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_various_types/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_various_types/json_abi_oracle_new_encoding.json
@@ -34,7 +34,7 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "components": [
         {
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_returns_unit/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_returns_unit/json_abi_oracle_new_encoding.json
index 6ba89864136..fc33fb8071d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_returns_unit/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_returns_unit/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/many_stack_variables/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/many_stack_variables/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/many_stack_variables/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/many_stack_variables/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_all/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_all/json_abi_oracle_new_encoding.json
index 6ba89864136..fc33fb8071d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_all/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_all/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_empty_enums/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_empty_enums/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_empty_enums/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_empty_enums/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_enums/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_enums/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_enums/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_enums/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_inside_generic_functions/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_inside_generic_functions/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_inside_generic_functions/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_inside_generic_functions/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_mismatched/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_mismatched/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_mismatched/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_mismatched/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_nested/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_nested/json_abi_oracle_new_encoding.json
index e6cbe62d615..cd145340441 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_nested/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_nested/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_or/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_or/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_or/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_or/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_rest/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_rest/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_rest/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_rest/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_simple/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_simple/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_simple/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_simple/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_structs/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_structs/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_structs/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_structs/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_with_self/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_with_self/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_with_self/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_with_self/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/method_on_empty_struct/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/method_on_empty_struct/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/method_on_empty_struct/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/method_on_empty_struct/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/modulo_uint_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/modulo_uint_test/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/modulo_uint_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/modulo_uint_test/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/multi_impl_self/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/multi_impl_self/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/multi_impl_self/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/multi_impl_self/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/multi_item_import/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/multi_item_import/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/multi_item_import/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/multi_item_import/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/mut_ref_empty_type/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/mut_ref_empty_type/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/mut_ref_empty_type/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/mut_ref_empty_type/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_struct_destructuring/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_struct_destructuring/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_struct_destructuring/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_struct_destructuring/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_structs/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_structs/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_structs/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_structs/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_while_and_if/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_while_and_if/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_while_and_if/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_while_and_if/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/new_allocator_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/new_allocator_test/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/new_allocator_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/new_allocator_test/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/non_literal_const_decl/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/non_literal_const_decl/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/non_literal_const_decl/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/non_literal_const_decl/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/numeric_constants/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/numeric_constants/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/numeric_constants/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/numeric_constants/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/op_precedence/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/op_precedence/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/op_precedence/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/op_precedence/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ops/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/ops/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ops/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ops/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/out_of_order_decl/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/out_of_order_decl/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/out_of_order_decl/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/out_of_order_decl/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/prelude_access/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/prelude_access/json_abi_oracle_new_encoding.json
index 6ba89864136..fc33fb8071d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/prelude_access/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/prelude_access/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/prelude_access2/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/prelude_access2/json_abi_oracle_new_encoding.json
index 6ba89864136..fc33fb8071d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/prelude_access2/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/prelude_access2/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/primitive_type_argument/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/primitive_type_argument/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/primitive_type_argument/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/primitive_type_argument/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_identifiers/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_identifiers/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_identifiers/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_identifiers/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/reassignment_operators/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/reassignment_operators/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/reassignment_operators/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/reassignment_operators/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/redundant_return/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/redundant_return/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/redundant_return/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/redundant_return/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/aliases/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/aliases/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100755
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/aliases/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/aliases/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/multiple_imports_of_same_reexport/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/multiple_imports_of_same_reexport/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100755
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/multiple_imports_of_same_reexport/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/multiple_imports_of_same_reexport/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/reexport_paths/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/reexport_paths/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100755
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/reexport_paths/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/reexport_paths/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/shadowing_in_reexporting_module/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/shadowing_in_reexporting_module/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100755
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/shadowing_in_reexporting_module/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/shadowing_in_reexporting_module/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/simple_glob_import/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/simple_glob_import/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100755
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/simple_glob_import/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/simple_glob_import/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/simple_item_import/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/simple_item_import/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100755
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/simple_item_import/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/simple_item_import/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/visibility/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/visibility/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100755
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/visibility/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/reexport/visibility/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_bool/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_bool/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_bool/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_bool/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_call/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_call/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_call/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_call/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct_assign/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct_assign/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct_assign/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct_assign/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_u32/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_u32/json_abi_oracle_new_encoding.json
index e6cbe62d615..cd145340441 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_u32/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_u32/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_small_string/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_small_string/json_abi_oracle_new_encoding.json
index 89d8954c067..fb9d4d4ab94 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_small_string/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_small_string/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_string_in_struct/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_string_in_struct/json_abi_oracle_new_encoding.json
index d2219886527..2d7d57bc176 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_string_in_struct/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_string_in_struct/json_abi_oracle_new_encoding.json
@@ -20,7 +20,7 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "metadataTypeId": 0,
       "type": "str[9]"
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_b256/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_b256/json_abi_oracle_new_encoding.json
index aae05f0c143..b95944759fd 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_b256/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_b256/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_small_array/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_small_array/json_abi_oracle_new_encoding.json
index b8a07c4dfdd..915de2faf91 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_small_array/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_small_array/json_abi_oracle_new_encoding.json
@@ -20,7 +20,7 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "components": [
         {
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_struct/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_struct/json_abi_oracle_new_encoding.json
index ca2bc452800..dc7b9e7e0da 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_struct/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_struct/json_abi_oracle_new_encoding.json
@@ -20,7 +20,7 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "components": [
         {
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_zero_len_array/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_zero_len_array/json_abi_oracle_new_encoding.json
index c501244c889..c596fc0e6de 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_zero_len_array/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_zero_len_array/json_abi_oracle_new_encoding.json
@@ -20,7 +20,7 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "components": [
         {
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/self_impl_reassignment/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/self_impl_reassignment/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/self_impl_reassignment/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/self_impl_reassignment/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/size_of/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/size_of/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/size_of/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/size_of/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/slice/slice_script/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/slice/slice_script/json_abi_oracle_new_encoding.json
index af2d550d3d5..5d65a024e7a 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/slice/slice_script/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/slice/slice_script/json_abi_oracle_new_encoding.json
@@ -24,5 +24,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/smo/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/smo/json_abi_oracle_new_encoding.json
index f0e5f9c18e2..3d2edd2aa4a 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/smo/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/smo/json_abi_oracle_new_encoding.json
@@ -127,7 +127,7 @@
   ],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "metadataTypeId": 0,
       "type": "()"
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/string_slice/string_slice_features/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/string_slice/string_slice_features/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/string_slice/string_slice_features/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/string_slice/string_slice_features/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/string_slice/string_slice_script/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/string_slice/string_slice_script/json_abi_oracle_new_encoding.json
index 491a3c63853..1a79bfff333 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/string_slice/string_slice_script/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/string_slice/string_slice_script/json_abi_oracle_new_encoding.json
@@ -24,5 +24,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_destructuring/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_destructuring/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_destructuring/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_destructuring/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_field_access/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_field_access/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_field_access/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_field_access/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_field_reassignment/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_field_reassignment/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_field_reassignment/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_field_reassignment/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_instantiation/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_instantiation/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_instantiation/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_instantiation/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits_with_trait_methods/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits_with_trait_methods/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits_with_trait_methods/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits_with_trait_methods/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_import_with_star/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_import_with_star/json_abi_oracle_new_encoding.json
index 6ba89864136..fc33fb8071d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_import_with_star/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_import_with_star/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_ascription_disambiguate/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_ascription_disambiguate/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_ascription_disambiguate/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_ascription_disambiguate/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_generic_qualified/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_generic_qualified/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_generic_qualified/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_generic_qualified/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_qualified/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_qualified/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_qualified/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_qualified/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_access/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_access/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_access/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_access/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_desugaring/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_desugaring/json_abi_oracle_new_encoding.json
index e6cbe62d615..cd145340441 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_desugaring/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_desugaring/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_field_reassignment/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_field_reassignment/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_field_reassignment/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_field_reassignment/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_in_struct/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_in_struct/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_in_struct/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_in_struct/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_indexing/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_indexing/json_abi_oracle_new_encoding.json
index e6cbe62d615..cd145340441 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_indexing/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_indexing/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_single_element/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_single_element/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_single_element/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_single_element/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_trait/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_trait/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_trait/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_trait/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_types/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_types/json_abi_oracle_new_encoding.json
index e6cbe62d615..cd145340441 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_types/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_types/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath/json_abi_oracle_new_encoding.json
index 6ba89864136..fc33fb8071d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath2/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath2/json_abi_oracle_new_encoding.json
index 6ba89864136..fc33fb8071d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath2/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath2/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath_with_import/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath_with_import/json_abi_oracle_new_encoding.json
index 6ba89864136..fc33fb8071d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath_with_import/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath_with_import/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/json_abi_oracle_new_encoding.json
index 5d520ce256d..0a45ff2adc9 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/json_abi_oracle_new_encoding.json
@@ -30,5 +30,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic_2/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic_2/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic_2/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic_2/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/unit_type_variants/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/unit_type_variants/json_abi_oracle_new_encoding.json
index 0af8ce821c9..d8e35ed289f 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/unit_type_variants/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/unit_type_variants/json_abi_oracle_new_encoding.json
@@ -20,7 +20,7 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "metadataTypeId": 0,
       "type": "()"
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/use_absolute_path/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/use_absolute_path/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/use_absolute_path/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/use_absolute_path/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/use_full_path_names/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/use_full_path_names/json_abi_oracle_new_encoding.json
index e6cbe62d615..cd145340441 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/use_full_path_names/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/use_full_path_names/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/valid_impurity/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/valid_impurity/json_abi_oracle_new_encoding.json
index 46476e699bd..41ddd5a6526 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/valid_impurity/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/valid_impurity/json_abi_oracle_new_encoding.json
@@ -27,5 +27,5 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_enums/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_enums/json_abi_oracle_new_encoding.json
index 27dd3a2ed67..ae14caf80c4 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_enums/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_enums/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_functions/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_functions/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_functions/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_functions/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_generic_tuple/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_generic_tuple/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_generic_tuple/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_generic_tuple/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_impls/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_impls/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_impls/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_impls/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_methods/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_methods/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_methods/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_methods/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_structs/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_structs/json_abi_oracle_new_encoding.json
index 27dd3a2ed67..ae14caf80c4 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_structs/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_structs/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_traits/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_traits/json_abi_oracle_new_encoding.json
index 27dd3a2ed67..ae14caf80c4 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_traits/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_traits/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/while_loops/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/while_loops/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/while_loops/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/while_loops/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/zero_field_types/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/zero_field_types/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/zero_field_types/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/zero_field_types/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/resolve_local_items_that_shadow_imports/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/resolve_local_items_that_shadow_imports/json_abi_oracle_new_encoding.json
index 6ba89864136..fc33fb8071d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/resolve_local_items_that_shadow_imports/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/resolve_local_items_that_shadow_imports/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/return_in_strange_positions/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/return_in_strange_positions/json_abi_oracle_new_encoding.json
index 06288f6470b..b2ca88cc80b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/return_in_strange_positions/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/return_in_strange_positions/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/address_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/address_test/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/address_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/address_test/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/alloc_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/alloc_test/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/alloc_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/alloc_test/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_eq/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_eq/json_abi_oracle_new_encoding.json
index 6d6731dad31..65fcd7aaea0 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_eq/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_eq/json_abi_oracle_new_encoding.json
@@ -105,7 +105,7 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "components": [
         {
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_eq_revert/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_eq_revert/json_abi_oracle_new_encoding.json
index c0493d35b2c..efb4ef4b143 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_eq_revert/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_eq_revert/json_abi_oracle_new_encoding.json
@@ -28,5 +28,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_ne/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_ne/json_abi_oracle_new_encoding.json
index 6d6731dad31..65fcd7aaea0 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_ne/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_ne/json_abi_oracle_new_encoding.json
@@ -105,7 +105,7 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "components": [
         {
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_ne_revert/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_ne_revert/json_abi_oracle_new_encoding.json
index c0493d35b2c..efb4ef4b143 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_ne_revert/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_ne_revert/json_abi_oracle_new_encoding.json
@@ -28,5 +28,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_test/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_test/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_struct_alignment/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_struct_alignment/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_struct_alignment/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_struct_alignment/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_test/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_test/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/block_height/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/block_height/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/block_height/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/block_height/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/contract_id_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/contract_id_test/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/contract_id_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/contract_id_test/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/contract_id_type/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/contract_id_type/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/contract_id_type/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/contract_id_type/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/eq_custom_type/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/eq_custom_type/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/eq_custom_type/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/eq_custom_type/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/eq_generic/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/eq_generic/json_abi_oracle_new_encoding.json
index 6ba89864136..fc33fb8071d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/eq_generic/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/eq_generic/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/ge_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/ge_test/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/ge_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/ge_test/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/generic_empty_struct_with_constraint/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/generic_empty_struct_with_constraint/json_abi_oracle_new_encoding.json
index 6ba89864136..fc33fb8071d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/generic_empty_struct_with_constraint/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/generic_empty_struct_with_constraint/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/identity_eq/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/identity_eq/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/identity_eq/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/identity_eq/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/intrinsics/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/intrinsics/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/intrinsics/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/intrinsics/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/option/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/option/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/option/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/option/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/option_eq/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/option_eq/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/option_eq/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/option_eq/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/raw_ptr/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/raw_ptr/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/raw_ptr/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/raw_ptr/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/raw_slice/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/raw_slice/json_abi_oracle_new_encoding.json
index c2438d6380b..85ec72672c3 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/raw_slice/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/raw_slice/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/require/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/require/json_abi_oracle_new_encoding.json
index d21a750855b..ebd75034c4b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/require/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/require/json_abi_oracle_new_encoding.json
@@ -37,7 +37,7 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "metadataTypeId": 0,
       "type": "b256"
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/result/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/result/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/result/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/result/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/sha256/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/sha256/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/sha256/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/sha256/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_div_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_div_test/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_div_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_div_test/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_log_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_log_test/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_log_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_log_test/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_mul_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_mul_test/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_mul_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_mul_test/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_root_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_root_test/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_root_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_root_test/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_test/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_test/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_test/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_test/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/vec/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/vec/json_abi_oracle_new_encoding.json
index 620a27423d0..97a56d311e8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/vec/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/vec/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "script",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/superabi/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/superabi/json_abi_oracle_new_encoding.json
index 5fb0761e122..418cfaa4979 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/superabi/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/superabi/json_abi_oracle_new_encoding.json
@@ -25,5 +25,5 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/superabi_diamond/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/superabi_diamond/json_abi_oracle_new_encoding.json
index 0ceadc76a66..e3502f78711 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/superabi_diamond/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/superabi_diamond/json_abi_oracle_new_encoding.json
@@ -37,5 +37,5 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/superabi_diamond_impl/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/superabi_diamond_impl/json_abi_oracle_new_encoding.json
index 0ceadc76a66..e3502f78711 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/superabi_diamond_impl/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/superabi_diamond_impl/json_abi_oracle_new_encoding.json
@@ -37,5 +37,5 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/supertraits_for_abis/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/supertraits_for_abis/json_abi_oracle_new_encoding.json
index dcb0dea516c..911d784b957 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/supertraits_for_abis/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/supertraits_for_abis/json_abi_oracle_new_encoding.json
@@ -25,5 +25,5 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/supertraits_for_abis_diamond/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/supertraits_for_abis_diamond/json_abi_oracle_new_encoding.json
index d4a41d5f0b6..56defcd1f97 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/supertraits_for_abis_diamond/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/supertraits_for_abis_diamond/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_abis/abi_impl_methods_in_json_abi/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_abis/abi_impl_methods_in_json_abi/json_abi_oracle_new_encoding.json
index 0013f8a7747..9140e64735d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_abis/abi_impl_methods_in_json_abi/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_abis/abi_impl_methods_in_json_abi/json_abi_oracle_new_encoding.json
@@ -25,5 +25,5 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_generic_types/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_generic_types/json_abi_oracle_new_encoding.json
index 29a536c5dea..e43352e9d6b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_generic_types/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_generic_types/json_abi_oracle_new_encoding.json
@@ -134,7 +134,7 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "components": [
         {
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_same_name_types/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_same_name_types/json_abi_oracle_new_encoding.json
index 7ff27cfea77..e699e6906ad 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_same_name_types/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_same_name_types/json_abi_oracle_new_encoding.json
@@ -54,7 +54,7 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "metadataTypeId": 0,
       "type": "()"
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_tuples_contract/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_tuples_contract/json_abi_oracle_new_encoding.json
index f72bc7ef1ef..e9265a8add4 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_tuples_contract/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/abi_with_tuples_contract/json_abi_oracle_new_encoding.json
@@ -56,7 +56,7 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "metadataTypeId": 0,
       "type": "()"
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/array_of_structs_contract/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/array_of_structs_contract/json_abi_oracle_new_encoding.json
index 2fb87bc80c3..be3bb9d37a0 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/array_of_structs_contract/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/array_of_structs_contract/json_abi_oracle_new_encoding.json
@@ -61,7 +61,7 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "components": [
         {
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/auth_testing_contract/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/auth_testing_contract/json_abi_oracle_new_encoding.json
index 019dd46ee95..f65bed29897 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/auth_testing_contract/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/auth_testing_contract/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/balance_test_contract/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/balance_test_contract/json_abi_oracle_new_encoding.json
index 2304727e1be..9a1f83acb28 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/balance_test_contract/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/balance_test_contract/json_abi_oracle_new_encoding.json
@@ -19,5 +19,5 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/basic_storage/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/basic_storage/json_abi_oracle_new_encoding.json
index 90d3e3df19d..07cff93f9ef 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/basic_storage/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/basic_storage/json_abi_oracle_new_encoding.json
@@ -205,7 +205,7 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "components": [
         {
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/context_testing_contract/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/context_testing_contract/json_abi_oracle_new_encoding.json
index d1c28f4bec4..895831dce1c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/context_testing_contract/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/context_testing_contract/json_abi_oracle_new_encoding.json
@@ -79,7 +79,7 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "metadataTypeId": 0,
       "type": "b256"
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/contract_with_type_aliases/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/contract_with_type_aliases/json_abi_oracle_new_encoding.json
index ed9ba29007b..7ddc25fe910 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/contract_with_type_aliases/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/contract_with_type_aliases/json_abi_oracle_new_encoding.json
@@ -76,7 +76,7 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "components": [
         {
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/increment_contract/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/increment_contract/json_abi_oracle_new_encoding.json
index 1813c7befe0..2f12abbb6d3 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/increment_contract/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/increment_contract/json_abi_oracle_new_encoding.json
@@ -72,7 +72,7 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "metadataTypeId": 0,
       "type": "()"
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/issue_1512_repro/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/issue_1512_repro/json_abi_oracle_new_encoding.json
index 0f079c86b6a..316945eb3e2 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/issue_1512_repro/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/issue_1512_repro/json_abi_oracle_new_encoding.json
@@ -33,7 +33,7 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "components": [
         {
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/multiple_impl/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/multiple_impl/json_abi_oracle_new_encoding.json
index 89be1b69e12..9921a4d70c5 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/multiple_impl/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/multiple_impl/json_abi_oracle_new_encoding.json
@@ -28,5 +28,5 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/nested_struct_args_contract/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/nested_struct_args_contract/json_abi_oracle_new_encoding.json
index 48b700f51af..dfa9bacceab 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/nested_struct_args_contract/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/nested_struct_args_contract/json_abi_oracle_new_encoding.json
@@ -38,7 +38,7 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "components": [
         {
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/return_struct/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/return_struct/json_abi_oracle_new_encoding.json
index f8b0d6f1a18..c56ec218b21 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/return_struct/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/return_struct/json_abi_oracle_new_encoding.json
@@ -34,7 +34,7 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "metadataTypeId": 0,
       "type": "()"
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/storage_access_contract/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/storage_access_contract/json_abi_oracle_new_encoding.json
index 11f306577a5..ec7dcab571e 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/storage_access_contract/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/storage_access_contract/json_abi_oracle_new_encoding.json
@@ -694,7 +694,7 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "components": [
         {
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/storage_enum_contract/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/storage_enum_contract/json_abi_oracle_new_encoding.json
index 720dd728f3f..16a5fa137e2 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/storage_enum_contract/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/storage_enum_contract/json_abi_oracle_new_encoding.json
@@ -27,5 +27,5 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": []
+  "metadataTypes": []
 }
\ No newline at end of file
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/storage_namespace/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/storage_namespace/json_abi_oracle_new_encoding.json
index 0f6f8c622f1..0c63c92aede 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/storage_namespace/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/storage_namespace/json_abi_oracle_new_encoding.json
@@ -197,7 +197,7 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "components": [
         {
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/test_fuel_coin_contract/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/test_fuel_coin_contract/json_abi_oracle_new_encoding.json
index 7c82826b9ad..c49fb864e2b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/test_fuel_coin_contract/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/test_fuel_coin_contract/json_abi_oracle_new_encoding.json
@@ -68,7 +68,7 @@
   "messagesTypes": [],
   "programType": "contract",
   "specVersion": "1",
-  "typesMetadata": [
+  "metadataTypes": [
     {
       "metadataTypeId": 0,
       "type": "b256"