Rename layoutlib plugins to re-enable native for all

Change Layoutlib Native to Layoutlib and Layoutlib Standard to
Layoutlib Legacy. That will re-enable layoutlib native for all
users, as both plugins have a new id.

Bug: 174144030
Test: N/A
Change-Id: I52705ee7c42938a0fabce78dc2e26ea6962646c6

29 files changed, 56 insertions, 57 deletions

diff --git a/.idea/modules.xml b/.idea/modules.xml
index ace94905734..edeb0cdc8a1 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -145,9 +145,9 @@
       <module fileurl="file://$PROJECT_DIR$/layout-inspector/intellij.android.layout-inspector.tests.iml" filepath="$PROJECT_DIR$/layout-inspector/intellij.android.layout-inspector.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/layout-ui/intellij.android.layout-ui.iml" filepath="$PROJECT_DIR$/layout-ui/intellij.android.layout-ui.iml" />
       <module fileurl="file://$PROJECT_DIR$/layoutlib/intellij.android.layoutlib.iml" filepath="$PROJECT_DIR$/layoutlib/intellij.android.layoutlib.iml" />
+      <module fileurl="file://$PROJECT_DIR$/layoutlib-legacy/intellij.android.layoutlib-legacy.iml" filepath="$PROJECT_DIR$/layoutlib-legacy/intellij.android.layoutlib-legacy.iml" />
       <module fileurl="file://$PROJECT_DIR$/layoutlib-loader/intellij.android.layoutlib-loader.iml" filepath="$PROJECT_DIR$/layoutlib-loader/intellij.android.layoutlib-loader.iml" />
       <module fileurl="file://$PROJECT_DIR$/layoutlib-loader/intellij.android.layoutlib-loader.tests.iml" filepath="$PROJECT_DIR$/layoutlib-loader/intellij.android.layoutlib-loader.tests.iml" />
-      <module fileurl="file://$PROJECT_DIR$/layoutlib-native/intellij.android.layoutlib-native.iml" filepath="$PROJECT_DIR$/layoutlib-native/intellij.android.layoutlib-native.iml" />
       <module fileurl="file://$PROJECT_DIR$/mlkit/intellij.android.mlkit.iml" filepath="$PROJECT_DIR$/mlkit/intellij.android.mlkit.iml" />
       <module fileurl="file://$PROJECT_DIR$/mlkit/intellij.android.mlkit.tests.iml" filepath="$PROJECT_DIR$/mlkit/intellij.android.mlkit.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/nav/editor/intellij.android.nav.editor.iml" filepath="$PROJECT_DIR$/nav/editor/intellij.android.nav.editor.iml" />
