diff --git a/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/defer/transforms/DeferredDeepRenameTest.kt b/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/defer/transforms/DeferredDeepRenameTest.kt
new file mode 100644
index 000000000..1eb11a0a8
--- /dev/null
+++ b/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/defer/transforms/DeferredDeepRenameTest.kt
@@ -0,0 +1,74 @@
+package graphql.nadel.tests.next.fixtures.defer.transforms
+
+import graphql.nadel.NadelExecutionHints
+import graphql.nadel.tests.next.NadelIntegrationTest
+
+open class DeferredDeepRenameTest : NadelIntegrationTest(
+    query = """
+      query {
+        ...@defer {
+          details {
+              name # Deep renamed from Issue.name
+          }
+        }
+      }
+    """.trimIndent(),
+    services = listOf(
+        Service(
+            name = "defer",
+            overallSchema = """
+                directive @defer(if: Boolean, label: String) on FRAGMENT_SPREAD | INLINE_FRAGMENT
+
+                type Query {
+                  details: IssueDetail
+                }
+                type IssueDetail {
+                  name: String @renamed(from: "issue.name")
+                }
+
+            """.trimIndent(),
+            underlyingSchema = """
+                directive @defer(if: Boolean, label: String) on FRAGMENT_SPREAD | INLINE_FRAGMENT
+
+                type Issue {
+                  name: String
+                }
+            
+                type IssueDetail {
+                  issue: Issue
+                }
+            
+                type Query {
+                  details: IssueDetail
+                }
+
+            """.trimIndent(),
+            runtimeWiring = { wiring ->
+                wiring
+                    .type("Query") { type ->
+                        type
+                            .dataFetcher("details") { env ->
+                                Any()
+                            }
+                    }
+                    .type("IssueDetail") { type ->
+                        type
+                            .dataFetcher("issue") { env ->
+                                Any()
+                            }
+                    }
+                    .type("Issue") { type ->
+                        type
+                            .dataFetcher("name") { env ->
+                                "Issue-1"
+                            }
+                    }
+            },
+        ),
+    ),
+) {
+    override fun makeExecutionHints(): NadelExecutionHints.Builder {
+        return super.makeExecutionHints()
+            .deferSupport { true }
+    }
+}
diff --git a/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/defer/transforms/DeferredDeepRenameTestSnapshot.kt b/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/defer/transforms/DeferredDeepRenameTestSnapshot.kt
new file mode 100644
index 000000000..868c74fc1
--- /dev/null
+++ b/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/defer/transforms/DeferredDeepRenameTestSnapshot.kt
@@ -0,0 +1,103 @@
+// @formatter:off
+package graphql.nadel.tests.next.fixtures.defer.transforms
+
+import graphql.nadel.tests.next.ExpectedNadelResult
+import graphql.nadel.tests.next.ExpectedServiceCall
+import graphql.nadel.tests.next.TestSnapshot
+import graphql.nadel.tests.next.listOfJsonStrings
+import kotlin.Suppress
+import kotlin.collections.List
+import kotlin.collections.listOf
+
+private suspend fun main() {
+    graphql.nadel.tests.next.update<DeferredDeepRenameTest>()
+}
+
+/**
+ * This class is generated. Do NOT modify.
+ *
+ * Refer to [graphql.nadel.tests.next.UpdateTestSnapshots
+ */
+@Suppress("unused")
+public class DeferredDeepRenameTestSnapshot : TestSnapshot() {
+    override val calls: List<ExpectedServiceCall> = listOf(
+            ExpectedServiceCall(
+                service = "defer",
+                query = """
+                | {
+                |   ... @defer {
+                |     details {
+                |       deep_rename__name__issue: issue {
+                |         name
+                |       }
+                |       __typename__deep_rename__name: __typename
+                |     }
+                |   }
+                | }
+                """.trimMargin(),
+                variables = "{}",
+                result = """
+                | {
+                |   "data": {},
+                |   "hasNext": true
+                | }
+                """.trimMargin(),
+                delayedResults = listOfJsonStrings(
+                    """
+                    | {
+                    |   "hasNext": false,
+                    |   "incremental": [
+                    |     {
+                    |       "path": [],
+                    |       "data": {
+                    |         "details": {
+                    |           "name": "Issue-1"
+                    |         }
+                    |       }
+                    |     }
+                    |   ]
+                    | }
+                    """.trimMargin(),
+                ),
+            ),
+        )
+
+    /**
+     * ```json
+     * {
+     *   "data": {
+     *     "details": {
+     *       "name": "Issue-1"
+     *     }
+     *   }
+     * }
+     * ```
+     */
+    override val result: ExpectedNadelResult = ExpectedNadelResult(
+            result = """
+            | {
+            |   "data": {
+            |     "details": null
+            |   },
+            |   "hasNext": true
+            | }
+            """.trimMargin(),
+            delayedResults = listOfJsonStrings(
+                """
+                | {
+                |   "hasNext": false,
+                |   "incremental": [
+                |     {
+                |       "path": [],
+                |       "data": {
+                |         "details": {
+                |           "name": "Issue-1"
+                |         }
+                |       }
+                |     }
+                |   ]
+                | }
+                """.trimMargin(),
+            ),
+        )
+}
diff --git a/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/defer/transforms/DeferredFieldIsSkippedIfTrueTest.kt b/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/defer/transforms/DeferredFieldIsSkippedIfTrueTest.kt
new file mode 100644
index 000000000..b44f24d15
--- /dev/null
+++ b/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/defer/transforms/DeferredFieldIsSkippedIfTrueTest.kt
@@ -0,0 +1,69 @@
+package graphql.nadel.tests.next.fixtures.defer.transforms
+
+import graphql.nadel.NadelExecutionHints
+import graphql.nadel.tests.next.NadelIntegrationTest
+
+open class DeferredFieldIsSkippedIfTrueTest : NadelIntegrationTest(
+    query = """
+      query {
+        defer {
+          ...@defer {
+            hello @skip(if: false)
+            overallString @skip (if: true)
+          }
+        }
+      }
+    """.trimIndent(),
+    services = listOf(
+        Service(
+            name = "defer",
+            overallSchema = """
+                directive @defer(if: Boolean, label: String) on FRAGMENT_SPREAD | INLINE_FRAGMENT
+
+                type Query {
+                  defer: DeferApi 
+                }
+                type DeferApi {
+                  hello: String
+                  overallString: String @renamed(from: "underlyingString")
+                }
+
+            """.trimIndent(),
+            underlyingSchema = """
+                directive @defer(if: Boolean, label: String) on FRAGMENT_SPREAD | INLINE_FRAGMENT
+
+                type Query {
+                  defer: DeferApi
+                }
+                type DeferApi {
+                  hello: String
+                  underlyingString: String
+                }
+
+            """.trimIndent(),
+            runtimeWiring = { wiring ->
+                wiring
+                    .type("Query") { type ->
+                        type
+                            .dataFetcher("defer") { env ->
+                                Any()
+                            }
+                    }
+                    .type("DeferApi") { type ->
+                        type
+                            .dataFetcher("hello") { env ->
+                                "hello there"
+                            }
+                            .dataFetcher("underlyingString") { env ->
+                                "string for the deferred renamed field"
+                            }
+                    }
+            },
+        ),
+    ),
+) {
+    override fun makeExecutionHints(): NadelExecutionHints.Builder {
+        return super.makeExecutionHints()
+            .deferSupport { true }
+    }
+}
\ No newline at end of file
diff --git a/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/defer/transforms/DeferredFieldIsSkippedIfTrueTestSnapshot.kt b/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/defer/transforms/DeferredFieldIsSkippedIfTrueTestSnapshot.kt
new file mode 100644
index 000000000..681e969c8
--- /dev/null
+++ b/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/defer/transforms/DeferredFieldIsSkippedIfTrueTestSnapshot.kt
@@ -0,0 +1,102 @@
+// @formatter:off
+package graphql.nadel.tests.next.fixtures.defer.transforms
+
+import graphql.nadel.tests.next.ExpectedNadelResult
+import graphql.nadel.tests.next.ExpectedServiceCall
+import graphql.nadel.tests.next.TestSnapshot
+import graphql.nadel.tests.next.listOfJsonStrings
+import kotlin.Suppress
+import kotlin.collections.List
+import kotlin.collections.listOf
+
+private suspend fun main() {
+    graphql.nadel.tests.next.update<DeferredFieldIsSkippedIfTrueTest>()
+}
+
+/**
+ * This class is generated. Do NOT modify.
+ *
+ * Refer to [graphql.nadel.tests.next.UpdateTestSnapshots
+ */
+@Suppress("unused")
+public class DeferredFieldIsSkippedIfTrueTestSnapshot : TestSnapshot() {
+    override val calls: List<ExpectedServiceCall> = listOf(
+            ExpectedServiceCall(
+                service = "defer",
+                query = """
+                | {
+                |   defer {
+                |     ... @defer {
+                |       hello
+                |     }
+                |   }
+                | }
+                """.trimMargin(),
+                variables = "{}",
+                result = """
+                | {
+                |   "data": {
+                |     "defer": {}
+                |   },
+                |   "hasNext": true
+                | }
+                """.trimMargin(),
+                delayedResults = listOfJsonStrings(
+                    """
+                    | {
+                    |   "hasNext": false,
+                    |   "incremental": [
+                    |     {
+                    |       "path": [
+                    |         "defer"
+                    |       ],
+                    |       "data": {
+                    |         "hello": "hello there"
+                    |       }
+                    |     }
+                    |   ]
+                    | }
+                    """.trimMargin(),
+                ),
+            ),
+        )
+
+    /**
+     * ```json
+     * {
+     *   "data": {
+     *     "defer": {
+     *       "hello": "hello there"
+     *     }
+     *   }
+     * }
+     * ```
+     */
+    override val result: ExpectedNadelResult = ExpectedNadelResult(
+            result = """
+            | {
+            |   "data": {
+            |     "defer": {}
+            |   },
+            |   "hasNext": true
+            | }
+            """.trimMargin(),
+            delayedResults = listOfJsonStrings(
+                """
+                | {
+                |   "hasNext": false,
+                |   "incremental": [
+                |     {
+                |       "path": [
+                |         "defer"
+                |       ],
+                |       "data": {
+                |         "hello": "hello there"
+                |       }
+                |     }
+                |   ]
+                | }
+                """.trimMargin(),
+            ),
+        )
+}
diff --git a/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/defer/transforms/RenamedTypeIsDeferredTest.kt b/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/defer/transforms/RenamedTypeIsDeferredTest.kt
new file mode 100644
index 000000000..272ec2996
--- /dev/null
+++ b/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/defer/transforms/RenamedTypeIsDeferredTest.kt
@@ -0,0 +1,84 @@
+package graphql.nadel.tests.next.fixtures.defer.transforms
+
+import graphql.nadel.NadelExecutionHints
+import graphql.nadel.tests.next.NadelIntegrationTest
+
+open class RenamedTypeIsDeferredTest : NadelIntegrationTest(
+    query = """
+      query {
+        zoo {
+          ...@defer {
+            monkey {
+              name
+              __typename
+            }
+          }
+          cat {
+            name
+            ...@defer {
+              __typename
+            }
+          }          
+        }
+      }
+    """.trimIndent(),
+    services = listOf(
+        Service(
+            name = "defer",
+            overallSchema = """
+                directive @defer(if: Boolean, label: String) on FRAGMENT_SPREAD | INLINE_FRAGMENT
+
+                type Query {
+                  zoo: ZooApi 
+                }
+                type ZooApi {
+                  monkey: Monkey 
+                  cat: Cat
+                }
+                type Monkey @renamed(from: "Donkey"){
+                  name: String
+                }
+                type Cat @renamed(from: "Rat"){
+                  name: String
+                }
+                
+
+            """.trimIndent(),
+            runtimeWiring = { wiring ->
+                wiring
+                    .type("Query") { type ->
+                        type
+                            .dataFetcher("zoo") { env ->
+                                Any()
+                            }
+                    }
+                    .type("ZooApi") { type ->
+                        type
+                            .dataFetcher("monkey") { env ->
+                                Any()
+                            }
+                            .dataFetcher("cat") { env ->
+                                Any()
+                            }
+                    }
+                    .type("Donkey") { type ->
+                        type
+                            .dataFetcher("name") { env ->
+                                "Harambe"
+                            }
+                    }
+                    .type("Rat") { type ->
+                        type
+                            .dataFetcher("name") { env ->
+                                "Garfield"
+                            }
+                    }
+            },
+        ),
+    ),
+) {
+    override fun makeExecutionHints(): NadelExecutionHints.Builder {
+        return super.makeExecutionHints()
+            .deferSupport { true }
+    }
+}
\ No newline at end of file
diff --git a/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/defer/transforms/RenamedTypeIsDeferredTestSnapshot.kt b/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/defer/transforms/RenamedTypeIsDeferredTestSnapshot.kt
new file mode 100644
index 000000000..4941a1150
--- /dev/null
+++ b/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/defer/transforms/RenamedTypeIsDeferredTestSnapshot.kt
@@ -0,0 +1,164 @@
+// @formatter:off
+package graphql.nadel.tests.next.fixtures.defer.transforms
+
+import graphql.nadel.tests.next.ExpectedNadelResult
+import graphql.nadel.tests.next.ExpectedServiceCall
+import graphql.nadel.tests.next.TestSnapshot
+import graphql.nadel.tests.next.listOfJsonStrings
+import kotlin.Suppress
+import kotlin.collections.List
+import kotlin.collections.listOf
+
+private suspend fun main() {
+    graphql.nadel.tests.next.update<RenamedTypeIsDeferredTest>()
+}
+
+/**
+ * This class is generated. Do NOT modify.
+ *
+ * Refer to [graphql.nadel.tests.next.UpdateTestSnapshots
+ */
+@Suppress("unused")
+public class RenamedTypeIsDeferredTestSnapshot : TestSnapshot() {
+    override val calls: List<ExpectedServiceCall> = listOf(
+            ExpectedServiceCall(
+                service = "defer",
+                query = """
+                | {
+                |   zoo {
+                |     cat {
+                |       name
+                |       ... @defer {
+                |         __typename
+                |       }
+                |     }
+                |     ... @defer {
+                |       monkey {
+                |         name
+                |         __typename
+                |       }
+                |     }
+                |   }
+                | }
+                """.trimMargin(),
+                variables = "{}",
+                result = """
+                | {
+                |   "data": {
+                |     "zoo": {
+                |       "cat": {
+                |         "name": "Garfield"
+                |       }
+                |     }
+                |   },
+                |   "hasNext": true
+                | }
+                """.trimMargin(),
+                delayedResults = listOfJsonStrings(
+                    """
+                    | {
+                    |   "hasNext": false,
+                    |   "incremental": [
+                    |     {
+                    |       "path": [
+                    |         "zoo",
+                    |         "cat"
+                    |       ],
+                    |       "data": {
+                    |         "__typename": "Cat"
+                    |       }
+                    |     }
+                    |   ]
+                    | }
+                    """.trimMargin(),
+                    """
+                    | {
+                    |   "hasNext": true,
+                    |   "incremental": [
+                    |     {
+                    |       "path": [
+                    |         "zoo"
+                    |       ],
+                    |       "data": {
+                    |         "monkey": {
+                    |           "name": "Harambe",
+                    |           "__typename": "Monkey"
+                    |         }
+                    |       }
+                    |     }
+                    |   ]
+                    | }
+                    """.trimMargin(),
+                ),
+            ),
+        )
+
+    /**
+     * ```json
+     * {
+     *   "data": {
+     *     "zoo": {
+     *       "cat": {
+     *         "name": "Garfield",
+     *         "__typename": "Cat"
+     *       },
+     *       "monkey": {
+     *         "name": "Harambe",
+     *         "__typename": "Monkey"
+     *       }
+     *     }
+     *   }
+     * }
+     * ```
+     */
+    override val result: ExpectedNadelResult = ExpectedNadelResult(
+            result = """
+            | {
+            |   "data": {
+            |     "zoo": {
+            |       "cat": {
+            |         "name": "Garfield"
+            |       }
+            |     }
+            |   },
+            |   "hasNext": true
+            | }
+            """.trimMargin(),
+            delayedResults = listOfJsonStrings(
+                """
+                | {
+                |   "hasNext": false,
+                |   "incremental": [
+                |     {
+                |       "path": [
+                |         "zoo",
+                |         "cat"
+                |       ],
+                |       "data": {
+                |         "__typename": "Cat"
+                |       }
+                |     }
+                |   ]
+                | }
+                """.trimMargin(),
+                """
+                | {
+                |   "hasNext": true,
+                |   "incremental": [
+                |     {
+                |       "path": [
+                |         "zoo"
+                |       ],
+                |       "data": {
+                |         "monkey": {
+                |           "name": "Harambe",
+                |           "__typename": "Monkey"
+                |         }
+                |       }
+                |     }
+                |   ]
+                | }
+                """.trimMargin(),
+            ),
+        )
+}