diff --git a/third_party/move/move-compiler-v2/tests/lambda-lifting/pattern.lambda.exp b/third_party/move/move-compiler-v2/tests/lambda-lifting/pattern.lambda.exp
index 83b5c3b1b9710..8ea4845c1e7c3 100644
--- a/third_party/move/move-compiler-v2/tests/lambda-lifting/pattern.lambda.exp
+++ b/third_party/move/move-compiler-v2/tests/lambda-lifting/pattern.lambda.exp
@@ -1,6 +1,6 @@
 // -- Model dump before env processor pipeline:
 module 0xcafe::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun consume<T>(s: m::S<#0>,x: #0,f: |(m::S<#0>, #0)|#0): #0 {
@@ -17,7 +17,7 @@ module 0xcafe::m {
 
 // -- Model dump after env processor unused checks:
 module 0xcafe::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun consume<T>(s: m::S<#0>,x: #0,f: |(m::S<#0>, #0)|#0): #0 {
@@ -34,7 +34,7 @@ module 0xcafe::m {
 
 // -- Model dump after env processor type parameter check:
 module 0xcafe::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun consume<T>(s: m::S<#0>,x: #0,f: |(m::S<#0>, #0)|#0): #0 {
@@ -51,7 +51,7 @@ module 0xcafe::m {
 
 // -- Model dump after env processor check recursive struct definition:
 module 0xcafe::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun consume<T>(s: m::S<#0>,x: #0,f: |(m::S<#0>, #0)|#0): #0 {
@@ -68,7 +68,7 @@ module 0xcafe::m {
 
 // -- Model dump after env processor check cyclic type instantiation:
 module 0xcafe::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun consume<T>(s: m::S<#0>,x: #0,f: |(m::S<#0>, #0)|#0): #0 {
@@ -85,7 +85,7 @@ module 0xcafe::m {
 
 // -- Model dump after env processor unused struct params check:
 module 0xcafe::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun consume<T>(s: m::S<#0>,x: #0,f: |(m::S<#0>, #0)|#0): #0 {
@@ -102,7 +102,7 @@ module 0xcafe::m {
 
 // -- Model dump after env processor access and use check before inlining:
 module 0xcafe::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun consume<T>(s: m::S<#0>,x: #0,f: |(m::S<#0>, #0)|#0): #0 {
@@ -119,7 +119,7 @@ module 0xcafe::m {
 
 // -- Model dump after env processor inlining:
 module 0xcafe::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun consume<T>(s: m::S<#0>,x: #0,f: |(m::S<#0>, #0)|#0): #0 {
@@ -136,7 +136,7 @@ module 0xcafe::m {
 
 // -- Model dump after env processor access and use check after inlining:
 module 0xcafe::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun consume<T>(s: m::S<#0>,x: #0,f: |(m::S<#0>, #0)|#0): #0 {
@@ -153,7 +153,7 @@ module 0xcafe::m {
 
 // -- Model dump after env processor acquires check:
 module 0xcafe::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun consume<T>(s: m::S<#0>,x: #0,f: |(m::S<#0>, #0)|#0): #0 {
@@ -170,7 +170,7 @@ module 0xcafe::m {
 
 // -- Model dump after env processor simplifier:
 module 0xcafe::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun consume<T>(s: m::S<#0>,x: #0,f: |(m::S<#0>, #0)|#0): #0 {
@@ -187,7 +187,7 @@ module 0xcafe::m {
 
 // -- Model dump after env processor lambda-lifting:
 module 0xcafe::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun consume<T>(s: m::S<#0>,x: #0,f: |(m::S<#0>, #0)|#0): #0 {
@@ -210,7 +210,7 @@ module 0xcafe::m {
 
 // -- Model dump after env processor specification checker:
 module 0xcafe::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun consume<T>(s: m::S<#0>,x: #0,f: |(m::S<#0>, #0)|#0): #0 {
@@ -233,7 +233,7 @@ module 0xcafe::m {
 
 // -- Model dump after env processor specification rewriter:
 module 0xcafe::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun consume<T>(s: m::S<#0>,x: #0,f: |(m::S<#0>, #0)|#0): #0 {
diff --git a/third_party/move/move-compiler-v2/tests/lambda/inline-parity/dotdot_valid.lambda.exp b/third_party/move/move-compiler-v2/tests/lambda/inline-parity/dotdot_valid.lambda.exp
index 3056f26c17fb0..2f0dedd390d94 100644
--- a/third_party/move/move-compiler-v2/tests/lambda/inline-parity/dotdot_valid.lambda.exp
+++ b/third_party/move/move-compiler-v2/tests/lambda/inline-parity/dotdot_valid.lambda.exp
@@ -27,15 +27,15 @@ module 0x42::test {
         x: bool,
         y: u8,
     }
-    struct S4 {
+    struct S4<T> {
         x: T,
         y: test::S3,
     }
-    struct S5 {
+    struct S5<T,U> {
         0: T,
         1: U,
     }
-    struct S6 {
+    struct S6<T,U> {
         x: T,
         y: U,
     }
@@ -324,15 +324,15 @@ module 0x42::test {
         x: bool,
         y: u8,
     }
-    struct S4 {
+    struct S4<T> {
         x: T,
         y: test::S3,
     }
-    struct S5 {
+    struct S5<T,U> {
         0: T,
         1: U,
     }
-    struct S6 {
+    struct S6<T,U> {
         x: T,
         y: U,
     }
@@ -621,15 +621,15 @@ module 0x42::test {
         x: bool,
         y: u8,
     }
-    struct S4 {
+    struct S4<T> {
         x: T,
         y: test::S3,
     }
-    struct S5 {
+    struct S5<T,U> {
         0: T,
         1: U,
     }
-    struct S6 {
+    struct S6<T,U> {
         x: T,
         y: U,
     }
@@ -918,15 +918,15 @@ module 0x42::test {
         x: bool,
         y: u8,
     }
-    struct S4 {
+    struct S4<T> {
         x: T,
         y: test::S3,
     }
-    struct S5 {
+    struct S5<T,U> {
         0: T,
         1: U,
     }
-    struct S6 {
+    struct S6<T,U> {
         x: T,
         y: U,
     }
@@ -1215,15 +1215,15 @@ module 0x42::test {
         x: bool,
         y: u8,
     }
-    struct S4 {
+    struct S4<T> {
         x: T,
         y: test::S3,
     }
-    struct S5 {
+    struct S5<T,U> {
         0: T,
         1: U,
     }
-    struct S6 {
+    struct S6<T,U> {
         x: T,
         y: U,
     }
@@ -1512,15 +1512,15 @@ module 0x42::test {
         x: bool,
         y: u8,
     }
-    struct S4 {
+    struct S4<T> {
         x: T,
         y: test::S3,
     }
-    struct S5 {
+    struct S5<T,U> {
         0: T,
         1: U,
     }
-    struct S6 {
+    struct S6<T,U> {
         x: T,
         y: U,
     }
@@ -1809,15 +1809,15 @@ module 0x42::test {
         x: bool,
         y: u8,
     }
-    struct S4 {
+    struct S4<T> {
         x: T,
         y: test::S3,
     }
-    struct S5 {
+    struct S5<T,U> {
         0: T,
         1: U,
     }
-    struct S6 {
+    struct S6<T,U> {
         x: T,
         y: U,
     }
@@ -2106,15 +2106,15 @@ module 0x42::test {
         x: bool,
         y: u8,
     }
-    struct S4 {
+    struct S4<T> {
         x: T,
         y: test::S3,
     }
-    struct S5 {
+    struct S5<T,U> {
         0: T,
         1: U,
     }
-    struct S6 {
+    struct S6<T,U> {
         x: T,
         y: U,
     }
@@ -2403,15 +2403,15 @@ module 0x42::test {
         x: bool,
         y: u8,
     }
-    struct S4 {
+    struct S4<T> {
         x: T,
         y: test::S3,
     }
-    struct S5 {
+    struct S5<T,U> {
         0: T,
         1: U,
     }
-    struct S6 {
+    struct S6<T,U> {
         x: T,
         y: U,
     }
@@ -2700,15 +2700,15 @@ module 0x42::test {
         x: bool,
         y: u8,
     }
-    struct S4 {
+    struct S4<T> {
         x: T,
         y: test::S3,
     }
-    struct S5 {
+    struct S5<T,U> {
         0: T,
         1: U,
     }
-    struct S6 {
+    struct S6<T,U> {
         x: T,
         y: U,
     }
@@ -2997,15 +2997,15 @@ module 0x42::test {
         x: bool,
         y: u8,
     }
-    struct S4 {
+    struct S4<T> {
         x: T,
         y: test::S3,
     }
-    struct S5 {
+    struct S5<T,U> {
         0: T,
         1: U,
     }
-    struct S6 {
+    struct S6<T,U> {
         x: T,
         y: U,
     }
@@ -3294,15 +3294,15 @@ module 0x42::test {
         x: bool,
         y: u8,
     }
-    struct S4 {
+    struct S4<T> {
         x: T,
         y: test::S3,
     }
-    struct S5 {
+    struct S5<T,U> {
         0: T,
         1: U,
     }
-    struct S6 {
+    struct S6<T,U> {
         x: T,
         y: U,
     }
@@ -3597,15 +3597,15 @@ module 0x42::test {
         x: bool,
         y: u8,
     }
-    struct S4 {
+    struct S4<T> {
         x: T,
         y: test::S3,
     }
-    struct S5 {
+    struct S5<T,U> {
         0: T,
         1: U,
     }
-    struct S6 {
+    struct S6<T,U> {
         x: T,
         y: U,
     }
@@ -3900,15 +3900,15 @@ module 0x42::test {
         x: bool,
         y: u8,
     }
-    struct S4 {
+    struct S4<T> {
         x: T,
         y: test::S3,
     }
-    struct S5 {
+    struct S5<T,U> {
         0: T,
         1: U,
     }
-    struct S6 {
+    struct S6<T,U> {
         x: T,
         y: U,
     }
diff --git a/third_party/move/move-compiler-v2/tests/lambda/inline-parity/generic_calls.lambda.exp b/third_party/move/move-compiler-v2/tests/lambda/inline-parity/generic_calls.lambda.exp
index f01e29cb6cb81..fdbffabc5a8c8 100644
--- a/third_party/move/move-compiler-v2/tests/lambda/inline-parity/generic_calls.lambda.exp
+++ b/third_party/move/move-compiler-v2/tests/lambda/inline-parity/generic_calls.lambda.exp
@@ -1,6 +1,6 @@
 // -- Model dump before env processor pipeline:
 module 0x42::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun id<T>(self: m::S<#0>): m::S<#0> {
@@ -42,7 +42,7 @@ module 0x42::m {
 
 // -- Model dump after env processor unused checks:
 module 0x42::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun id<T>(self: m::S<#0>): m::S<#0> {
@@ -84,7 +84,7 @@ module 0x42::m {
 
 // -- Model dump after env processor type parameter check:
 module 0x42::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun id<T>(self: m::S<#0>): m::S<#0> {
@@ -126,7 +126,7 @@ module 0x42::m {
 
 // -- Model dump after env processor check recursive struct definition:
 module 0x42::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun id<T>(self: m::S<#0>): m::S<#0> {
@@ -168,7 +168,7 @@ module 0x42::m {
 
 // -- Model dump after env processor check cyclic type instantiation:
 module 0x42::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun id<T>(self: m::S<#0>): m::S<#0> {
@@ -210,7 +210,7 @@ module 0x42::m {
 
 // -- Model dump after env processor unused struct params check:
 module 0x42::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun id<T>(self: m::S<#0>): m::S<#0> {
@@ -252,7 +252,7 @@ module 0x42::m {
 
 // -- Model dump after env processor access and use check before inlining:
 module 0x42::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun id<T>(self: m::S<#0>): m::S<#0> {
@@ -294,7 +294,7 @@ module 0x42::m {
 
 // -- Model dump after env processor inlining:
 module 0x42::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun id<T>(self: m::S<#0>): m::S<#0> {
@@ -336,7 +336,7 @@ module 0x42::m {
 
 // -- Model dump after env processor access and use check after inlining:
 module 0x42::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun id<T>(self: m::S<#0>): m::S<#0> {
@@ -378,7 +378,7 @@ module 0x42::m {
 
 // -- Model dump after env processor acquires check:
 module 0x42::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun id<T>(self: m::S<#0>): m::S<#0> {
@@ -420,7 +420,7 @@ module 0x42::m {
 
 // -- Model dump after env processor simplifier:
 module 0x42::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun id<T>(self: m::S<#0>): m::S<#0> {
@@ -462,7 +462,7 @@ module 0x42::m {
 
 // -- Model dump after env processor lambda-lifting:
 module 0x42::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun id<T>(self: m::S<#0>): m::S<#0> {
@@ -507,7 +507,7 @@ module 0x42::m {
 
 // -- Model dump after env processor specification checker:
 module 0x42::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun id<T>(self: m::S<#0>): m::S<#0> {
@@ -552,7 +552,7 @@ module 0x42::m {
 
 // -- Model dump after env processor specification rewriter:
 module 0x42::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun id<T>(self: m::S<#0>): m::S<#0> {
diff --git a/third_party/move/move-compiler-v2/tests/lambda/inline-parity/multi_param.lambda.exp b/third_party/move/move-compiler-v2/tests/lambda/inline-parity/multi_param.lambda.exp
index 1c08fafc28934..0b671cd13c541 100644
--- a/third_party/move/move-compiler-v2/tests/lambda/inline-parity/multi_param.lambda.exp
+++ b/third_party/move/move-compiler-v2/tests/lambda/inline-parity/multi_param.lambda.exp
@@ -1,7 +1,7 @@
 // -- Model dump before env processor pipeline:
 module 0x42::Test {
     use 0x1::vector as V; // resolved as: 0x1::vector
-    struct Elem {
+    struct Elem<K,V> {
         k: K,
         v: V,
     }
@@ -42,7 +42,7 @@ module 0x42::Test {
 // -- Model dump after env processor unused checks:
 module 0x42::Test {
     use 0x1::vector as V; // resolved as: 0x1::vector
-    struct Elem {
+    struct Elem<K,V> {
         k: K,
         v: V,
     }
@@ -83,7 +83,7 @@ module 0x42::Test {
 // -- Model dump after env processor type parameter check:
 module 0x42::Test {
     use 0x1::vector as V; // resolved as: 0x1::vector
-    struct Elem {
+    struct Elem<K,V> {
         k: K,
         v: V,
     }
@@ -124,7 +124,7 @@ module 0x42::Test {
 // -- Model dump after env processor check recursive struct definition:
 module 0x42::Test {
     use 0x1::vector as V; // resolved as: 0x1::vector
-    struct Elem {
+    struct Elem<K,V> {
         k: K,
         v: V,
     }
@@ -165,7 +165,7 @@ module 0x42::Test {
 // -- Model dump after env processor check cyclic type instantiation:
 module 0x42::Test {
     use 0x1::vector as V; // resolved as: 0x1::vector
-    struct Elem {
+    struct Elem<K,V> {
         k: K,
         v: V,
     }
@@ -206,7 +206,7 @@ module 0x42::Test {
 // -- Model dump after env processor unused struct params check:
 module 0x42::Test {
     use 0x1::vector as V; // resolved as: 0x1::vector
-    struct Elem {
+    struct Elem<K,V> {
         k: K,
         v: V,
     }
@@ -247,7 +247,7 @@ module 0x42::Test {
 // -- Model dump after env processor access and use check before inlining:
 module 0x42::Test {
     use 0x1::vector as V; // resolved as: 0x1::vector
-    struct Elem {
+    struct Elem<K,V> {
         k: K,
         v: V,
     }
@@ -288,7 +288,7 @@ module 0x42::Test {
 // -- Model dump after env processor inlining:
 module 0x42::Test {
     use 0x1::vector as V; // resolved as: 0x1::vector
-    struct Elem {
+    struct Elem<K,V> {
         k: K,
         v: V,
     }
@@ -329,7 +329,7 @@ module 0x42::Test {
 // -- Model dump after env processor access and use check after inlining:
 module 0x42::Test {
     use 0x1::vector as V; // resolved as: 0x1::vector
-    struct Elem {
+    struct Elem<K,V> {
         k: K,
         v: V,
     }
@@ -370,7 +370,7 @@ module 0x42::Test {
 // -- Model dump after env processor acquires check:
 module 0x42::Test {
     use 0x1::vector as V; // resolved as: 0x1::vector
-    struct Elem {
+    struct Elem<K,V> {
         k: K,
         v: V,
     }
@@ -411,7 +411,7 @@ module 0x42::Test {
 // -- Model dump after env processor simplifier:
 module 0x42::Test {
     use 0x1::vector as V; // resolved as: 0x1::vector
-    struct Elem {
+    struct Elem<K,V> {
         k: K,
         v: V,
     }
diff --git a/third_party/move/move-compiler-v2/tests/lambda/inline-parity/simple_map_keys.lambda.exp b/third_party/move/move-compiler-v2/tests/lambda/inline-parity/simple_map_keys.lambda.exp
index a5c919527a57e..b395a82d762d6 100644
--- a/third_party/move/move-compiler-v2/tests/lambda/inline-parity/simple_map_keys.lambda.exp
+++ b/third_party/move/move-compiler-v2/tests/lambda/inline-parity/simple_map_keys.lambda.exp
@@ -1,11 +1,11 @@
 // -- Model dump before env processor pipeline:
 module 0x42::simple_map {
     use 0x1::vector; // resolved as: 0x1::vector
-    struct Element {
+    struct Element<Key,Value> {
         key: Key,
         value: Value,
     }
-    struct SimpleMap {
+    struct SimpleMap<Key,Value> {
         data: vector<simple_map::Element<Key, Value>>,
     }
     public fun for_each_ref<Element>(v: &vector<#0>,f: |&#0|) {
@@ -63,11 +63,11 @@ module 0x42::simple_map {
 // -- Model dump after env processor unused checks:
 module 0x42::simple_map {
     use 0x1::vector; // resolved as: 0x1::vector
-    struct Element {
+    struct Element<Key,Value> {
         key: Key,
         value: Value,
     }
-    struct SimpleMap {
+    struct SimpleMap<Key,Value> {
         data: vector<simple_map::Element<Key, Value>>,
     }
     public fun for_each_ref<Element>(v: &vector<#0>,f: |&#0|) {
@@ -125,11 +125,11 @@ module 0x42::simple_map {
 // -- Model dump after env processor type parameter check:
 module 0x42::simple_map {
     use 0x1::vector; // resolved as: 0x1::vector
-    struct Element {
+    struct Element<Key,Value> {
         key: Key,
         value: Value,
     }
-    struct SimpleMap {
+    struct SimpleMap<Key,Value> {
         data: vector<simple_map::Element<Key, Value>>,
     }
     public fun for_each_ref<Element>(v: &vector<#0>,f: |&#0|) {
@@ -187,11 +187,11 @@ module 0x42::simple_map {
 // -- Model dump after env processor check recursive struct definition:
 module 0x42::simple_map {
     use 0x1::vector; // resolved as: 0x1::vector
-    struct Element {
+    struct Element<Key,Value> {
         key: Key,
         value: Value,
     }
-    struct SimpleMap {
+    struct SimpleMap<Key,Value> {
         data: vector<simple_map::Element<Key, Value>>,
     }
     public fun for_each_ref<Element>(v: &vector<#0>,f: |&#0|) {
@@ -249,11 +249,11 @@ module 0x42::simple_map {
 // -- Model dump after env processor check cyclic type instantiation:
 module 0x42::simple_map {
     use 0x1::vector; // resolved as: 0x1::vector
-    struct Element {
+    struct Element<Key,Value> {
         key: Key,
         value: Value,
     }
-    struct SimpleMap {
+    struct SimpleMap<Key,Value> {
         data: vector<simple_map::Element<Key, Value>>,
     }
     public fun for_each_ref<Element>(v: &vector<#0>,f: |&#0|) {
@@ -311,11 +311,11 @@ module 0x42::simple_map {
 // -- Model dump after env processor unused struct params check:
 module 0x42::simple_map {
     use 0x1::vector; // resolved as: 0x1::vector
-    struct Element {
+    struct Element<Key,Value> {
         key: Key,
         value: Value,
     }
-    struct SimpleMap {
+    struct SimpleMap<Key,Value> {
         data: vector<simple_map::Element<Key, Value>>,
     }
     public fun for_each_ref<Element>(v: &vector<#0>,f: |&#0|) {
@@ -373,11 +373,11 @@ module 0x42::simple_map {
 // -- Model dump after env processor access and use check before inlining:
 module 0x42::simple_map {
     use 0x1::vector; // resolved as: 0x1::vector
-    struct Element {
+    struct Element<Key,Value> {
         key: Key,
         value: Value,
     }
-    struct SimpleMap {
+    struct SimpleMap<Key,Value> {
         data: vector<simple_map::Element<Key, Value>>,
     }
     public fun for_each_ref<Element>(v: &vector<#0>,f: |&#0|) {
@@ -435,11 +435,11 @@ module 0x42::simple_map {
 // -- Model dump after env processor inlining:
 module 0x42::simple_map {
     use 0x1::vector; // resolved as: 0x1::vector
-    struct Element {
+    struct Element<Key,Value> {
         key: Key,
         value: Value,
     }
-    struct SimpleMap {
+    struct SimpleMap<Key,Value> {
         data: vector<simple_map::Element<Key, Value>>,
     }
     public fun for_each_ref<Element>(v: &vector<#0>,f: |&#0|) {
@@ -497,11 +497,11 @@ module 0x42::simple_map {
 // -- Model dump after env processor access and use check after inlining:
 module 0x42::simple_map {
     use 0x1::vector; // resolved as: 0x1::vector
-    struct Element {
+    struct Element<Key,Value> {
         key: Key,
         value: Value,
     }
-    struct SimpleMap {
+    struct SimpleMap<Key,Value> {
         data: vector<simple_map::Element<Key, Value>>,
     }
     public fun for_each_ref<Element>(v: &vector<#0>,f: |&#0|) {
@@ -559,11 +559,11 @@ module 0x42::simple_map {
 // -- Model dump after env processor acquires check:
 module 0x42::simple_map {
     use 0x1::vector; // resolved as: 0x1::vector
-    struct Element {
+    struct Element<Key,Value> {
         key: Key,
         value: Value,
     }
-    struct SimpleMap {
+    struct SimpleMap<Key,Value> {
         data: vector<simple_map::Element<Key, Value>>,
     }
     public fun for_each_ref<Element>(v: &vector<#0>,f: |&#0|) {
@@ -621,11 +621,11 @@ module 0x42::simple_map {
 // -- Model dump after env processor simplifier:
 module 0x42::simple_map {
     use 0x1::vector; // resolved as: 0x1::vector
-    struct Element {
+    struct Element<Key,Value> {
         key: Key,
         value: Value,
     }
-    struct SimpleMap {
+    struct SimpleMap<Key,Value> {
         data: vector<simple_map::Element<Key, Value>>,
     }
     public fun for_each_ref<Element>(v: &vector<#0>,f: |&#0|) {
diff --git a/third_party/move/move-compiler-v2/tests/lambda/inline-parity/unpack_generic_struct.lambda.exp b/third_party/move/move-compiler-v2/tests/lambda/inline-parity/unpack_generic_struct.lambda.exp
index 8eee3b409ad21..7c704051d5f7f 100644
--- a/third_party/move/move-compiler-v2/tests/lambda/inline-parity/unpack_generic_struct.lambda.exp
+++ b/third_party/move/move-compiler-v2/tests/lambda/inline-parity/unpack_generic_struct.lambda.exp
@@ -1,10 +1,10 @@
 // -- Model dump before env processor pipeline:
 module 0x42::m {
     use std::vector;
-    struct E {
+    struct E<Key> {
         key: Key,
     }
-    struct Option {
+    struct Option<Element> {
         vec: vector<Element>,
     }
     public fun destroy_none<Element>(t: m::Option<#0>) {
@@ -47,10 +47,10 @@ module 0x42::m {
 // -- Model dump after env processor unused checks:
 module 0x42::m {
     use std::vector;
-    struct E {
+    struct E<Key> {
         key: Key,
     }
-    struct Option {
+    struct Option<Element> {
         vec: vector<Element>,
     }
     public fun destroy_none<Element>(t: m::Option<#0>) {
@@ -93,10 +93,10 @@ module 0x42::m {
 // -- Model dump after env processor type parameter check:
 module 0x42::m {
     use std::vector;
-    struct E {
+    struct E<Key> {
         key: Key,
     }
-    struct Option {
+    struct Option<Element> {
         vec: vector<Element>,
     }
     public fun destroy_none<Element>(t: m::Option<#0>) {
@@ -139,10 +139,10 @@ module 0x42::m {
 // -- Model dump after env processor check recursive struct definition:
 module 0x42::m {
     use std::vector;
-    struct E {
+    struct E<Key> {
         key: Key,
     }
-    struct Option {
+    struct Option<Element> {
         vec: vector<Element>,
     }
     public fun destroy_none<Element>(t: m::Option<#0>) {
@@ -185,10 +185,10 @@ module 0x42::m {
 // -- Model dump after env processor check cyclic type instantiation:
 module 0x42::m {
     use std::vector;
-    struct E {
+    struct E<Key> {
         key: Key,
     }
-    struct Option {
+    struct Option<Element> {
         vec: vector<Element>,
     }
     public fun destroy_none<Element>(t: m::Option<#0>) {
@@ -231,10 +231,10 @@ module 0x42::m {
 // -- Model dump after env processor unused struct params check:
 module 0x42::m {
     use std::vector;
-    struct E {
+    struct E<Key> {
         key: Key,
     }
-    struct Option {
+    struct Option<Element> {
         vec: vector<Element>,
     }
     public fun destroy_none<Element>(t: m::Option<#0>) {
@@ -277,10 +277,10 @@ module 0x42::m {
 // -- Model dump after env processor access and use check before inlining:
 module 0x42::m {
     use std::vector;
-    struct E {
+    struct E<Key> {
         key: Key,
     }
-    struct Option {
+    struct Option<Element> {
         vec: vector<Element>,
     }
     public fun destroy_none<Element>(t: m::Option<#0>) {
@@ -323,10 +323,10 @@ module 0x42::m {
 // -- Model dump after env processor inlining:
 module 0x42::m {
     use std::vector;
-    struct E {
+    struct E<Key> {
         key: Key,
     }
-    struct Option {
+    struct Option<Element> {
         vec: vector<Element>,
     }
     public fun destroy_none<Element>(t: m::Option<#0>) {
@@ -369,10 +369,10 @@ module 0x42::m {
 // -- Model dump after env processor access and use check after inlining:
 module 0x42::m {
     use std::vector;
-    struct E {
+    struct E<Key> {
         key: Key,
     }
-    struct Option {
+    struct Option<Element> {
         vec: vector<Element>,
     }
     public fun destroy_none<Element>(t: m::Option<#0>) {
@@ -415,10 +415,10 @@ module 0x42::m {
 // -- Model dump after env processor acquires check:
 module 0x42::m {
     use std::vector;
-    struct E {
+    struct E<Key> {
         key: Key,
     }
-    struct Option {
+    struct Option<Element> {
         vec: vector<Element>,
     }
     public fun destroy_none<Element>(t: m::Option<#0>) {
@@ -461,10 +461,10 @@ module 0x42::m {
 // -- Model dump after env processor simplifier:
 module 0x42::m {
     use std::vector;
-    struct E {
+    struct E<Key> {
         key: Key,
     }
-    struct Option {
+    struct Option<Element> {
         vec: vector<Element>,
     }
     public fun destroy_none<Element>(t: m::Option<#0>) {
@@ -507,10 +507,10 @@ module 0x42::m {
 // -- Model dump after env processor lambda-lifting:
 module 0x42::m {
     use std::vector;
-    struct E {
+    struct E<Key> {
         key: Key,
     }
-    struct Option {
+    struct Option<Element> {
         vec: vector<Element>,
     }
     public fun destroy_none<Element>(t: m::Option<#0>) {
@@ -559,10 +559,10 @@ module 0x42::m {
 // -- Model dump after env processor specification checker:
 module 0x42::m {
     use std::vector;
-    struct E {
+    struct E<Key> {
         key: Key,
     }
-    struct Option {
+    struct Option<Element> {
         vec: vector<Element>,
     }
     public fun destroy_none<Element>(t: m::Option<#0>) {
@@ -611,10 +611,10 @@ module 0x42::m {
 // -- Model dump after env processor specification rewriter:
 module 0x42::m {
     use std::vector;
-    struct E {
+    struct E<Key> {
         key: Key,
     }
-    struct Option {
+    struct Option<Element> {
         vec: vector<Element>,
     }
     public fun destroy_none<Element>(t: m::Option<#0>) {