diff --git a/android-uitests/BUILD b/android-uitests/BUILD
index 9d7b610b299..c88ee2f80aa 100644
--- a/android-uitests/BUILD
+++ b/android-uitests/BUILD
@@ -80,7 +80,7 @@ iml_module(
         "//tools/base/deploy/deployer:studio.android.sdktools.deployer[module, test]",
         "//tools/adt/idea/deploy:intellij.android.deploy[module, test]",
         "//tools/adt/idea/project-system:intellij.android.projectSystem[module, test]",
-        "//prebuilts/studio/layoutlib/data:layoutlib_native[test]",
+        "//prebuilts/studio/layoutlib/data:layoutlib[test]",
         "//tools/adt/idea/layout-inspector:intellij.android.layout-inspector[module, test]",
         "//tools/adt/idea/adt-ui-model:intellij.android.adt.ui.model[module, test]",
         "//tools/adt/idea/android-transport:intellij.android.transport[module, test]",
diff --git a/android-uitests/intellij.android.guiTests.iml b/android-uitests/intellij.android.guiTests.iml
index b1f362a8e7b..040fb02e785 100644
--- a/android-uitests/intellij.android.guiTests.iml
+++ b/android-uitests/intellij.android.guiTests.iml
@@ -40,7 +40,7 @@
     <orderEntry type="module-library" scope="TEST">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../prebuilts/studio/layoutlib/data/layoutlib_native.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../prebuilts/studio/layoutlib/data/layoutlib.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/android/BUILD b/android/BUILD
index c0c8542b516..6961289270b 100644
--- a/android/BUILD
+++ b/android/BUILD
@@ -106,7 +106,7 @@ iml_module(
         "//tools/adt/idea/resources-base:intellij.android.resources-base[module]",
         "//tools/adt/idea/.idea/libraries:studio-proto",
         "//tools/adt/idea/.idea/libraries:perfetto-proto",
-        "//prebuilts/studio/layoutlib/data:layoutlib_native",
+        "//prebuilts/studio/layoutlib/data:layoutlib",
         "//tools/base/wizard/template-plugin:studio.intellij.android.wizardTemplate.plugin[module]",
         "//tools/adt/idea/lint:intellij.lint[module]",
         "//tools/adt/idea/gradle-dsl:intellij.android.gradle.dsl[module]",
diff --git a/android/intellij.android.core.iml b/android/intellij.android.core.iml
index 2d900a1213e..2898966a51c 100755
--- a/android/intellij.android.core.iml
+++ b/android/intellij.android.core.iml
@@ -120,7 +120,7 @@
     <orderEntry type="module-library" scope="PROVIDED">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../prebuilts/studio/layoutlib/data/layoutlib_native.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../prebuilts/studio/layoutlib/data/layoutlib.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/android/src/META-INF/android-plugin.xml b/android/src/META-INF/android-plugin.xml
index 256baac73c9..ef4973daaf0 100644
--- a/android/src/META-INF/android-plugin.xml
+++ b/android/src/META-INF/android-plugin.xml
@@ -25,8 +25,8 @@
   <depends>org.jetbrains.kotlin</depends>
 
   <!-- One of the layoutlib plugins is required -->
-  <depends optional="true" config-file="layoutlib-native.xml">com.android.layoutlib.native</depends>
-  <depends optional="true" config-file="layoutlib-standard.xml">com.android.layoutlib.standard</depends>
+  <depends optional="true" config-file="layoutlib.xml">com.android.layoutlib</depends>
+  <depends optional="true" config-file="layoutlib-legacy.xml">com.android.layoutlib.legacy</depends>
 
   <depends optional="true" config-file="androidstudio.xml">com.intellij.modules.androidstudio</depends>
   <depends optional="true" config-file="database-support.xml">com.intellij.database</depends>
diff --git a/android/src/META-INF/layoutlib-native.xml b/android/src/META-INF/layoutlib-legacy.xml
index add10e390f9..add10e390f9 100644
--- a/android/src/META-INF/layoutlib-native.xml
+++ b/android/src/META-INF/layoutlib-legacy.xml
diff --git a/android/src/META-INF/layoutlib-standard.xml b/android/src/META-INF/layoutlib.xml
index add10e390f9..add10e390f9 100644
--- a/android/src/META-INF/layoutlib-standard.xml
+++ b/android/src/META-INF/layoutlib.xml
diff --git a/designer-perf-tests/BUILD b/designer-perf-tests/BUILD
index 5d4cfd710c6..28001b61ad2 100644
--- a/designer-perf-tests/BUILD
+++ b/designer-perf-tests/BUILD
@@ -43,7 +43,7 @@ iml_module(
         "//tools/adt/idea/android-kotlin:intellij.android.kotlin.extensions[module, test]",
         "//tools/adt/idea/compose-designer:intellij.android.compose-designer[module, test]",
         "//tools/adt/idea/android-test-framework:intellij.android.testFramework[module, test]",
-        "//prebuilts/studio/layoutlib/data:layoutlib_native",
+        "//prebuilts/studio/layoutlib/data:layoutlib",
         "//tools/adt/idea/intellij.android.compose-common[module]",
     ],
 )
diff --git a/designer-perf-tests/intellij.android.designer-perf-tests.iml b/designer-perf-tests/intellij.android.designer-perf-tests.iml
index 664767753be..9770740b828 100644
--- a/designer-perf-tests/intellij.android.designer-perf-tests.iml
+++ b/designer-perf-tests/intellij.android.designer-perf-tests.iml
@@ -22,7 +22,7 @@
     <orderEntry type="module-library" scope="PROVIDED">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../prebuilts/studio/layoutlib/data/layoutlib_native.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../prebuilts/studio/layoutlib/data/layoutlib.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/designer/BUILD b/designer/BUILD
index 6ee6b17b348..59d119e1870 100644
--- a/designer/BUILD
+++ b/designer/BUILD
@@ -35,7 +35,7 @@ iml_module(
         "//tools/adt/idea/layout-ui:intellij.android.layout-ui[module]",
         "//tools/base/wizard/template-plugin:studio.intellij.android.wizardTemplate.plugin[module]",
         "//tools/base/wizard/template-impl:studio.intellij.android.wizardTemplate.impl[module]",
-        "//prebuilts/studio/layoutlib/data:layoutlib_native",
+        "//prebuilts/studio/layoutlib/data:layoutlib",
         "//tools/adt/idea/lint:intellij.lint[module]",
         "//tools/base/lint:studio.android.sdktools.lint-checks[module]",
     ],
@@ -108,7 +108,7 @@ iml_module(
         "//tools/adt/idea/android-kotlin:intellij.android.kotlin.idea[module, test]",
         "//tools/adt/idea/android-kotlin:intellij.android.kotlin.output.parser[module, test]",
         "//tools/adt/idea/layout-ui:intellij.android.layout-ui[module, test]",
-        "//prebuilts/studio/layoutlib/data:layoutlib_native[test]",
+        "//prebuilts/studio/layoutlib/data:layoutlib[test]",
         "//tools/adt/idea/lint:intellij.lint[module, test]",
     ],
 )
