diff --git a/tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/BUILD.bazel b/tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/BUILD.bazel similarity index 100% rename from tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/BUILD.bazel rename to tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/BUILD.bazel diff --git a/tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/ios/NestedHeaders.framework/Headers/NestedHeadersShared.h b/tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/ios/NestedHeaders.framework/Headers/NestedHeadersShared.h similarity index 100% rename from tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/ios/NestedHeaders.framework/Headers/NestedHeadersShared.h rename to tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/ios/NestedHeaders.framework/Headers/NestedHeadersShared.h diff --git a/tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/ios/NestedHeaders.framework/Headers/com/foo/protos/common/A.h b/tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/ios/NestedHeaders.framework/Headers/com/foo/protos/common/A.h similarity index 100% rename from tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/ios/NestedHeaders.framework/Headers/com/foo/protos/common/A.h rename to tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/ios/NestedHeaders.framework/Headers/com/foo/protos/common/A.h diff --git a/tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/ios/NestedHeaders.framework/Headers/com/foo/protos/common/B.h b/tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/ios/NestedHeaders.framework/Headers/com/foo/protos/common/B.h similarity index 100% rename from tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/ios/NestedHeaders.framework/Headers/com/foo/protos/common/B.h rename to tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/ios/NestedHeaders.framework/Headers/com/foo/protos/common/B.h diff --git a/tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/ios/NestedHeaders.framework/Headers/com/foo/protos/common/C.h b/tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/ios/NestedHeaders.framework/Headers/com/foo/protos/common/C.h similarity index 100% rename from tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/ios/NestedHeaders.framework/Headers/com/foo/protos/common/C.h rename to tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/ios/NestedHeaders.framework/Headers/com/foo/protos/common/C.h diff --git a/tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/ios/NestedHeaders.framework/Headers/com/google/protobuf/D.h b/tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/ios/NestedHeaders.framework/Headers/com/google/protobuf/D.h similarity index 100% rename from tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/ios/NestedHeaders.framework/Headers/com/google/protobuf/D.h rename to tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/ios/NestedHeaders.framework/Headers/com/google/protobuf/D.h diff --git a/tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/ios/NestedHeaders.framework/Headers/src/main/java/com/foo/shared/i18n/E.h b/tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/ios/NestedHeaders.framework/Headers/src/main/java/com/foo/shared/i18n/E.h similarity index 100% rename from tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/ios/NestedHeaders.framework/Headers/src/main/java/com/foo/shared/i18n/E.h rename to tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/ios/NestedHeaders.framework/Headers/src/main/java/com/foo/shared/i18n/E.h diff --git a/tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/ios/NestedHeaders.framework/Headers/src/main/java/com/foo/shared/i18n/F.h b/tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/ios/NestedHeaders.framework/Headers/src/main/java/com/foo/shared/i18n/F.h similarity index 100% rename from tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/ios/NestedHeaders.framework/Headers/src/main/java/com/foo/shared/i18n/F.h rename to tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/ios/NestedHeaders.framework/Headers/src/main/java/com/foo/shared/i18n/F.h diff --git a/tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/ios/NestedHeaders.framework/Headers/src/main/java/com/foo/shared/i18n/G.h b/tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/ios/NestedHeaders.framework/Headers/src/main/java/com/foo/shared/i18n/G.h similarity index 100% rename from tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/ios/NestedHeaders.framework/Headers/src/main/java/com/foo/shared/i18n/G.h rename to tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/ios/NestedHeaders.framework/Headers/src/main/java/com/foo/shared/i18n/G.h diff --git a/tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/ios/NestedHeaders.framework/Headers/src/main/java/com/foo/shared/i18n/H.h b/tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/ios/NestedHeaders.framework/Headers/src/main/java/com/foo/shared/i18n/H.h similarity index 100% rename from tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/ios/NestedHeaders.framework/Headers/src/main/java/com/foo/shared/i18n/H.h rename to tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/ios/NestedHeaders.framework/Headers/src/main/java/com/foo/shared/i18n/H.h diff --git a/tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/ios/NestedHeaders.framework/Headers/src/main/java/com/foo/shared/i18n/I.h b/tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/ios/NestedHeaders.framework/Headers/src/main/java/com/foo/shared/i18n/I.h similarity index 100% rename from tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/ios/NestedHeaders.framework/Headers/src/main/java/com/foo/shared/i18n/I.h rename to tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/ios/NestedHeaders.framework/Headers/src/main/java/com/foo/shared/i18n/I.h diff --git a/tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/ios/NestedHeaders.framework/Modules/module.modulemap b/tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/ios/NestedHeaders.framework/Modules/module.modulemap similarity index 100% rename from tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/ios/NestedHeaders.framework/Modules/module.modulemap rename to tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/ios/NestedHeaders.framework/Modules/module.modulemap diff --git a/tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/ios/NestedHeaders.framework/NestedHeaders b/tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/ios/NestedHeaders.framework/NestedHeaders similarity index 100% rename from tests/ios/unit-test/test-imports-app/frameworks/NestedHeaders/ios/NestedHeaders.framework/NestedHeaders rename to tests/ios/unit-test/test-imports-app/frameworks/NestedHeadersFramework/ios/NestedHeaders.framework/NestedHeaders