diff --git a/designer/intellij.android.designer.iml b/designer/intellij.android.designer.iml
index c3e234b7f71..7ec1af131c9 100644
--- a/designer/intellij.android.designer.iml
+++ b/designer/intellij.android.designer.iml
@@ -35,7 +35,7 @@
     <orderEntry type="module-library" scope="PROVIDED">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../prebuilts/studio/layoutlib/data/layoutlib_native.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../prebuilts/studio/layoutlib/data/layoutlib.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/designer/intellij.android.designer.tests.iml b/designer/intellij.android.designer.tests.iml
index f2302b5ca05..53cf47de7ba 100644
--- a/designer/intellij.android.designer.tests.iml
+++ b/designer/intellij.android.designer.tests.iml
@@ -40,7 +40,7 @@
     <orderEntry type="module-library" scope="TEST">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../prebuilts/studio/layoutlib/data/layoutlib_native.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../prebuilts/studio/layoutlib/data/layoutlib.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/designer/src/com/android/tools/idea/common/surface/DesignSurfaceHelper.kt b/designer/src/com/android/tools/idea/common/surface/DesignSurfaceHelper.kt
index 843d326a3da..af814a057d2 100644
--- a/designer/src/com/android/tools/idea/common/surface/DesignSurfaceHelper.kt
+++ b/designer/src/com/android/tools/idea/common/surface/DesignSurfaceHelper.kt
@@ -112,8 +112,8 @@ fun WorkBench<DesignSurface>.handleLayoutlibNativeCrash(runnable: Runnable) {
     if (StudioFlags.NELE_SHOW_LAYOUTLIB_LEGACY.get()) {
       ActionData("Switch to legacy rendering engine") {
         Bridge.setNativeCrash(false)
-        PluginManagerCore.disablePlugin("com.android.layoutlib.native")
-        PluginManagerCore.enablePlugin("com.android.layoutlib.standard")
+        PluginManagerCore.disablePlugin("com.android.layoutlib")
+        PluginManagerCore.enablePlugin("com.android.layoutlib.legacy")
         PluginManagerConfigurable.shutdownOrRestartApp()
       }
     }
diff --git a/layoutlib-native/BUILD b/layoutlib-legacy/BUILD
index af6b5650c73..db362e47fef 100644
--- a/layoutlib-native/BUILD
+++ b/layoutlib-legacy/BUILD
@@ -2,16 +2,15 @@ load("//tools/base/bazel:bazel.bzl", "iml_module")
 
 # managed by go/iml_to_build
 iml_module(
-    name = "intellij.android.layoutlib-native",
+    name = "intellij.android.layoutlib-legacy",
     srcs = ["src"],
-    bundled_deps = ["//prebuilts/studio/layoutlib/data:layoutlib_native"],
-    iml_files = ["intellij.android.layoutlib-native.iml"],
-    lint_baseline = "//tools/base/lint:studio-checks/empty_baseline.xml",
+    bundled_deps = ["//prebuilts/studio/layoutlib/data:layoutlib_legacy"],
+    iml_files = ["intellij.android.layoutlib-legacy.iml"],
     visibility = ["//visibility:public"],
     # do not sort: must match IML order
     deps = [
         "//prebuilts/studio/intellij-sdk:studio-sdk",
         "//tools/base/layoutlib-api:studio.android.sdktools.layoutlib-api[module]",
-        "//prebuilts/studio/layoutlib/data:layoutlib_native",
+        "//prebuilts/studio/layoutlib/data:layoutlib_legacy",
     ],
 )
diff --git a/layoutlib-native/intellij.android.layoutlib-native.iml b/layoutlib-legacy/intellij.android.layoutlib-legacy.iml
index d25646515ab..8f0cf66ced6 100644
--- a/layoutlib-native/intellij.android.layoutlib-native.iml
+++ b/layoutlib-legacy/intellij.android.layoutlib-legacy.iml
@@ -12,7 +12,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../prebuilts/studio/layoutlib/data/layoutlib_native.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../prebuilts/studio/layoutlib/data/layoutlib_legacy.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/layoutlib-native/src/META-INF/plugin.xml b/layoutlib-legacy/src/META-INF/plugin.xml
index 7f11dec1f17..0b6e9cebb07 100644
--- a/layoutlib-native/src/META-INF/plugin.xml
+++ b/layoutlib-legacy/src/META-INF/plugin.xml
@@ -14,18 +14,11 @@
   ~ limitations under the License.
   -->
 <idea-plugin>
-  <id>com.android.layoutlib.native</id>
-  <name>Layoutlib Native</name>
+  <id>com.android.layoutlib.legacy</id>
+  <name>Layoutlib Legacy</name>
   <version>1.0</version>
   <vendor>Google</vendor>
 
   <description>Provides a library for rendering Android resources</description>
 
-  <application-components>
-    <component>
-      <implementation-class>com.android.layoutlib.NativeCrashHandling</implementation-class>
-      <headless-implementation-class/>
-    </component>
-  </application-components>
-
 </idea-plugin>
\ No newline at end of file
diff --git a/layoutlib-loader/BUILD b/layoutlib-loader/BUILD
index 2393a6bf8ad..6df304edd35 100644
--- a/layoutlib-loader/BUILD
+++ b/layoutlib-loader/BUILD
@@ -14,7 +14,7 @@ iml_module(
         "//tools/base/sdk-common:studio.android.sdktools.sdk-common[module]",
         "//tools/adt/idea/android-common:intellij.android.common[module]",
         "//tools/base/layoutlib-api:studio.android.sdktools.layoutlib-api[module]",
-        "//prebuilts/studio/layoutlib/data:layoutlib_native",
+        "//prebuilts/studio/layoutlib/data:layoutlib",
     ],
 )
 
@@ -30,6 +30,6 @@ iml_module(
         "//tools/adt/idea/layoutlib-loader:intellij.android.layoutlib-loader[module, test]",
         "//tools/adt/idea/.idea/libraries:Guava[test]",
         "//tools/adt/idea/.idea/libraries:kotlin-stdlib-jdk8[test]",
-        "//prebuilts/studio/layoutlib/data:layoutlib_native[test]",
+        "//prebuilts/studio/layoutlib/data:layoutlib[test]",
     ],
 )
diff --git a/layoutlib-loader/intellij.android.layoutlib-loader.iml b/layoutlib-loader/intellij.android.layoutlib-loader.iml
index b5a74b9e5d3..51e0e9b4196 100644
--- a/layoutlib-loader/intellij.android.layoutlib-loader.iml
+++ b/layoutlib-loader/intellij.android.layoutlib-loader.iml
@@ -15,7 +15,7 @@
     <orderEntry type="module-library" scope="PROVIDED">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../prebuilts/studio/layoutlib/data/layoutlib_native.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../prebuilts/studio/layoutlib/data/layoutlib.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/layoutlib-loader/intellij.android.layoutlib-loader.tests.iml b/layoutlib-loader/intellij.android.layoutlib-loader.tests.iml
index 9825b5854c7..26da2b7cf21 100644
--- a/layoutlib-loader/intellij.android.layoutlib-loader.tests.iml
+++ b/layoutlib-loader/intellij.android.layoutlib-loader.tests.iml
@@ -14,7 +14,7 @@
     <orderEntry type="module-library" scope="TEST">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../prebuilts/studio/layoutlib/data/layoutlib_native.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../prebuilts/studio/layoutlib/data/layoutlib.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/layoutlib-loader/src/com/android/tools/idea/layoutlib/LayoutLibrary.java b/layoutlib-loader/src/com/android/tools/idea/layoutlib/LayoutLibrary.java
index 0c93ad86a8f..7275135f743 100644
--- a/layoutlib-loader/src/com/android/tools/idea/layoutlib/LayoutLibrary.java
+++ b/layoutlib-loader/src/com/android/tools/idea/layoutlib/LayoutLibrary.java
@@ -45,8 +45,8 @@ import java.util.Map;
  * {@link #dispose()}, {@link #clearResourceCaches(Object)}.
  */
 public class LayoutLibrary implements Disposable {
-    public static final String LAYOUTLIB_NATIVE_PLUGIN = "com.android.layoutlib.native";
-    public static final String LAYOUTLIB_STANDARD_PLUGIN = "com.android.layoutlib.standard";
+    public static final String LAYOUTLIB_NATIVE_PLUGIN = "com.android.layoutlib";
+    public static final String LAYOUTLIB_STANDARD_PLUGIN = "com.android.layoutlib.legacy";
 
     /** Link to the layout bridge */
     private final Bridge mBridge;
diff --git a/layoutlib/src/META-INF/plugin.xml b/layoutlib/src/META-INF/plugin.xml
index e46a93b2f03..5b0b1b975f7 100644
--- a/layoutlib/src/META-INF/plugin.xml
+++ b/layoutlib/src/META-INF/plugin.xml
@@ -14,11 +14,18 @@
   ~ limitations under the License.
   -->
 <idea-plugin>
-  <id>com.android.layoutlib.standard</id>
-  <name>Layoutlib Standard</name>
+  <id>com.android.layoutlib</id>
+  <name>Layoutlib</name>
   <version>1.0</version>
   <vendor>Google</vendor>
 
   <description>Provides a library for rendering Android resources</description>
 
+  <application-components>
+    <component>
+      <implementation-class>com.android.layoutlib.NativeCrashHandling</implementation-class>
+      <headless-implementation-class/>
+    </component>
+  </application-components>
+
 </idea-plugin>
\ No newline at end of file
diff --git a/layoutlib-native/src/com/android/layoutlib/NativeCrashHandling.java b/layoutlib/src/com/android/layoutlib/NativeCrashHandling.java
index fd948248849..fd948248849 100644
--- a/layoutlib-native/src/com/android/layoutlib/NativeCrashHandling.java
+++ b/layoutlib/src/com/android/layoutlib/NativeCrashHandling.java
diff --git a/studio/BUILD b/studio/BUILD
index 122ad533b35..26a97d4fc4b 100644
--- a/studio/BUILD
+++ b/studio/BUILD
@@ -231,7 +231,7 @@ studio_plugin(
 )
 
 studio_plugin(
-    name = "com.android.layoutlib.standard",
+    name = "com.android.layoutlib",
     directory = "android-layoutlib",
     modules = {
         "android-layoutlib.jar": ["//tools/adt/idea/layoutlib:intellij.android.layoutlib"],
@@ -244,10 +244,10 @@ studio_plugin(
 )
 
 studio_plugin(
-    name = "com.android.layoutlib.native",
-    directory = "android-layoutlib-native",
+    name = "com.android.layoutlib.legacy",
+    directory = "android-layoutlib-legacy",
     modules = {
-        "android-layoutlib-native.jar": ["//tools/adt/idea/layoutlib-native:intellij.android.layoutlib-native"],
+        "android-layoutlib-legacy.jar": ["//tools/adt/idea/layoutlib-legacy:intellij.android.layoutlib-legacy"],
         "layoutlib-api.jar": ["//tools/base/layoutlib-api:studio.android.sdktools.layoutlib-api"],
     },
     provided = [
@@ -413,8 +413,8 @@ android_studio(
         ":org.jetbrains.android",
         ":com.android.tools.apk",
         ":com.android.tools.ndk",
-        ":com.android.layoutlib.standard",
-        ":com.android.layoutlib.native",
+        ":com.android.layoutlib",
+        ":com.android.layoutlib.legacy",
         ":androidx.compose.plugins.idea",
         ":com.google.services.firebase",
         ":com.google.gct.testing",
@@ -602,7 +602,7 @@ iml_module(
         "//tools/adt/idea/android-plugin:intellij.android.plugin[module]",
         "//tools/vendor/google/android-apk[module]",
         "//tools/adt/idea/compose-ide-plugin:intellij.android.compose-ide-plugin[module]",
-        "//tools/adt/idea/layoutlib-native:intellij.android.layoutlib-native[module]",
+        "//tools/adt/idea/layoutlib:intellij.android.layoutlib[module]",
         "//tools/vendor/google/android-ndk[module]",
         "//tools/studio/google/cloud/tools/android-studio-plugin:google-cloud-tools-as[module]",
         "//tools/vendor/google/firebase[module]",
diff --git a/studio/studio.iml b/studio/studio.iml
index 4566b2d0cd2..cc22c3343d2 100644
--- a/studio/studio.iml
+++ b/studio/studio.iml
@@ -9,7 +9,7 @@
     <orderEntry type="module" module-name="intellij.android.plugin" />
     <orderEntry type="module" module-name="android-apk" />
     <orderEntry type="module" module-name="intellij.android.compose-ide-plugin" />
-    <orderEntry type="module" module-name="intellij.android.layoutlib-native" />
+    <orderEntry type="module" module-name="intellij.android.layoutlib" />
     <orderEntry type="module" module-name="android-ndk" />
     <orderEntry type="module" module-name="google-cloud-tools-as" />
     <orderEntry type="module" module-name="firebase" />
diff --git a/studio/tests/expected_linux.txt b/studio/tests/expected_linux.txt
index c0711e03188..08a55343785 100644
--- a/studio/tests/expected_linux.txt
+++ b/studio/tests/expected_linux.txt
@@ -1955,9 +1955,9 @@ android-studio/plugins/Kotlin/lib/noarg-ide-plugin.jar
 android-studio/plugins/Kotlin/lib/sam-with-receiver-ide-plugin.jar
 android-studio/plugins/android-apk/lib/android-apk.jar
 android-studio/plugins/android-compose-ide-plugin/lib/android-compose-ide-plugin.jar
-android-studio/plugins/android-layoutlib-native/lib/android-layoutlib-native.jar
-android-studio/plugins/android-layoutlib-native/lib/layoutlib-api.jar
-android-studio/plugins/android-layoutlib-native/lib/layoutlib_native.jar
+android-studio/plugins/android-layoutlib-legacy/lib/android-layoutlib-legacy.jar
+android-studio/plugins/android-layoutlib-legacy/lib/layoutlib-api.jar
+android-studio/plugins/android-layoutlib-legacy/lib/layoutlib_legacy.jar
 android-studio/plugins/android-layoutlib/lib/android-layoutlib.jar
 android-studio/plugins/android-layoutlib/lib/layoutlib-api.jar
 android-studio/plugins/android-layoutlib/lib/layoutlib.jar
diff --git a/studio/tests/expected_mac.txt b/studio/tests/expected_mac.txt
index 74d88368958..6b90bda9541 100644
--- a/studio/tests/expected_mac.txt
+++ b/studio/tests/expected_mac.txt
@@ -1952,9 +1952,9 @@ Android Studio Preview.app/Contents/plugins/Kotlin/lib/noarg-ide-plugin.jar
 Android Studio Preview.app/Contents/plugins/Kotlin/lib/sam-with-receiver-ide-plugin.jar
 Android Studio Preview.app/Contents/plugins/android-apk/lib/android-apk.jar
 Android Studio Preview.app/Contents/plugins/android-compose-ide-plugin/lib/android-compose-ide-plugin.jar
-Android Studio Preview.app/Contents/plugins/android-layoutlib-native/lib/android-layoutlib-native.jar
-Android Studio Preview.app/Contents/plugins/android-layoutlib-native/lib/layoutlib-api.jar
-Android Studio Preview.app/Contents/plugins/android-layoutlib-native/lib/layoutlib_native.jar
+Android Studio Preview.app/Contents/plugins/android-layoutlib-legacy/lib/android-layoutlib-legacy.jar
+Android Studio Preview.app/Contents/plugins/android-layoutlib-legacy/lib/layoutlib-api.jar
+Android Studio Preview.app/Contents/plugins/android-layoutlib-legacy/lib/layoutlib_legacy.jar
 Android Studio Preview.app/Contents/plugins/android-layoutlib/lib/android-layoutlib.jar
 Android Studio Preview.app/Contents/plugins/android-layoutlib/lib/layoutlib-api.jar
 Android Studio Preview.app/Contents/plugins/android-layoutlib/lib/layoutlib.jar
diff --git a/studio/tests/expected_win.txt b/studio/tests/expected_win.txt
index fe40a26058b..4de9e15a86f 100644
--- a/studio/tests/expected_win.txt
+++ b/studio/tests/expected_win.txt
@@ -1461,9 +1461,9 @@ android-studio/plugins/Kotlin/lib/noarg-ide-plugin.jar
 android-studio/plugins/Kotlin/lib/sam-with-receiver-ide-plugin.jar
 android-studio/plugins/android-apk/lib/android-apk.jar
 android-studio/plugins/android-compose-ide-plugin/lib/android-compose-ide-plugin.jar
-android-studio/plugins/android-layoutlib-native/lib/android-layoutlib-native.jar
-android-studio/plugins/android-layoutlib-native/lib/layoutlib-api.jar
-android-studio/plugins/android-layoutlib-native/lib/layoutlib_native.jar
+android-studio/plugins/android-layoutlib-legacy/lib/android-layoutlib-legacy.jar
+android-studio/plugins/android-layoutlib-legacy/lib/layoutlib-api.jar
+android-studio/plugins/android-layoutlib-legacy/lib/layoutlib_legacy.jar
 android-studio/plugins/android-layoutlib/lib/android-layoutlib.jar
 android-studio/plugins/android-layoutlib/lib/layoutlib-api.jar
 android-studio/plugins/android-layoutlib/lib/layoutlib.jar
diff --git a/studio/tests/startup_test.py b/studio/tests/startup_test.py
index 07bca386d0e..143b9985948 100644
--- a/studio/tests/startup_test.py
+++ b/studio/tests/startup_test.py
@@ -133,8 +133,8 @@ class StartUpTest(unittest.TestCase):
                   "JetBrains Repository Search",
                   "JetBrains maven model api classes",
                   "Kotlin",
-                  "Layoutlib Native",
-                  "Layoutlib Standard",
+                  "Layoutlib",
+                  "Layoutlib Legacy",
                   "Mercurial",
                   "Next File Prediction",
                   "Properties",