diff --git a/Directory.Build.props b/Directory.Build.props
index 4be66ff6d..beacea326 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -38,4 +38,123 @@
     <AndroidXNuGetTargetFolders Include="buildTransitive\monoandroid12.0" />
     <AndroidXNuGetTargetFolders Include="buildTransitive\net6.0-android31.0" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <!-- Company namespace changes -->
+    <AndroidNamespaceReplacement Include='androidx.' Replacement='AndroidX' />
+    <AndroidNamespaceReplacement Include='com.google.gson' Replacement='GoogleGson' />
+    <AndroidNamespaceReplacement Include='com.google.crypto' Replacement='Xamarin.Google.Crypto' />
+    <AndroidNamespaceReplacement Include='com.google.' Replacement='Google' />
+    <AndroidNamespaceReplacement Include='kotlinx.coroutines.' Replacement='Xamarin.KotlinX.Coroutines' />
+    <AndroidNamespaceReplacement Include='org.reactivestreams.' Replacement='ReactiveStreams' />
+    <AndroidNamespaceReplacement Include='org.intellij' Replacement='IntelliJ' />
+    <AndroidNamespaceReplacement Include='org.jetbrains' Replacement='JetBrains' />
+    <AndroidNamespaceReplacement Include='org.chromium' Replacement='AndroidX.WebKit' />
+    <AndroidNamespaceReplacement Include='com.xamarin' Replacement='Xamarin' />
+    <AndroidNamespaceReplacement Include='io.reactivex.' Replacement='ReactiveX' />
+    <AndroidNamespaceReplacement Include='kotlinx' Replacement='KotlinX' />
+    <AndroidNamespaceReplacement Include='support_lib_boundary' Replacement='ChromiumLibBoundary' />
+    
+    <!-- Remove some redundant words -->
+    <AndroidNamespaceReplacement Include='androidx.dynamicanimation.animation' Replacement='AndroidX.DynamicAnimation' />
+
+    <!-- Preferred plural words -->
+    <AndroidNamespaceReplacement Include='androidx.annotation' Replacement='AndroidX.Annotations' />
+    <AndroidNamespaceReplacement Include='androidx.core.content.res' Replacement='AndroidX.Core.Content.Resources' />
+    <AndroidNamespaceReplacement Include='androidx.transition' Replacement='AndroidX.Transitions' />
+    <AndroidNamespaceReplacement Include='config' Replacement='Configs' />
+    <AndroidNamespaceReplacement Include='executor' Replacement='Executors' />
+    <AndroidNamespaceReplacement Include='profileinstaller' Replacement='ProfileInstallers' />
+    
+    <!-- Un-capitalization of 2-letter abbreviations -->
+    <AndroidNamespaceReplacement Include='tv' Replacement='Tv' />    
+    <AndroidNamespaceReplacement Include='db' Replacement='Db' />    
+    
+    <!-- Preferred capitalization for combined words -->
+    <AndroidNamespaceReplacement Include='accessibilityservice' Replacement='AccessibilityService' />
+    <AndroidNamespaceReplacement Include='appbar' Replacement='AppBar' />
+    <AndroidNamespaceReplacement Include='appcompat' Replacement='AppCompat' />
+    <AndroidNamespaceReplacement Include='asynclayoutinflater' Replacement='AsyncLayoutInflater' />
+    <AndroidNamespaceReplacement Include='auto.value' Replacement='AutoValue' />
+    <AndroidNamespaceReplacement Include='autofill' Replacement='AutoFill' />
+    <AndroidNamespaceReplacement Include='baseadapters' Replacement='BaseAdapters' />
+    <AndroidNamespaceReplacement Include='bottomappbar' Replacement='BottomAppBar' />
+    <AndroidNamespaceReplacement Include='bottomnavigation' Replacement='BottomNavigation' />
+    <AndroidNamespaceReplacement Include='bottomsheet' Replacement='BottomSheet' />
+    <AndroidNamespaceReplacement Include='browseractions' Replacement='BrowserActions' />
+    <AndroidNamespaceReplacement Include='cardview' Replacement='CardView' />
+    <AndroidNamespaceReplacement Include='checkbox' Replacement='CheckBox' />
+    <AndroidNamespaceReplacement Include='circularreveal' Replacement='CircularReveal' />
+    <AndroidNamespaceReplacement Include='constraintlayout' Replacement='ConstraintLayout' />
+    <AndroidNamespaceReplacement Include='contentpager' Replacement='ContentPager' />
+    <AndroidNamespaceReplacement Include='contextaware' Replacement='ContextAware' />
+    <AndroidNamespaceReplacement Include='coordinatorlayout' Replacement='CoordinatorLayout' />
+    <AndroidNamespaceReplacement Include='cursoradapter' Replacement='CursorAdapter' />
+    <AndroidNamespaceReplacement Include='customtabs' Replacement='CustomTabs' />
+    <AndroidNamespaceReplacement Include='customview' Replacement='CustomView' />
+    <AndroidNamespaceReplacement Include='daead' Replacement='DAead' />
+    <AndroidNamespaceReplacement Include='databinding' Replacement='DataBinding' />
+    <AndroidNamespaceReplacement Include='datepicker' Replacement='DatePicker' />
+    <AndroidNamespaceReplacement Include='documentfile' Replacement='DocumentFile' />
+    <AndroidNamespaceReplacement Include='drawerlayout' Replacement='DrawerLayout' />
+    <AndroidNamespaceReplacement Include='dynamicanimation' Replacement='DynamicAnimation' />
+    <AndroidNamespaceReplacement Include='exifinterface' Replacement='ExifInterface' />
+    <AndroidNamespaceReplacement Include='exoplayer' Replacement='ExoPlayer' />
+    <AndroidNamespaceReplacement Include='externalreferrer' Replacement='ExternalReferrer' />
+    <AndroidNamespaceReplacement Include='flatbuffer' Replacement='FlatBuffer' />
+    <AndroidNamespaceReplacement Include='floatingactionbutton' Replacement='FloatingActionButton' />
+    <AndroidNamespaceReplacement Include='gridlayout' Replacement='GridLayout' />
+    <AndroidNamespaceReplacement Include='imageview' Replacement='ImageView' />
+    <AndroidNamespaceReplacement Include='immutablelist' Replacement='ImmutableList' />
+    <AndroidNamespaceReplacement Include='immutablemap' Replacement='ImmutableMap' />
+    <AndroidNamespaceReplacement Include='immutableset' Replacement='ImmutableSet' />
+    <AndroidNamespaceReplacement Include='inputmethod' Replacement='InputMethod' />
+    <AndroidNamespaceReplacement Include='installreferrer' Replacement='InstallReferrer' />
+    <AndroidNamespaceReplacement Include='itemdecorators' Replacement='ItemDecorators' />
+    <AndroidNamespaceReplacement Include='livedata' Replacement='LiveData' />
+    <AndroidNamespaceReplacement Include='localbroadcastmanager' Replacement='LocalBroadcastManager' />
+    <AndroidNamespaceReplacement Include='mediarouter' Replacement='MediaRouter' />
+    <AndroidNamespaceReplacement Include='multicast' Replacement='MultiCast' />
+    <AndroidNamespaceReplacement Include='multiprocess' Replacement='MultiProcess' />
+    <AndroidNamespaceReplacement Include='navigationrail' Replacement='NavigationRail' />
+    <AndroidNamespaceReplacement Include='nestedscroll' Replacement='NestedScroll' />
+    <AndroidNamespaceReplacement Include='percentlayout' Replacement='PercentLayout' />
+    <AndroidNamespaceReplacement Include='persistentorderedmap' Replacement='PersistentOrderedMap' />
+    <AndroidNamespaceReplacement Include='persistentorderedset' Replacement='PersistentOrderedSet' />
+    <AndroidNamespaceReplacement Include='progressindicator' Replacement='ProgressIndicator' />
+    <AndroidNamespaceReplacement Include='radiobutton' Replacement='RadioButton' />
+    <AndroidNamespaceReplacement Include='recyclerview' Replacement='RecyclerView' />
+    <AndroidNamespaceReplacement Include='resourceinspection' Replacement='ResourceInspection' />
+    <AndroidNamespaceReplacement Include='rxjava2' Replacement='RxJava2' />
+    <AndroidNamespaceReplacement Include='rxjava3' Replacement='RxJava3' />
+    <AndroidNamespaceReplacement Include='savedstate' Replacement='SavedState' />
+    <AndroidNamespaceReplacement Include='signin' Replacement='SignIn' />
+    <AndroidNamespaceReplacement Include='slidingpanelayout' Replacement='SlidingPaneLayout' />
+    <AndroidNamespaceReplacement Include='splashscreen' Replacement='SplashScreen' />
+    <AndroidNamespaceReplacement Include='streamingaead' Replacement='StreamingAead' />
+    <AndroidNamespaceReplacement Include='strictmode' Replacement='StrictMode' />
+    <AndroidNamespaceReplacement Include='swiperefreshlayout' Replacement='SwipeRefreshLayout' />
+    <AndroidNamespaceReplacement Include='switchmaterial' Replacement='SwitchMaterial' />
+    <AndroidNamespaceReplacement Include='systemalarm' Replacement='SystemAlarm' />
+    <AndroidNamespaceReplacement Include='systemjob' Replacement='SystemJob' />
+    <AndroidNamespaceReplacement Include='taskexecutor' Replacement='TaskExecutor' />
+    <AndroidNamespaceReplacement Include='textfield' Replacement='TextField' />
+    <AndroidNamespaceReplacement Include='textview' Replacement='TextView' />
+    <AndroidNamespaceReplacement Include='timepicker' Replacement='TimePicker' />
+    <AndroidNamespaceReplacement Include='toprettystring' Replacement='ToPrettyString' />
+    <AndroidNamespaceReplacement Include='twotone' Replacement='TwoTone' />
+    <AndroidNamespaceReplacement Include='tvprovider' Replacement='TvProvider' />
+    <AndroidNamespaceReplacement Include='unusedapprestrictions' Replacement='UnusedAppRestrictions' />
+    <AndroidNamespaceReplacement Include='uxrestrictions' Replacement='UXRestrictions' />
+    <AndroidNamespaceReplacement Include='vectordrawable' Replacement='VectorDrawable' />
+    <AndroidNamespaceReplacement Include='versionedparcelable' Replacement='VersionedParcelable' />
+    <AndroidNamespaceReplacement Include='viewbinding' Replacement='ViewBinding' />
+    <AndroidNamespaceReplacement Include='viewpager' Replacement='ViewPager' />
+    <AndroidNamespaceReplacement Include='viewpager2' Replacement='ViewPager2' />
+    <AndroidNamespaceReplacement Include='viewsintegration' Replacement='ViewsIntegration' />
+    <AndroidNamespaceReplacement Include='wear-ongoing' Replacement='Ongoing' />
+    <AndroidNamespaceReplacement Include='wear-phone-interactions' Replacement='PhoneInteractions' />
+    <AndroidNamespaceReplacement Include='wear-remote-interactions' Replacement='RemoveInteractions' />
+    <AndroidNamespaceReplacement Include='webkit' Replacement='WebKit' />    
+  </ItemGroup>
 </Project>
diff --git a/source/Xamarin.Jetbrains.Annotations/Transforms/Metadata.xml b/source/Xamarin.Jetbrains.Annotations/Transforms/Metadata.xml
index bf9b120e7..b93426448 100644
--- a/source/Xamarin.Jetbrains.Annotations/Transforms/Metadata.xml
+++ b/source/Xamarin.Jetbrains.Annotations/Transforms/Metadata.xml
@@ -8,8 +8,4 @@
   <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='CursorLoader']/method[@name='loadInBackground']" />
   -->
 
-  <!-- fix namespaces -->
-  <attr path="/api/package[@name='org.intellij.lang.annotations']" name="managedName">IntelliJ.Lang.Annotations</attr>
-  <attr path="/api/package[@name='org.jetbrains.annotations']" name="managedName">JetBrains.Annotations</attr>
-
 </metadata>
diff --git a/source/androidx.activity/activity-ktx/Transforms/Metadata.Namespaces.xml b/source/androidx.activity/activity-ktx/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index bf7d1398d..000000000
--- a/source/androidx.activity/activity-ktx/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<metadata>
-
-    <attr 
-        path="/api/package[@name='androidx.activity']" 
-        name="managedName"
-        >
-        AndroidX.Activity
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.activity.contextaware']" 
-        name="managedName"
-        >
-        AndroidX.Activity.ContextAware
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.activity.result']" 
-        name="managedName"
-        >
-        AndroidX.Activity.Result
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.activity/activity/Transforms/Metadata.Namespaces.xml b/source/androidx.activity/activity/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 1dc083ebd..000000000
--- a/source/androidx.activity/activity/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.activity']" 
-        name="managedName"
-        >
-        AndroidX.Activity
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.activity.result']" 
-        name="managedName"
-        >
-        AndroidX.Activity.Result
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.activity.result.contract']" 
-        name="managedName"
-        >
-        AndroidX.Activity.Result.Contract
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.activity.contextaware']" 
-        name="managedName"
-        >
-        AndroidX.Activity.ContextAware
-    </attr>
-    
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.ads/ads-identifier-common/Transforms/Metadata.Namespaces.xml b/source/androidx.ads/ads-identifier-common/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index fd59944b5..000000000
--- a/source/androidx.ads/ads-identifier-common/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.ads.identifier']" 
-        name="managedName"
-        >
-        AndroidX.Ads.Identifier
-    </attr>    
-    <attr 
-        path="/api/package[@name='androidx.ads.identifier.provider']" 
-        name="managedName"
-        >
-        AndroidX.Ads.Identifier.Provider
-    </attr>    
-    
-    
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.ads/ads-identifier-provider/Transforms/Metadata.Namespaces.xml b/source/androidx.ads/ads-identifier-provider/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 7223546c5..000000000
--- a/source/androidx.ads/ads-identifier-provider/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    
-    <attr 
-        path="/api/package[@name='androidx.ads.identifier.provider']" 
-        name="managedName"
-        >
-        AndroidX.Ads.Identifier.Provider
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.ads.identifier.provider.internal']" 
-        name="managedName"
-        >
-        AndroidX.Ads.Identifier.Provider.Internal
-    </attr>
-    
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.ads/ads-identifier/Transforms/Metadata.Namespaces.xml b/source/androidx.ads/ads-identifier/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index bf866cd15..000000000
--- a/source/androidx.ads/ads-identifier/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.ads.identifier']" 
-        name="managedName"
-        >
-        AndroidX.Ads.Identifier
-    </attr>    
-    <attr 
-        path="/api/package[@name='androidx.ads.identifier.provider']" 
-        name="managedName"
-        >
-        AndroidX.Ads.Identifier.Provider
-    </attr>    
-    <attr 
-        path="/api/package[@name='androidx.ads.identifier.internal']" 
-        name="managedName"
-        >
-        AndroidX.Ads.Identifier.Internal
-    </attr>    
-    
-    
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.annotation/annotation-experimental/Transforms/Metadata.Namespaces.xml b/source/androidx.annotation/annotation-experimental/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 3adc3424f..000000000
--- a/source/androidx.annotation/annotation-experimental/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.annotation.experimental']" 
-        name="managedName"
-        >
-        AndroidX.Annotations.Experimental
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.annotation']" 
-        name="managedName"
-        >
-        AndroidX.Annotations
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.annotation/annotation/Transforms/Metadata.Namespaces.xml b/source/androidx.annotation/annotation/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index dacfa5764..000000000
--- a/source/androidx.annotation/annotation/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.annotation']" name="managedName">AndroidX.Annotations</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.appcompat/appcompat-resources/Transforms/Metadata.Namespaces.xml b/source/androidx.appcompat/appcompat-resources/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index aff6969bf..000000000
--- a/source/androidx.appcompat/appcompat-resources/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.appcompat.content.res']" 
-        name="managedName"
-        >
-        AndroidX.AppCompat.Content.Res
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.appcompat.graphics.drawable']" 
-        name="managedName"
-        >
-        AndroidX.AppCompat.Graphics.Drawable
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.appcompat.widget']" 
-        name="managedName"
-        >
-        AndroidX.AppCompat.Widget
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.appcompat.resources']"
-        name="managedName"
-        >
-        AndroidX.AppCompat.Resources
-    </attr>
-    
-        
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.appcompat/appcompat/Transforms/Metadata.Namespaces.xml b/source/androidx.appcompat/appcompat/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 5a36a8743..000000000
--- a/source/androidx.appcompat/appcompat/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.appcompat.app']" name="managedName">AndroidX.AppCompat.App</attr>
-    <attr path="/api/package[@name='androidx.appcompat.content.res']" name="managedName">AndroidX.AppCompat.Content.Res</attr>
-    <attr path="/api/package[@name='androidx.appcompat.graphics.drawable']" name="managedName">AndroidX.AppCompat.Graphics.Drawable</attr>
-    <attr path="/api/package[@name='androidx.appcompat.text']" name="managedName">AndroidX.AppCompat.Text</attr>
-    <attr path="/api/package[@name='androidx.appcompat.view']" name="managedName">AndroidX.AppCompat.View</attr>
-    <attr path="/api/package[@name='androidx.appcompat.view.menu']" name="managedName">AndroidX.AppCompat.View.Menu</attr>
-    <attr path="/api/package[@name='androidx.appcompat.widget']" name="managedName">AndroidX.AppCompat.Widget</attr>
-
-    <attr 
-        path="/api/package[@name='androidx.appcompat.resources']"
-        name="managedName"
-        >
-        AndroidX.AppCompat.App.Resources
-    </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.arch.core/core-common/Transforms/Metadata.Namespaces.xml b/source/androidx.arch.core/core-common/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 2857e5df3..000000000
--- a/source/androidx.arch.core/core-common/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.arch.core.internal']" name="managedName">AndroidX.Arch.Core.Internal</attr>
-    <attr path="/api/package[@name='androidx.arch.core.util']" name="managedName">AndroidX.Arch.Core.Util</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.arch.core/core-runtime/Transforms/Metadata.Namespaces.xml b/source/androidx.arch.core/core-runtime/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 32b68a77a..000000000
--- a/source/androidx.arch.core/core-runtime/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.arch.core.executor']" name="managedName">AndroidX.Arch.Core.Executor</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.arch.core/core-runtime/Transforms/Metadata.xml b/source/androidx.arch.core/core-runtime/Transforms/Metadata.xml
index 20b694022..947183b1c 100644
--- a/source/androidx.arch.core/core-runtime/Transforms/Metadata.xml
+++ b/source/androidx.arch.core/core-runtime/Transforms/Metadata.xml
@@ -1 +1,4 @@
-<metadata></metadata>
\ No newline at end of file
+<metadata>
+    <!-- Differs from our preferred pluralization of "Executors", maintained for backwards compatibility -->
+    <attr path="/api/package[@name='androidx.arch.core.executor']" name="managedName">AndroidX.Arch.Core.Executor</attr>
+</metadata>
\ No newline at end of file
diff --git a/source/androidx.asynclayoutinflater/asynclayoutinflater/Transforms/Metadata.Namespaces.xml b/source/androidx.asynclayoutinflater/asynclayoutinflater/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 6f4e944ac..000000000
--- a/source/androidx.asynclayoutinflater/asynclayoutinflater/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.asynclayoutinflater.view']" name="managedName">AndroidX.AsyncLayoutInflater.View</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.autofill/autofill/Transforms/Metadata.Namespaces.xml b/source/androidx.autofill/autofill/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 41a60b949..000000000
--- a/source/androidx.autofill/autofill/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<metadata>
-  <attr path="/api/package[@name='androidx.autofill']" name="managedName">AndroidX.AutoFill</attr>
-  <attr path="/api/package[@name='androidx.autofill.inline']" name="managedName">AndroidX.AutoFill.Inline</attr>
-  <attr path="/api/package[@name='androidx.autofill.inline.common']" name="managedName">AndroidX.AutoFill.Inline.Common</attr>
-  <attr path="/api/package[@name='androidx.autofill.inline.v1']" name="managedName">AndroidX.AutoFill.Inline.V1</attr>
-</metadata>
diff --git a/source/androidx.biometric/biometric/Transforms/Metadata.Namespaces.xml b/source/androidx.biometric/biometric/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index c747b73d3..000000000
--- a/source/androidx.biometric/biometric/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<metadata>
-    <!-- This really is support still here :( -->
-    <attr 
-        path="/api/package[@name='androidx.biometric']" 
-        name="managedName"
-        >
-        AndroidX.Biometric
-    </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.browser/browser/Transforms/Metadata.Namespaces.xml b/source/androidx.browser/browser/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 490ccb51c..000000000
--- a/source/androidx.browser/browser/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<metadata>
-    <!-- This really is support still here :( -->
-    <attr path="/api/package[@name='android.support.customtabs']" name="managedName">Android.Support.CustomTabs</attr>
-    <attr path="/api/package[@name='androidx.browser.browseractions']" name="managedName">AndroidX.Browser.BrowserActions</attr>
-    <attr path="/api/package[@name='androidx.browser.customtabs']" name="managedName">AndroidX.Browser.CustomTabs</attr>
-
-    <attr 
-        path="/api/package[@name='androidx.browser.trusted']"
-        name="managedName"
-        >
-        AndroidX.Browser.Trusted
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.browser.trusted.sharing']"
-        name="managedName"
-        >
-        AndroidX.Browser.Trusted.Sharing
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.browser.trusted.splashscreens']"
-        name="managedName"
-        >
-        AndroidX.Browser.Trusted.Splashscreens
-    </attr>
-    
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.browser/browser/Transforms/Metadata.xml b/source/androidx.browser/browser/Transforms/Metadata.xml
index bc335b8ea..cb421ea73 100644
--- a/source/androidx.browser/browser/Transforms/Metadata.xml
+++ b/source/androidx.browser/browser/Transforms/Metadata.xml
@@ -1,4 +1,7 @@
 <metadata>
+    <!-- Preserve incorrect capitalization of "Customtabs" for backward compatibility -->
+    <attr path="/api/package[@name='android.support.customtabs.trusted']" name="managedName">Android.Support.Customtabs.Trusted</attr>
+    
     <remove-node path="/api/package[@name='androidx.browser.browseractions']/interface[@name='BrowserActionsIntent.BrowserActionsFallDialogListener']" />
     <remove-node path="/api/package[@name='androidx.browser.browseractions']/interface[@name='BrowserActionsFallbackMenuUi.BrowserActionsFallMenuUiListener']" />
     <attr path="/api/package[@name='androidx.browser.customtabs']/class[@name='CustomTabsServiceConnection']/method[@name='onCustomTabsServiceConnected' and count(parameter)=2 and parameter[1][@type='android.content.ComponentName'] and parameter[2][@type='androidx.browser.customtabs.CustomTabsClient']]/parameter[1]" name="managedName">name</attr>
diff --git a/source/androidx.camera/camera-camera2/Transforms/Metadata.Namespaces.xml b/source/androidx.camera/camera-camera2/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 4916fde97..000000000
--- a/source/androidx.camera/camera-camera2/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.camera.camera2']" 
-        name="managedName"
-        >
-        AndroidX.Camera.Camera2
-    </attr>    
-    <attr 
-        path="/api/package[@name='androidx.camera.camera2.impl']" 
-        name="managedName"
-        >
-        AndroidX.Camera.Camera2
-    </attr>    
-    <attr 
-        path="/api/package[@name='androidx.camera.camera2.internal']" 
-        name="managedName"
-        >
-        AndroidX.Camera.Camera2.Internal
-    </attr>    
-    <attr 
-        path="/api/package[@name='androidx.camera.camera2.internal.annotation']" 
-        name="managedName"
-        >
-        AndroidX.Camera.Camera2.Internal.Annotation
-    </attr>    
-    <attr 
-        path="/api/package[@name='androidx.camera.camera2.internal.compat']" 
-        name="managedName"
-        >
-        AndroidX.Camera.Camera2.Internal.Compat
-    </attr>    
-    <attr 
-        path="/api/package[@name='androidx.camera.camera2.internal.compat.params']" 
-        name="managedName"
-        >
-        AndroidX.Camera.Camera2Internal.Compat.Params
-    </attr>    
-    <attr 
-        path="/api/package[@name='androidx.camera.camera2.interop']" 
-        name="managedName"
-        >
-        AndroidX.Camera.Camera2.InterOp
-    </attr>    
-        <attr 
-        path="/api/package[@name='androidx.camera.camera2.internal.compat.quirk']" 
-        name="managedName"
-        >
-        AndroidX.Camera.Camera2.Internal.Compat.Quirk
-    </attr>    
-    <attr 
-        path="/api/package[@name='androidx.camera.camera2.internal.compat.workaround']" 
-        name="managedName"
-        >
-        AndroidX.Camera.Camera2.Internal.Compat.Workaround
-    </attr>    
-
-    
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.camera/camera-camera2/Transforms/Metadata.xml b/source/androidx.camera/camera-camera2/Transforms/Metadata.xml
index 42be48d68..51c501678 100644
--- a/source/androidx.camera/camera-camera2/Transforms/Metadata.xml
+++ b/source/androidx.camera/camera-camera2/Transforms/Metadata.xml
@@ -1,5 +1,29 @@
 <metadata>
-  <remove-node path="/api/package/class/implements[@name='androidx.camera.core.ConfigProvider']" />
+    <!-- Preserve non-standard namespace remapping -->
+    <attr 
+        path="/api/package[@name='androidx.camera.camera2.impl']" 
+        name="managedName"
+        >
+        AndroidX.Camera.Camera2
+    </attr>
+    
+    <!-- Preserve missing period for backwards compatbility -->
+    <attr 
+        path="/api/package[@name='androidx.camera.camera2.internal.compat.params']" 
+        name="managedName"
+        >
+        AndroidX.Camera.Camera2Internal.Compat.Params
+    </attr>    
+
+    <!-- Preserve non-preferred "InterOp" capitalization for backwards compatbility -->
+    <attr 
+        path="/api/package[@name='androidx.camera.camera2.interop']" 
+        name="managedName"
+        >
+        AndroidX.Camera.Camera2.InterOp
+    </attr>
+    
+    <remove-node path="/api/package/class/implements[@name='androidx.camera.core.ConfigProvider']" />
     
     <remove-node
         path="/api/package[@name='androidx.camera.camera2.internal']/class[@name='ImageAnalysisConfigProvider']/implements"
diff --git a/source/androidx.camera/camera-core/Transforms/Metadata.Namespaces.xml b/source/androidx.camera/camera-core/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 9e7404b6d..000000000
--- a/source/androidx.camera/camera-core/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.camera.core']" 
-        name="managedName"
-        >
-        AndroidX.Camera.Core
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.camera.core.impl']" 
-        name="managedName"
-        >
-        AndroidX.Camera.Core.Impl
-    </attr>    
-    <attr 
-        path="/api/package[@name='androidx.camera.core.impl.annotation']" 
-        name="managedName"
-        >
-        AndroidX.Camera.Core.Impl.Annotation
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.camera.core.impl.utils']" 
-        name="managedName"
-        >
-        AndroidX.Camera.Core.Impl.Utils
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.camera.core.impl.utils.executor']" 
-        name="managedName"
-        >
-        AndroidX.Camera.Core.Impl.Utils.Executors
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.camera.core.impl.utils.futures']" 
-        name="managedName"
-        >
-        AndroidX.Camera.Core.Impl.Utils.Futures
-    </attr>
-    androidx.camera.core
-    <attr 
-        path="/api/package[@name='androidx.camera.core.internal']" 
-        name="managedName"
-        >
-        AndroidX.Camera.Core.Internal
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.camera.core.internal.utils']" 
-        name="managedName"
-        >
-        AndroidX.Camera.Core.Internal.Utils
-    </attr>
-        <attr 
-        path="/api/package[@name='androidx.camera.core.internal.compat']" 
-        name="managedName"
-        >
-        AndroidX.Camera.Core.Internal.Utils
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.camera.core.internal.compat.quirk']" 
-        name="managedName"
-        >
-        AndroidX.Camera.Core.Internal.Compat.Quirk
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.camera.core.internal.compat.workaround']" 
-        name="managedName"
-        >
-        AndroidX.Camera.Core.Internal.Compat.Workaround
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.camera/camera-core/Transforms/Metadata.xml b/source/androidx.camera/camera-core/Transforms/Metadata.xml
index 5a595dfc4..c160fb84c 100644
--- a/source/androidx.camera/camera-core/Transforms/Metadata.xml
+++ b/source/androidx.camera/camera-core/Transforms/Metadata.xml
@@ -1,4 +1,11 @@
 <metadata>
+    <!-- Preserve non-standard namespace remapping -->
+    <attr 
+        path="/api/package[@name='androidx.camera.core.internal.compat']" 
+        name="managedName"
+        >
+        AndroidX.Camera.Core.Internal.Utils
+    </attr>
     
     <attr
         path="/api/package[@name='androidx.camera.core.impl']/class[@name='ImmediateSurface']/method[@name='provideSurface' and count(parameter)=0]"
diff --git a/source/androidx.camera/camera-extensions/Transforms/Metadata.Namespaces.xml b/source/androidx.camera/camera-extensions/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 221070e26..000000000
--- a/source/androidx.camera/camera-extensions/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.camera.extensions']" 
-        name="managedName"
-        >
-        AndroidX.Camera.Extensions
-    </attr>
-    
-    
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.camera/camera-lifecycle/Transforms/Metadata.Namespaces.xml b/source/androidx.camera/camera-lifecycle/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index dc4c8af26..000000000
--- a/source/androidx.camera/camera-lifecycle/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.camera.lifecycle']" 
-        name="managedName"
-        >
-        AndroidX.Camera.Lifecycle
-    </attr>
-    
-    
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.camera/camera-view/Transforms/Metadata.Namespaces.xml b/source/androidx.camera/camera-view/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 6dd9d613e..000000000
--- a/source/androidx.camera/camera-view/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.camera.view']" 
-        name="managedName"
-        >
-        AndroidX.Camera.View
-    </attr>    
-    <attr 
-        path="/api/package[@name='androidx.camera.view.preview']" 
-        name="managedName"
-        >
-        AndroidX.Camera.View.Preview
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.camera.view.preview.transform']" 
-        name="managedName"
-        >
-        AndroidX.Camera.View.Preview.Transform
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.camera.view.preview.transform.transformation']" 
-        name="managedName"
-        >
-        AndroidX.Camera.View.Preview.Transform.Transformation
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.camera.view.video']" 
-        name="managedName"
-        >
-        AndroidX.Camera.View.Video
-    </attr>
-    
-    
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.car.app/app/Transforms/Metadata.Namespaces.xml b/source/androidx.car.app/app/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index d05294dc4..000000000
--- a/source/androidx.car.app/app/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<metadata>
-
-    <attr 
-        path="/api/package[@name='androidx.car.app']"
-        name="managedName"
-        >
-        AndroidX.Car.App
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.car.app.annotations']"
-        name="managedName"
-        >
-        AndroidX.Car.App.Annotations
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.car.app.model']"
-        name="managedName"
-        >
-        AndroidX.Car.App.Model
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.car.app.model.constraints']"
-        name="managedName"
-        >
-        AndroidX.Car.App.Model.Constraints
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.car.app.model.signin']"
-        name="managedName"
-        >
-        AndroidX.Car.App.Model.SignIn
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.car.app.navigation']"
-        name="managedName"
-        >
-        AndroidX.Car.App.Navigation
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.car.app.navigation.model']"
-        name="managedName"
-        >
-        AndroidX.Car.App.Navigation.Model
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.car.app.notification']"
-        name="managedName"
-        >
-        AndroidX.Car.App.Notification
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.car.app.serialization']"
-        name="managedName"
-        >
-        AndroidX.Car.App.Serialization
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.car.app.utils']"
-        name="managedName"
-        >
-        AndroidX.Car.App.Utils
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.car.app.validation']"
-        name="managedName"
-        >
-        AndroidX.Car.App.Validation
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.car.app.versioning']"
-        name="managedName"
-        >
-        AndroidX.Car.App.Versioning
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.car.app.hardware']"
-        name="managedName"
-        >
-        AndroidX.Car.App.Hardware
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.car.app.hardware.info']"
-        name="managedName"
-        >
-        AndroidX.Car.App.Hardware.Info
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.car.app.hardware.common']"
-        name="managedName"
-        >
-        AndroidX.Car.App.Hardware.Common
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.car.app.connection']"
-        name="managedName"
-        >
-        AndroidX.Car.App.Connection
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.car.app.constraints']"
-        name="managedName"
-        >
-        AndroidX.Car.App.Constraints
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.car.app.managers']"
-        name="managedName"
-        >
-        AndroidX.Car.App.Managers
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.car/car-cluster/Transforms/Metadata.Namespaces.xml b/source/androidx.car/car-cluster/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 96daa8c9c..000000000
--- a/source/androidx.car/car-cluster/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.car.cluster.navigation']" 
-        name="managedName"
-        >
-        AndroidX.Car.Cluster.Navigation
-    </attr>    
-    
-    
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.car/car/Transforms/Metadata.Namespaces.xml b/source/androidx.car/car/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index daa6c72f8..000000000
--- a/source/androidx.car/car/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.car.app']" 
-        name="managedName"
-        >
-        AndroidX.Car.App
-    </attr>    
-    <attr 
-        path="/api/package[@name='androidx.car.drawer']" 
-        name="managedName"
-        >
-        AndroidX.Car.Drawer
-    </attr>    
-    <attr 
-        path="/api/package[@name='androidx.car.navigation.utils']" 
-        name="managedName"
-        >
-        AndroidX.Car.Navigation.Utils
-    </attr>    
-    <attr 
-        path="/api/package[@name='androidx.car.util']" 
-        name="managedName"
-        >
-        AndroidX.Car.Util
-    </attr>    
-    <attr 
-        path="/api/package[@name='androidx.car.uxrestrictions']" 
-        name="managedName"
-        >
-        AndroidX.Car.UXRestrictions
-    </attr>    
-    <attr 
-        path="/api/package[@name='androidx.car.widget']" 
-        name="managedName"
-        >
-        AndroidX.Car.Widget
-    </attr>    
-    <attr 
-        path="/api/package[@name='androidx.car.widget.itemdecorators']" 
-        name="managedName"
-        >
-        AndroidX.Car.Widget.ItemDecorators
-    </attr>    
-    
-    
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.cardview/cardview/Transforms/Metadata.Namespaces.xml b/source/androidx.cardview/cardview/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 2282700c5..000000000
--- a/source/androidx.cardview/cardview/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.cardview.widget']" name="managedName">AndroidX.CardView.Widget</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.collection/collection-ktx/Transforms/Metadata.Namespaces.xml b/source/androidx.collection/collection-ktx/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index aac07ab8e..000000000
--- a/source/androidx.collection/collection-ktx/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.collection']" 
-        name="managedName"
-        >
-        AndroidX.Collection
-    </attr>
-    
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.collection/collection/Transforms/Metadata.Namespaces.xml b/source/androidx.collection/collection/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 44c98fdc2..000000000
--- a/source/androidx.collection/collection/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.collection']" name="managedName">AndroidX.Collection</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.collection/collection/Transforms/Metadata.xml b/source/androidx.collection/collection/Transforms/Metadata.xml
index 0e1fa37c1..37ad216b9 100644
--- a/source/androidx.collection/collection/Transforms/Metadata.xml
+++ b/source/androidx.collection/collection/Transforms/Metadata.xml
@@ -1,4 +1,3 @@
 <metadata>
     <attr path="/api/package[@name='androidx.collection']/class[@name='ArrayMap']/method[@name='entrySet' and count(parameter)=0]" name="managedName">_EntrySet</attr>
-    <attr path="/api/package[@name='androidx.collection']" name="managedName">AndroidX.Collection</attr>
 </metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 8953cb782..000000000
--- a/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<metadata>
-    <remove-node path="/api/package" />
-
-    <!--
-    <attr 
-        path="/api/package[@name='androidx.compose.animation.core']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Animation.Core
-    </attr>        
-    -->
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.animation/animation-core/Transforms/Metadata.xml b/source/androidx.compose.animation/animation-core/Transforms/Metadata.xml
index 2a5d3dfc7..a7da39fba 100644
--- a/source/androidx.compose.animation/animation-core/Transforms/Metadata.xml
+++ b/source/androidx.compose.animation/animation-core/Transforms/Metadata.xml
@@ -1,4 +1,5 @@
 <metadata>
+    <remove-node path="/api/package" />
 
     <!--
     <remove-node
diff --git a/source/androidx.compose.animation/animation/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.animation/animation/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index bba44c01d..000000000
--- a/source/androidx.compose.animation/animation/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<metadata>
-    <remove-node path="/api/package" />
-
-    <!--
-    <attr 
-        path="/api/package[@name='androidx.compose.animation']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Animation
-    </attr>
-    -->
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.animation/animation/Transforms/Metadata.xml b/source/androidx.compose.animation/animation/Transforms/Metadata.xml
index 9495e200d..cf329ae37 100644
--- a/source/androidx.compose.animation/animation/Transforms/Metadata.xml
+++ b/source/androidx.compose.animation/animation/Transforms/Metadata.xml
@@ -1,3 +1,3 @@
 <metadata>
-
+    <remove-node path="/api/package" />
 </metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index bb65057a7..000000000
--- a/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<metadata>
-    <remove-node path="/api/package" />
-
-    <!--
-    <attr 
-        path="/api/package[@name='androidx.compose.foundation.layout']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Foundation.Layout
-    </attr>        
-    -->
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.xml b/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.xml
index 6cb03e17a..4995e1a1d 100644
--- a/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.xml
+++ b/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.xml
@@ -1,4 +1,5 @@
 <metadata>
+    <remove-node path="/api/package" />
 
     <!--
     <attr
diff --git a/source/androidx.compose.foundation/foundation/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.foundation/foundation/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index bf3bfe961..000000000
--- a/source/androidx.compose.foundation/foundation/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<metadata>
-    <remove-node path="/api/package" />
-
-    <!--
-    <attr 
-        path="/api/package[@name='androidx.compose.foundation']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Foundation
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.foundation.gestures']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Foundation.Gestures
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.foundation.interaction']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Foundation.Interaction
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.foundation.lazy']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Foundation.Lazy
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.foundation.selection']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Foundation.Selection
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.foundation.shape']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Foundation.Shape
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.foundation.text']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Foundation.Text
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.foundation.text.selection']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Foundation.Text.Selection
-    </attr>        
-    -->
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.foundation/foundation/Transforms/Metadata.xml b/source/androidx.compose.foundation/foundation/Transforms/Metadata.xml
index 72553e9df..60c01802e 100644
--- a/source/androidx.compose.foundation/foundation/Transforms/Metadata.xml
+++ b/source/androidx.compose.foundation/foundation/Transforms/Metadata.xml
@@ -1,4 +1,5 @@
 <metadata>
+    <remove-node path="/api/package" />
     <!--
     <attr
         path="/api/package[@name='androidx.compose.foundation.shape']/class[@name='RoundedCornerShapeKt']/method[@name='RoundedCornerShape-0680j_4' and count(parameter)=1 and parameter[1][@type='float']]"
diff --git a/source/androidx.compose.material/material-icons-core/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.material/material-icons-core/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 05150f52f..000000000
--- a/source/androidx.compose.material/material-icons-core/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<metadata>
-    <remove-node path="/api/package" />
-
-    <!--
-    <attr 
-        path="/api/package[@name='androidx.compose.material.icons']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Material.Icons
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.material.icons.rounded']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Material.Icons.Rounded
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.material.icons.sharp']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Material.Icons.Sharp
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.material.icons.outlined']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Material.Icons.Outlined
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.material.icons.filled']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Material.Icons.Filled
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.material.icons.twotone']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Material.Icons.TwoTone
-    </attr>        
-    -->
-
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.material/material-icons-core/Transforms/Metadata.xml b/source/androidx.compose.material/material-icons-core/Transforms/Metadata.xml
index 9495e200d..cf329ae37 100644
--- a/source/androidx.compose.material/material-icons-core/Transforms/Metadata.xml
+++ b/source/androidx.compose.material/material-icons-core/Transforms/Metadata.xml
@@ -1,3 +1,3 @@
 <metadata>
-
+    <remove-node path="/api/package" />
 </metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.material/material-icons-extended/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.material/material-icons-extended/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 05150f52f..000000000
--- a/source/androidx.compose.material/material-icons-extended/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<metadata>
-    <remove-node path="/api/package" />
-
-    <!--
-    <attr 
-        path="/api/package[@name='androidx.compose.material.icons']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Material.Icons
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.material.icons.rounded']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Material.Icons.Rounded
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.material.icons.sharp']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Material.Icons.Sharp
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.material.icons.outlined']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Material.Icons.Outlined
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.material.icons.filled']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Material.Icons.Filled
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.material.icons.twotone']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Material.Icons.TwoTone
-    </attr>        
-    -->
-
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.material/material-icons-extended/Transforms/Metadata.xml b/source/androidx.compose.material/material-icons-extended/Transforms/Metadata.xml
index 9495e200d..cf329ae37 100644
--- a/source/androidx.compose.material/material-icons-extended/Transforms/Metadata.xml
+++ b/source/androidx.compose.material/material-icons-extended/Transforms/Metadata.xml
@@ -1,3 +1,3 @@
 <metadata>
-
+    <remove-node path="/api/package" />
 </metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.material/material-ripple/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.material/material-ripple/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 8cab63fb6..000000000
--- a/source/androidx.compose.material/material-ripple/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<metadata>
-    <remove-node path="/api/package" />
-
-    <!--
-    <attr 
-        path="/api/package[@name='androidx.compose.material.ripple']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Material.Ripple
-    </attr>
-        
-    -->
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.material/material-ripple/Transforms/Metadata.xml b/source/androidx.compose.material/material-ripple/Transforms/Metadata.xml
index 9495e200d..cf329ae37 100644
--- a/source/androidx.compose.material/material-ripple/Transforms/Metadata.xml
+++ b/source/androidx.compose.material/material-ripple/Transforms/Metadata.xml
@@ -1,3 +1,3 @@
 <metadata>
-
+    <remove-node path="/api/package" />
 </metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.material/material/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.material/material/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 9ff143983..000000000
--- a/source/androidx.compose.material/material/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<metadata>
-    <remove-node path="/api/package" />
-
-    <!--
-    <attr 
-        path="/api/package[@name='androidx.compose.material']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Material
-    </attr>        
-    -->
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.material/material/Transforms/Metadata.xml b/source/androidx.compose.material/material/Transforms/Metadata.xml
index 9495e200d..cf329ae37 100644
--- a/source/androidx.compose.material/material/Transforms/Metadata.xml
+++ b/source/androidx.compose.material/material/Transforms/Metadata.xml
@@ -1,3 +1,3 @@
 <metadata>
-
+    <remove-node path="/api/package" />
 </metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 3374486fa..000000000
--- a/source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<metadata>
-    <remove-node path="/api/package" />
-
-    <!--
-    <attr 
-        path="/api/package[@name='androidx.compose.runtime.livedata']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Runtime.LiveData
-    </attr>        
-    -->
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.xml b/source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.xml
index 9495e200d..cf329ae37 100644
--- a/source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.xml
+++ b/source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.xml
@@ -1,3 +1,3 @@
 <metadata>
-
+    <remove-node path="/api/package" />
 </metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 9d5360713..000000000
--- a/source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<metadata>
-    <remove-node path="/api/package" />
-
-    <!--
-    <attr 
-        path="/api/package[@name='androidx.compose.runtime.rxjava2']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Runtime.RxJava2
-    </attr>        
-    -->
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.xml b/source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.xml
index 9495e200d..cf329ae37 100644
--- a/source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.xml
+++ b/source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.xml
@@ -1,3 +1,3 @@
 <metadata>
-
+    <remove-node path="/api/package" />
 </metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.runtime/runtime-rxjava3/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.runtime/runtime-rxjava3/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 638cde2e8..000000000
--- a/source/androidx.compose.runtime/runtime-rxjava3/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='androidx.compose']" 
-        name="managedName"
-        >
-        AndroidX.Compose
-    </attr>
-    -->
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.runtime/runtime-rxjava3/Transforms/Metadata.xml b/source/androidx.compose.runtime/runtime-rxjava3/Transforms/Metadata.xml
index 9495e200d..cf329ae37 100644
--- a/source/androidx.compose.runtime/runtime-rxjava3/Transforms/Metadata.xml
+++ b/source/androidx.compose.runtime/runtime-rxjava3/Transforms/Metadata.xml
@@ -1,3 +1,3 @@
 <metadata>
-
+    <remove-node path="/api/package" />
 </metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 74969d24f..000000000
--- a/source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<metadata>
-    <remove-node path="/api/package" />
-
-    <!--
-    <attr 
-        path="/api/package[@name='androidx.compose.runtime.saveable']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Runtime.Saveable
-    </attr>        
-    -->
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.xml b/source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.xml
index 9495e200d..cf329ae37 100644
--- a/source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.xml
+++ b/source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.xml
@@ -1,3 +1,3 @@
 <metadata>
-
+    <remove-node path="/api/package" />
 </metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.runtime/runtime/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.runtime/runtime/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 03fd04752..000000000
--- a/source/androidx.compose.runtime/runtime/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<metadata>
-    <!--
-        not surfacing/generating MCWs 
-        Compose does work for kotlin only via Annotations and kotlin defined UI
-        it does not make sense for C# until parsing of kotlin and transpiling to c# is ready (if ever)
-
-        BINDINGSGENERATOR : error BG0000: System.InvalidOperationException: The XPath expression evaluated to unexpected type System.Boolean.
-
-    <remove-node path="/api/package" />
-    <remove-node path="/api" />
-    <remove-node path="/api/package/*" />
-    <remove-node path="/api/package/*" />
-    <remove-node path="//package" />
-
-    error BG4301: Invalid XPath specification: path=//package/. 
-    <remove-node path="path=//package/" />
-    -->
-    <remove-node path="/api/package" />
-
-    <!--
-    <attr 
-        path="/api/package[@name='androidx.compose.runtime']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Runtime
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.runtime.collection']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Runtime.Collection
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.runtime.external.kotlinx.collections.immutable']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Runtime.External.KotlinX.Collections.Immutable
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.runtime.external.kotlinx.collections.immutable.adapters']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Runtime.External.KotlinX.Collections.Immutable.Adapters
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableList']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Runtime.External.KotlinX.Collections.Immutable.Implementations.ImmutableList
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableMap']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Runtime.External.KotlinX.Collections.Immutable.Implementations.ImmutableMap
-    </attr>
-
-    <attr 
-        path="/api/package[@name='androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.immutableSet']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Runtime.External.KotlinX.Collections.Immutable.Implementations.ImmutableSet
-    </attr>
-
-    <attr 
-        path="/api/package[@name='androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.persistentOrderedMap']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Runtime.External.KotlinX.Collections.Immutable.Implementations.PersistentOrderedMap
-    </attr>
-
-    <attr 
-        path="/api/package[@name='androidx.compose.runtime.external.kotlinx.collections.immutable.implementations.persistentOrderedSet']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Runtime.External.KotlinX.Collections.Immutable.Implementations.PersistentOrderedSet
-    </attr>
-    
-
-    <attr 
-        path="/api/package[@name='androidx.compose.runtime.internal']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Runtime.Internal
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.runtime.snapshots']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Runtime.Snapshots
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.runtime.tooling']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Runtime.Tooling
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.runtime.external.kotlinx.collections.immutable.internal']" 
-        name="managedName"
-        >
-        AndroidX.Compose.Runtime.External.KotlinX.Collections.Immutable.Internal
-    </attr>        
-    -->
-    
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.runtime/runtime/Transforms/Metadata.xml b/source/androidx.compose.runtime/runtime/Transforms/Metadata.xml
index 7b3164092..86d63e6bf 100644
--- a/source/androidx.compose.runtime/runtime/Transforms/Metadata.xml
+++ b/source/androidx.compose.runtime/runtime/Transforms/Metadata.xml
@@ -1,10 +1,17 @@
 <metadata>
+    <!--
+        not surfacing/generating MCWs 
+        Compose does work for kotlin only via Annotations and kotlin defined UI
+        it does not make sense for C# until parsing of kotlin and transpiling to c# is ready (if ever)
+    -->
+    <remove-node path="/api/package" />
+    
+    <!--
     <remove-node
         path="/api/package[@name='androidx.compose.runtime']/interface[@name='Applier']/typeParameters" 
         />
 
 
-    <!--
     <attr
         path="/api/package[@name='androidx.compose.runtime.external.kotlinx.collections.immutable']/class[@name='ExtensionsKt']/method[@name='toImmutableList']"
         name="managedReturn"
diff --git a/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 838c98c61..000000000
--- a/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<metadata>
-    <remove-node path="/api/package" />
-
-    <!--
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.geometry']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Geometry
-    </attr>        
-    -->
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.xml
index 97f5a6a66..d08b192b2 100644
--- a/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.xml
+++ b/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.xml
@@ -1,4 +1,5 @@
 <metadata>
+    <remove-node path="/api/package" />
 
     <!--
     <attr
diff --git a/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 47a829dc4..000000000
--- a/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<metadata>
-    <remove-node path="/api/package" />
-
-    <!--
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.graphics']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Graphics
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.graphics.colorspace']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Graphics.Colorspace
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.graphics.drawscope']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Graphics.Drawscope
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.graphics.painter']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Graphics.Painter
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.graphics.vector']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Graphics.Vector
-    </attr>        
-    -->
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.xml
index a548d1522..15c040621 100644
--- a/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.xml
+++ b/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.xml
@@ -1,4 +1,5 @@
 <metadata>
+    <remove-node path="/api/package" />
 
     <!--
     <attr
diff --git a/source/androidx.compose.ui/ui-text/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-text/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 1189f3e9e..000000000
--- a/source/androidx.compose.ui/ui-text/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<metadata>
-    <remove-node path="/api/package" />
-
-    <!--
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.text']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Text
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.text.android']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Text.Android
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.text.android.animation']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Text.Android.Animation
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.text.android.selection']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Text.Android.Selection
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.text.font']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Text.Font
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.text.input']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Text.Input
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.text.intl']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Text.Intl
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.text.platform']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Text.Platform
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.text.platform.extensions']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Text.Platform.Extensions
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.text.android.style']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Text.Android.Style
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.text.style']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Text.Style
-    </attr>        
-    -->
-    
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.ui/ui-text/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-text/Transforms/Metadata.xml
index 28d4331e4..7105d4770 100644
--- a/source/androidx.compose.ui/ui-text/Transforms/Metadata.xml
+++ b/source/androidx.compose.ui/ui-text/Transforms/Metadata.xml
@@ -1,4 +1,5 @@
 <metadata>
+    <remove-node path="/api/package" />
     <!--
     <attr
         path="/api/package[@name='androidx.compose.ui.text.intl']/class[@name='LocaleList']/method[@name='add' and count(parameter)=1 and parameter[1][@type='androidx.compose.ui.text.intl.Locale']]/parameter[1]"
diff --git a/source/androidx.compose.ui/ui-tooling-data/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-tooling-data/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 6d3403b79..000000000
--- a/source/androidx.compose.ui/ui-tooling-data/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<metadata>
-
-    <!--
-    <attr 
-        path="/api/package[@name='androidx.compose']" 
-        name="managedName"
-        >
-        AndroidX.Compose
-    </attr>
-    -->
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.ui/ui-tooling-data/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-tooling-data/Transforms/Metadata.xml
index 9495e200d..cf329ae37 100644
--- a/source/androidx.compose.ui/ui-tooling-data/Transforms/Metadata.xml
+++ b/source/androidx.compose.ui/ui-tooling-data/Transforms/Metadata.xml
@@ -1,3 +1,3 @@
 <metadata>
-
+    <remove-node path="/api/package" />
 </metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.ui/ui-tooling-preview/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-tooling-preview/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 638cde2e8..000000000
--- a/source/androidx.compose.ui/ui-tooling-preview/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='androidx.compose']" 
-        name="managedName"
-        >
-        AndroidX.Compose
-    </attr>
-    -->
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.ui/ui-tooling-preview/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-tooling-preview/Transforms/Metadata.xml
index 9495e200d..cf329ae37 100644
--- a/source/androidx.compose.ui/ui-tooling-preview/Transforms/Metadata.xml
+++ b/source/androidx.compose.ui/ui-tooling-preview/Transforms/Metadata.xml
@@ -1,3 +1,3 @@
 <metadata>
-
+    <remove-node path="/api/package" />
 </metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.ui/ui-tooling/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-tooling/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 6d3403b79..000000000
--- a/source/androidx.compose.ui/ui-tooling/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<metadata>
-
-    <!--
-    <attr 
-        path="/api/package[@name='androidx.compose']" 
-        name="managedName"
-        >
-        AndroidX.Compose
-    </attr>
-    -->
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.ui/ui-tooling/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-tooling/Transforms/Metadata.xml
index 9495e200d..cf329ae37 100644
--- a/source/androidx.compose.ui/ui-tooling/Transforms/Metadata.xml
+++ b/source/androidx.compose.ui/ui-tooling/Transforms/Metadata.xml
@@ -1,3 +1,3 @@
 <metadata>
-
+    <remove-node path="/api/package" />
 </metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.ui/ui-unit/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-unit/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 65e882036..000000000
--- a/source/androidx.compose.ui/ui-unit/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<metadata>
-    <remove-node path="/api/package" />
-
-    <!--
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.unit']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Unit
-    </attr>        
-    -->
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.ui/ui-unit/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-unit/Transforms/Metadata.xml
index cd8c67b97..79292bfca 100644
--- a/source/androidx.compose.ui/ui-unit/Transforms/Metadata.xml
+++ b/source/androidx.compose.ui/ui-unit/Transforms/Metadata.xml
@@ -1,4 +1,5 @@
 <metadata>
+    <remove-node path="/api/package" />
     <!--
     <attr 
         path="/api/package[@name='androidx.compose.ui.unit']/class[@name='ConstraintsKt']/method[@name='constrain-4WqzIAM' and count(parameter)=2 and parameter[1][@type='long'] and parameter[2][@type='long']]"
diff --git a/source/androidx.compose.ui/ui-util/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-util/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 41983cb15..000000000
--- a/source/androidx.compose.ui/ui-util/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<metadata>
-    <remove-node path="/api/package" />
-
-    <!--
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.util']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Util
-    </attr>        
-    -->
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.ui/ui-util/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-util/Transforms/Metadata.xml
index 9495e200d..cf329ae37 100644
--- a/source/androidx.compose.ui/ui-util/Transforms/Metadata.xml
+++ b/source/androidx.compose.ui/ui-util/Transforms/Metadata.xml
@@ -1,3 +1,3 @@
 <metadata>
-
+    <remove-node path="/api/package" />
 </metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 42034f5bd..000000000
--- a/source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<metadata>
-    <remove-node path="/api/package" />
-
-    <!--
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.viewinterop']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.ViewInterOp
-    </attr>        
-    -->
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.xml
index 9495e200d..cf329ae37 100644
--- a/source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.xml
+++ b/source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.xml
@@ -1,3 +1,3 @@
 <metadata>
-
+    <remove-node path="/api/package" />
 </metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.ui/ui/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index c478bd0ed..000000000
--- a/source/androidx.compose.ui/ui/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<metadata>
-    <remove-node path="/api/package" />
-
-    <!--
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.graphics']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Graphics
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.text.input']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Text.Input
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.graphics.vector']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Graphics.Vector
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.autofill']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Autofill
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.draw']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Draw
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.focus']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Focus
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.graphics.vector.compat']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Graphics.Vector.Compat
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.hapticfeedback']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.HapticFeedback
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.input.key']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Input.Key
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.input.nestedscroll']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Input.NestedScroll
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.input.pointer']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Input.Pointer
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.input.pointer.util']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Input.Pointer.Util
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.layout']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Layout
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.node']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Node
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.platform']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Platform
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.platform.accessibility']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Platform.Accessibility
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.platform.actionmodecallback']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Platform.ActionModeCallback
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.res']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Res
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.semantics']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Semantics
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.state']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.State
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.viewinterop']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.ViewInterop
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.compose.ui.window']" 
-        name="managedName"
-        >
-        AndroidX.Compose.UI.Window
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.inspection.compose.ui']" 
-        name="managedName"
-        >
-        AndroidX.Inspection.Compose.UI
-    </attr>        
-    -->
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.compose.ui/ui/Transforms/Metadata.xml b/source/androidx.compose.ui/ui/Transforms/Metadata.xml
index 87b668fb5..78e093a4e 100644
--- a/source/androidx.compose.ui/ui/Transforms/Metadata.xml
+++ b/source/androidx.compose.ui/ui/Transforms/Metadata.xml
@@ -1,4 +1,5 @@
 <metadata>
+    <remove-node path="/api/package" />
 
     <attr
         path="/api/package[@name='androidx.compose.ui.draw']/class[@name='CacheDrawScope']/method[@name='toSp-0xMU5do' and count(parameter)=1 and parameter[1][@type='float']]"
diff --git a/source/androidx.compose/compose-runtime/Transforms/Metadata.Namespaces.xml b/source/androidx.compose/compose-runtime/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 9495e200d..000000000
--- a/source/androidx.compose/compose-runtime/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<metadata>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.concurrent/concurrent-futures/Transforms/Metadata.Namespaces.xml b/source/androidx.concurrent/concurrent-futures/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 881a654da..000000000
--- a/source/androidx.concurrent/concurrent-futures/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<metadata>
-    <!-- This really is support still here :( -->
-    <attr 
-        path="/api/package[@name='androidx.concurrent.futures']" 
-        name="managedName"
-        >
-        AndroidX.Concurrent.Futures
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.concurrent.futures']" 
-        name="managedName"
-        >
-        AndroidX.Concurrent.Futures
-    </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.concurrent/concurrent-listenablefuture-callback/Transforms/Metadata.Namespaces.xml b/source/androidx.concurrent/concurrent-listenablefuture-callback/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 0b95f4b25..000000000
--- a/source/androidx.concurrent/concurrent-listenablefuture-callback/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<metadata>
-    <!-- This really is support still here :( -->
-    <attr 
-        path="/api/package[@name='androidx.concurrent']" 
-        name="managedName"
-        >
-        AndroidX.Concurrent
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.concurrent.futures']" 
-        name="managedName"
-        >
-        AndroidX.Concurrent.Futures
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.concurrent.callback']" 
-        name="managedName"
-        >
-        AndroidX.Concurrent.Callback
-    </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.concurrent/concurrent-listenablefuture/Transforms/Metadata.Namespaces.xml b/source/androidx.concurrent/concurrent-listenablefuture/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 7a4dd379a..000000000
--- a/source/androidx.concurrent/concurrent-listenablefuture/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<metadata>
-    <!-- This really is support still here :( -->
-    <attr 
-        path="/api/package[@name='androidx.concurrent']" 
-        name="managedName"
-        >
-        AndroidX.Concurrent
-    </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.concurrent/futures/Transforms/Metadata.Namespaces.xml b/source/androidx.concurrent/futures/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 881a654da..000000000
--- a/source/androidx.concurrent/futures/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<metadata>
-    <!-- This really is support still here :( -->
-    <attr 
-        path="/api/package[@name='androidx.concurrent.futures']" 
-        name="managedName"
-        >
-        AndroidX.Concurrent.Futures
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.concurrent.futures']" 
-        name="managedName"
-        >
-        AndroidX.Concurrent.Futures
-    </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.constraintlayout/constraintlayout-core/Transforms/Metadata.Namespaces.xml b/source/androidx.constraintlayout/constraintlayout-core/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 567272f70..000000000
--- a/source/androidx.constraintlayout/constraintlayout-core/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-
-    <attr 
-        path="/api/package[@name='androidx.constraintlayout.core']" 
-        name="managedName"
-        >
-        AndroidX.ConstraintLayout.Core
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.constraintlayout.core.motion']" 
-        name="managedName"
-        >
-        AndroidX.ConstraintLayout.Core.Motion
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.constraintlayout.core.motion.key']" 
-        name="managedName"
-        >
-        AndroidX.ConstraintLayout.Core.Motion.Key
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.constraintlayout.core.motion.parse']" 
-        name="managedName"
-        >
-        AndroidX.ConstraintLayout.Core.Motion.Parse
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.constraintlayout.core.motion.utils']" 
-        name="managedName"
-        >
-        AndroidX.ConstraintLayout.Core.Motion.Utils
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.constraintlayout.core.parser']" 
-        name="managedName"
-        >
-        AndroidX.ConstraintLayout.Core.Parser
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.constraintlayout.core.parser']" 
-        name="managedName"
-        >
-        AndroidX.ConstraintLayout.Core.Parser
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.constraintlayout.core.state']" 
-        name="managedName"
-        >
-        AndroidX.ConstraintLayout.Core.State
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.constraintlayout.core.state.helpers']" 
-        name="managedName"
-        >
-        AndroidX.ConstraintLayout.Core.State.Helpers
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.constraintlayout.core.widgets']" 
-        name="managedName"
-        >
-        AndroidX.ConstraintLayout.Core.Widgets
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.constraintlayout.core.widgets.analyzer']" 
-        name="managedName"
-        >
-        AndroidX.ConstraintLayout.Core.Widgets.Analyzer
-    </attr>
-   
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.constraintlayout/constraintlayout-solver/Transforms/Metadata.Namespaces.xml b/source/androidx.constraintlayout/constraintlayout-solver/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index d08dfbb2e..000000000
--- a/source/androidx.constraintlayout/constraintlayout-solver/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.constraintlayout.solver']" name="managedName">AndroidX.ConstraintLayout.Solver</attr>
-    <attr path="/api/package[@name='androidx.constraintlayout.solver.widgets']" name="managedName">AndroidX.ConstraintLayout.Solver.Widgets</attr>
-
-   <attr 
-        path="/api/package[@name='androidx.constraintlayout.solver.widgets']" 
-        name="managedName"
-        >
-        AndroidX.ConstraintLayout.Solver.Widgets
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.constraintlayout.solver.widgets.analyzer']" 
-        name="managedName"
-        >
-        AndroidX.ConstraintLayout.Solver.Widgets.Analyzer
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.constraintlayout.solver.state']" 
-        name="managedName"
-        >
-        AndroidX.ConstraintLayout.Solver.State
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.constraintlayout.solver.state.helpers']" 
-        name="managedName"
-        >
-        AndroidX.ConstraintLayout.Solver.State.Helpers
-    </attr>
-    
-</metadata>
diff --git a/source/androidx.constraintlayout/constraintlayout/Transforms/Metadata.Namespaces.xml b/source/androidx.constraintlayout/constraintlayout/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index fcdee0881..000000000
--- a/source/androidx.constraintlayout/constraintlayout/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.constraintlayout.widget']" name="managedName">AndroidX.ConstraintLayout.Widget</attr>
-    <attr path="/api/package[@name='androidx.constraintlayout.solver']" name="managedName">AndroidX.ConstraintLayout.Solver</attr>
-    <attr path="/api/package[@name='androidx.constraintlayout.solver.widgets']" name="managedName">AndroidX.ConstraintLayout.Solver.Widgets</attr>
-
-    <attr 
-        path="/api/package[@name='androidx.constraintlayout.helper.widget']" 
-        name="managedName"
-        >
-        AndroidX.ConstraintLayout.Helper.Widget
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.constraintlayout.motion.utils']" 
-        name="managedName"
-        >
-        AndroidX.ConstraintLayout.Motion.Utils
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.constraintlayout.motion.widget']" 
-        name="managedName"
-        >
-        AndroidX.ConstraintLayout.Motion.Widget
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.constraintlayout.utils.widget']" 
-        name="managedName"
-        >
-        AndroidX.ConstraintLayout.Utils.Widget
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.constraintlayout.widget']" 
-        name="managedName"
-        >
-        AndroidX.ConstraintLayout.Widget
-    </attr>
-   
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.contentpager/contentpager/Transforms/Metadata.Namespaces.xml b/source/androidx.contentpager/contentpager/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 6cb21792d..000000000
--- a/source/androidx.contentpager/contentpager/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.contentpager.content']" name="managedName">AndroidX.ContentPager.Content</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.coordinatorlayout/coordinatorlayout/Transforms/Metadata.Namespaces.xml b/source/androidx.coordinatorlayout/coordinatorlayout/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index b4faad26a..000000000
--- a/source/androidx.coordinatorlayout/coordinatorlayout/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.coordinatorlayout.widget']" name="managedName">AndroidX.CoordinatorLayout.Widget</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.core/core-animation/Transforms/Metadata.Namespaces.xml b/source/androidx.core/core-animation/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 78ca17632..000000000
--- a/source/androidx.core/core-animation/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.core.animation']" 
-        name="managedName"
-        >
-        AndroidX.Core.Animation
-    </attr>
-    
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.core/core-google-shortcuts/Transforms/Metadata.Namespaces.xml b/source/androidx.core/core-google-shortcuts/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 40dde8ee2..000000000
--- a/source/androidx.core/core-google-shortcuts/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.core.google.shortcuts']" 
-        name="managedName"
-        >
-        AndroidX.Core.Google.Shortcuts
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.core.google.shortcuts.builders']" 
-        name="managedName"
-        >
-        AndroidX.Core.Google.Shortcuts.Builders
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.core/core-ktx/Transforms/Metadata.Namespaces.xml b/source/androidx.core/core-ktx/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 47b0a2d9e..000000000
--- a/source/androidx.core/core-ktx/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.core.view']" 
-        name="managedName"
-        >
-        AndroidX.Core.View
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.core.database']" 
-        name="managedName"
-        >
-        AndroidX.Core.Database
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.core.text']" 
-        name="managedName"
-        >
-        AndroidX.Core.Text
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.core.graphics']" 
-        name="managedName"
-        >
-        AndroidX.Core.Graphics
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.core.content.res']" 
-        name="managedName"
-        >
-        AndroidX.Core.Content.Resources
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.core.os']" 
-        name="managedName"
-        >
-        AndroidX.Core.OS
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.core.widget']" 
-        name="managedName"
-        >
-        AndroidX.Core.Widget
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.core.content']" 
-        name="managedName"
-        >
-        AndroidX.Core.Content
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.core.net']" 
-        name="managedName"
-        >
-        AndroidX.Core.Net
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.core.util']" 
-        name="managedName"
-        >
-        AndroidX.Core.Util
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.core.location']" 
-        name="managedName"
-        >
-        AndroidX.Core.Location
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.core.graphics.drawable']" 
-        name="managedName"
-        >
-        AndroidX.Core.Graphics.Drawable
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.core.database.sqlite']" 
-        name="managedName"
-        >
-        AndroidX.Core.Database.Sqlite
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.core.animation']" 
-        name="managedName"
-        >
-        AndroidX.Core.Animation
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.core.transition']" 
-        name="managedName"
-        >
-        AndroidX.Core.Transition
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.core/core-role/Transforms/Metadata.Namespaces.xml b/source/androidx.core/core-role/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 359654256..000000000
--- a/source/androidx.core/core-role/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.core.role']" 
-        name="managedName"
-        >
-        AndroidX.Core.Role
-    </attr>
-    
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.core/core-splashscreen/Transforms/Metadata.Namespaces.xml b/source/androidx.core/core-splashscreen/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 6726d1f7b..000000000
--- a/source/androidx.core/core-splashscreen/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<metadata>
-    <attr
-        path="/api/package[@name='androidx.core.splashscreen']"
-        name="managedName"
-        >
-        AndroidX.Core.SplashScreen
-    </attr>
-
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.core/core/Transforms/Metadata.Namespaces.xml b/source/androidx.core/core/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 325027809..000000000
--- a/source/androidx.core/core/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.core.accessibilityservice']" name="managedName">AndroidX.Core.AccessibilityService</attr>
-    <attr path="/api/package[@name='androidx.core.app']" name="managedName">AndroidX.Core.App</attr>
-    <attr path="/api/package[@name='androidx.core.content']" name="managedName">AndroidX.Core.Content</attr>
-    <attr path="/api/package[@name='androidx.core.content.pm']" name="managedName">AndroidX.Core.Content.PM</attr>
-    <attr path="/api/package[@name='androidx.core.content.res']" name="managedName">AndroidX.Core.Content.Resources</attr>
-    <attr path="/api/package[@name='androidx.core.database']" name="managedName">AndroidX.Core.Database</attr>
-    <attr path="/api/package[@name='androidx.core.database.sqlite']" name="managedName">AndroidX.Core.Database.SqlLite</attr>
-    <attr path="/api/package[@name='androidx.core.graphics']" name="managedName">AndroidX.Core.Graphics</attr>
-    <attr path="/api/package[@name='androidx.core.graphics.drawable']" name="managedName">AndroidX.Core.Graphics.Drawable</attr>
-    <attr path="/api/package[@name='androidx.core.hardware.display']" name="managedName">AndroidX.Core.Hardware.Display</attr>
-    <attr path="/api/package[@name='androidx.core.hardware.fingerprint']" name="managedName">AndroidX.Core.Hardware.Fingerprint</attr>
-    <attr path="/api/package[@name='androidx.core.internal']" name="managedName">AndroidX.Core.Internal</attr>
-    <attr path="/api/package[@name='androidx.core.internal.view']" name="managedName">AndroidX.Core.Internal.View</attr>
-    <attr path="/api/package[@name='androidx.core.math']" name="managedName">AndroidX.Core.Math</attr>
-    <attr path="/api/package[@name='androidx.core.net']" name="managedName">AndroidX.Core.Net</attr>
-    <attr path="/api/package[@name='androidx.core.os']" name="managedName">AndroidX.Core.OS</attr>
-    <attr path="/api/package[@name='androidx.core.provider']" name="managedName">AndroidX.Core.Provider</attr>
-    <attr path="/api/package[@name='androidx.core.text']" name="managedName">AndroidX.Core.Text</attr>
-    <attr path="/api/package[@name='androidx.core.text.util']" name="managedName">AndroidX.Core.Text.Util</attr>
-    <attr path="/api/package[@name='androidx.core.util']" name="managedName">AndroidX.Core.Util</attr>
-    <attr path="/api/package[@name='androidx.core.view']" name="managedName">AndroidX.Core.View</attr>
-    <attr path="/api/package[@name='androidx.core.view.accessibility']" name="managedName">AndroidX.Core.View.Accessibility</attr>
-    <attr path="/api/package[@name='androidx.core.view.animation']" name="managedName">AndroidX.Core.View.Animation</attr>
-    <attr path="/api/package[@name='androidx.core.view.inputmethod']" name="managedName">AndroidX.Core.View.InputMethod</attr>
-    <attr path="/api/package[@name='androidx.core.widget']" name="managedName">AndroidX.Core.Widget</attr>
-    <attr
-        path="/api/package[@name='androidx.core.telephony.mbms']"
-        name="managedName"
-        >
-        AndroidX.Core.Telephony.Mbms
-    </attr>
-    <attr
-        path="/api/package[@name='androidx.core.location']"
-        name="managedName"
-        >
-        AndroidX.Core.Location
-    </attr>
-    <attr
-        path="/api/package[@name='androidx.core.telephony']"
-        name="managedName"
-        >
-        AndroidX.Core.Telephony
-    </attr>
-    <attr
-        path="/api/package[@name='androidx.core.app.unusedapprestrictions']"
-        name="managedName"
-        >
-        AndroidX.Core.App.UnusedAppRestrictions
-    </attr>
-
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.core/core/Transforms/Metadata.xml b/source/androidx.core/core/Transforms/Metadata.xml
index d2f9927f6..c9b35fc27 100644
--- a/source/androidx.core/core/Transforms/Metadata.xml
+++ b/source/androidx.core/core/Transforms/Metadata.xml
@@ -1,4 +1,7 @@
 <metadata>
+    <!-- Mispelling of "Sqlite", preserved for backwards compatibility -->
+    <attr path="/api/package[@name='androidx.core.database.sqlite']" name="managedName">AndroidX.Core.Database.SqlLite</attr>
+    
     <attr path="/api/package[@name='androidx.core.app']/class[@name='NotificationCompat.Action']/method[@name='getExtras' and count(parameter)=0]" name="visibility">protected</attr>
     <attr path="/api/package[@name='androidx.core.app']/class[@name='NotificationCompat.Action']/method[@name='getRemoteInputs']" name="visibility">protected</attr>
     <attr path="/api/package[@name='androidx.core.app']/class[@name='RemoteInput']/method[@name='getAllowFreeFormInput' and count(parameter)=0]" name="visibility">protected</attr>
diff --git a/source/androidx.cursoradapter/cursoradapter/Transforms/Metadata.Namespaces.xml b/source/androidx.cursoradapter/cursoradapter/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index cc19f0d0b..000000000
--- a/source/androidx.cursoradapter/cursoradapter/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.cursoradapter.widget']" name="managedName">AndroidX.CursorAdapter.Widget</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.customview/customview/Transforms/Metadata.Namespaces.xml b/source/androidx.customview/customview/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index be6e71cf6..000000000
--- a/source/androidx.customview/customview/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.customview.view']" name="managedName">AndroidX.CustomView.View</attr>
-    <attr path="/api/package[@name='androidx.customview.widget']" name="managedName">AndroidX.CustomView.Widget</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.databinding/databinding-adapters/Transforms/Metadata.Namespaces.xml b/source/androidx.databinding/databinding-adapters/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 93276ea9f..000000000
--- a/source/androidx.databinding/databinding-adapters/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<metadata>
-
-    <attr 
-        path="/api/package[@name='androidx.databinding.adapters']"
-        name="managedName"
-        >
-        AndroidX.DataBinding.Adapters
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.databinding.library']"
-        name="managedName"
-        >
-        AndroidX.DataBinding.Library
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.databinding.library.baseAdapters']"
-        name="managedName"
-        >
-        AndroidX.DataBinding.Library.BaseAdapters
-    </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.databinding/databinding-common/Transforms/Metadata.Namespaces.xml b/source/androidx.databinding/databinding-common/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 10571e9de..000000000
--- a/source/androidx.databinding/databinding-common/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<metadata>
-
-    <attr 
-        path="/api/package[@name='androidx.databinding']"
-        name="managedName"
-        >
-        AndroidX.DataBinding
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.databinding/databinding-runtime/Transforms/Metadata.Namespaces.xml b/source/androidx.databinding/databinding-runtime/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 6e314b51a..000000000
--- a/source/androidx.databinding/databinding-runtime/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<metadata>
-
-    <attr 
-        path="/api/package[@name='androidx.databinding']"
-        name="managedName"
-        >
-        AndroidX.DataBinding
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.databinding.library']"
-        name="managedName"
-        >
-        AndroidX.DataBinding.Library
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.databinding/viewbinding/Transforms/Metadata.Namespaces.xml b/source/androidx.databinding/viewbinding/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 85c4a6bed..000000000
--- a/source/androidx.databinding/viewbinding/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.viewbinding']"
-        name="managedName"
-        >
-        AndroidX.ViewBinding
-    </attr>
-    
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.documentfile/documentfile/Transforms/Metadata.Namespaces.xml b/source/androidx.documentfile/documentfile/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 1a7260cf7..000000000
--- a/source/androidx.documentfile/documentfile/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.documentfile.provider']" name="managedName">AndroidX.DocumentFile.Provider</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.drawerlayout/drawerlayout/Transforms/Metadata.Namespaces.xml b/source/androidx.drawerlayout/drawerlayout/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 29beaae18..000000000
--- a/source/androidx.drawerlayout/drawerlayout/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.drawerlayout.widget']" name="managedName">AndroidX.DrawerLayout.Widget</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.dynamicanimation/dynamicanimation/Transforms/Metadata.Namespaces.xml b/source/androidx.dynamicanimation/dynamicanimation/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 7d00c5a38..000000000
--- a/source/androidx.dynamicanimation/dynamicanimation/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.dynamicanimation.animation']" name="managedName">AndroidX.DynamicAnimation.Animation</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.dynamicanimation/dynamicanimation/Transforms/Metadata.xml b/source/androidx.dynamicanimation/dynamicanimation/Transforms/Metadata.xml
index 4f52eaebc..44bfd76be 100644
--- a/source/androidx.dynamicanimation/dynamicanimation/Transforms/Metadata.xml
+++ b/source/androidx.dynamicanimation/dynamicanimation/Transforms/Metadata.xml
@@ -1,6 +1,4 @@
 <metadata>
-    <attr path="/api/package[@name='androidx.dynamicanimation.animation']" name="managedName">AndroidX.DynamicAnimation.Animation</attr>
-    <attr path="/api/package[@name='androidx.dynamicanimation.animation']" name="managedName">AndroidX.DynamicAnimation</attr>
     <remove-node path="/api/package[@name='androidx.dynamicanimation.animation']/class[@name='SpringForce']/implements[@name='androidx.dynamicanimation.animation.Force']" />
     <remove-node path="/api/package[@name='androidx.dynamicanimation.animation']/class[@name='FlingAnimation.DragForce']/implements[@name='androidx.dynamicanimation.animation.Force']" />
     <attr path="/api/package[@name='androidx.dynamicanimation.animation']/interface[@name='DynamicAnimation.OnAnimationEndListener']/method[@name='onAnimationEnd' and count(parameter)=4 and parameter[1][@type='androidx.dynamicanimation.animation.DynamicAnimation'] and parameter[2][@type='boolean'] and parameter[3][@type='float'] and parameter[4][@type='float']]/parameter[1]" name="managedName">animation</attr>
diff --git a/source/androidx.emoji/emoji-appcompat/Transforms/Metadata.Namespaces.xml b/source/androidx.emoji/emoji-appcompat/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 712cb34b1..000000000
--- a/source/androidx.emoji/emoji-appcompat/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.emoji.widget']" name="managedName">AndroidX.Emoji.Widget</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.emoji/emoji-bundled/Transforms/Metadata.Namespaces.xml b/source/androidx.emoji/emoji-bundled/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 2509d1a81..000000000
--- a/source/androidx.emoji/emoji-bundled/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.emoji.bundled']" name="managedName">AndroidX.Emoji.Bundled</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.emoji/emoji/Transforms/Metadata.Namespaces.xml b/source/androidx.emoji/emoji/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index a2f94cd9f..000000000
--- a/source/androidx.emoji/emoji/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.emoji.text']" name="managedName">AndroidX.Emoji.Text</attr>
-    <attr path="/api/package[@name='androidx.emoji.widget']" name="managedName">AndroidX.Emoji.Widget</attr>
-    <attr path="/api/package[@name='androidx.text.emoji.flatbuffer']" name="managedName">AndroidX.Text.Emoji.FlatBuffer</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.emoji2/emoji2-views-helper/Transforms/Metadata.Namespaces.xml b/source/androidx.emoji2/emoji2-views-helper/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 4c5dd965c..000000000
--- a/source/androidx.emoji2/emoji2-views-helper/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<metadata>
-    <attr
-        path="/api/package[@name='androidx.emoji2.viewsintegration']"
-        name="managedName"
-        >
-        AndroidX.Emoji2.ViewsIntegration
-    </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.emoji2/emoji2/Transforms/Metadata.Namespaces.xml b/source/androidx.emoji2/emoji2/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 1508cefa2..000000000
--- a/source/androidx.emoji2/emoji2/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<metadata>
-    <attr
-        path="/api/package[@name='androidx.emoji2.text']"
-        name="managedName"
-        >
-        AndroidX.Emoji2.Text
-    </attr>
-    <attr
-        path="/api/package[@name='androidx.emoji2.text.flatbuffer']"
-        name="managedName"
-        >
-        AndroidX.Emoji2.Text.FlatBuffer
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.exifinterface/exifinterface/Transforms/Metadata.Namespaces.xml b/source/androidx.exifinterface/exifinterface/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 855bec0d7..000000000
--- a/source/androidx.exifinterface/exifinterface/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.exifinterface.media']" name="managedName">AndroidX.ExifInterface.Media</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.fragment/fragment-ktx/Transforms/Metadata.Namespaces.xml b/source/androidx.fragment/fragment-ktx/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 215a10ff9..000000000
--- a/source/androidx.fragment/fragment-ktx/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.fragment']" 
-        name="managedName"
-        >
-        AndroidX.Fragment
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.fragment.app']" 
-        name="managedName"
-        >
-        AndroidX.Fragment.App
-    </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.fragment/fragment/Transforms/Metadata.Namespaces.xml b/source/androidx.fragment/fragment/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 615d92940..000000000
--- a/source/androidx.fragment/fragment/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.fragment.app']" name="managedName">AndroidX.Fragment.App</attr>
-
-    <attr 
-        path="/api/package[@name='androidx.fragment.app.strictmode']"
-        name="managedName"
-        >
-        AndroidX.Fragment.App.StrictMode
-    </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.gridlayout/gridlayout/Transforms/Metadata.Namespaces.xml b/source/androidx.gridlayout/gridlayout/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 14915faec..000000000
--- a/source/androidx.gridlayout/gridlayout/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.gridlayout.widget']" name="managedName">AndroidX.GridLayout.Widget</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.heifwriter/heifwriter/Transforms/Metadata.Namespaces.xml b/source/androidx.heifwriter/heifwriter/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 26f754add..000000000
--- a/source/androidx.heifwriter/heifwriter/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.heifwriter']" name="managedName">AndroidX.Heifwriter</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.interpolator/interpolator/Transforms/Metadata.Namespaces.xml b/source/androidx.interpolator/interpolator/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index d43f7b0c3..000000000
--- a/source/androidx.interpolator/interpolator/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.interpolator.view.animation']" name="managedName">AndroidX.Interpolator.View.Animation</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.leanback/leanback-preference/Transforms/Metadata.Namespaces.xml b/source/androidx.leanback/leanback-preference/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 25d80b85f..000000000
--- a/source/androidx.leanback/leanback-preference/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.leanback.preference']" name="managedName">AndroidX.Leanback.Preference</attr>
-    <attr path="/api/package[@name='androidx.leanback.preference.internal']" name="managedName">AndroidX.Leanback.Preference.Internal</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.leanback/leanback/Transforms/Metadata.Namespaces.xml b/source/androidx.leanback/leanback/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index ff6625a0a..000000000
--- a/source/androidx.leanback/leanback/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.leanback.animation']" name="managedName">AndroidX.Leanback.Animation</attr>
-    <attr path="/api/package[@name='androidx.leanback.app']" name="managedName">AndroidX.Leanback.App</attr>
-    <attr path="/api/package[@name='androidx.leanback.database']" name="managedName">AndroidX.Leanback.Database</attr>
-    <attr path="/api/package[@name='androidx.leanback.graphics']" name="managedName">AndroidX.Leanback.Graphics</attr>
-    <attr path="/api/package[@name='androidx.leanback.media']" name="managedName">AndroidX.Leanback.Media</attr>
-    <attr path="/api/package[@name='androidx.leanback.system']" name="managedName">AndroidX.Leanback.System</attr>
-    <attr path="/api/package[@name='androidx.leanback.transition']" name="managedName">AndroidX.Leanback.Transition</attr>
-    <attr path="/api/package[@name='androidx.leanback.util']" name="managedName">AndroidX.Leanback.Util</attr>
-    <attr path="/api/package[@name='androidx.leanback.widget']" name="managedName">AndroidX.Leanback.Widget</attr>
-    <attr path="/api/package[@name='androidx.leanback.widget.picker']" name="managedName">AndroidX.Leanback.Widget.Picker</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.leanback/leanback/Transforms/Metadata.xml b/source/androidx.leanback/leanback/Transforms/Metadata.xml
index d65b28ec3..6b853ca04 100644
--- a/source/androidx.leanback/leanback/Transforms/Metadata.xml
+++ b/source/androidx.leanback/leanback/Transforms/Metadata.xml
@@ -185,16 +185,6 @@
     <!--
     mc++ AndroidX
     -->
-    <attr path="/api/package[@name='androidx.leanback.animation']" name="managedName">AndroidX.Leanback.Animation</attr>
-    <attr path="/api/package[@name='androidx.leanback.app']" name="managedName">AndroidX.Leanback.App</attr>
-    <attr path="/api/package[@name='androidx.leanback.database']" name="managedName">AndroidX.Leanback.Database</attr>
-    <attr path="/api/package[@name='androidx.leanback.graphics']" name="managedName">AndroidX.Leanback.Graphics</attr>
-    <attr path="/api/package[@name='androidx.leanback.media']" name="managedName">AndroidX.Leanback.Media</attr>
-    <attr path="/api/package[@name='androidx.leanback.system']" name="managedName">AndroidX.Leanback.System</attr>
-    <attr path="/api/package[@name='androidx.leanback.transition']" name="managedName">AndroidX.Leanback.Transition</attr>
-    <attr path="/api/package[@name='androidx.leanback.util']" name="managedName">AndroidX.Leanback.Util</attr>
-    <attr path="/api/package[@name='androidx.leanback.widget']" name="managedName">AndroidX.Leanback.Widget</attr>
-    <attr path="/api/package[@name='androidx.leanback.widget.picker']" name="managedName">AndroidX.Leanback.Widget.Picker</attr>
     <attr path="/api/package[@name='androidx.leanback.widget']/class[@name='DiffCallback']/method[@name='areItemsTheSame' and count(parameter)=2 and parameter[1][@type='Value'] and parameter[2][@type='Value']]/parameter[1]" name="managedType">Java.Lang.Object</attr>
     <attr path="/api/package[@name='androidx.leanback.widget']/class[@name='DiffCallback']/method[@name='areItemsTheSame' and count(parameter)=2 and parameter[1][@type='Value'] and parameter[2][@type='Value']]/parameter[2]" name="managedType">Java.Lang.Object</attr>
     <attr path="/api/package[@name='androidx.leanback.widget']/class[@name='DiffCallback']/method[@name='areContentsTheSame' and count(parameter)=2 and parameter[1][@type='Value'] and parameter[2][@type='Value']]/parameter[1]" name="managedType">Java.Lang.Object</attr>
diff --git a/source/androidx.legacy/legacy-preference-v14/Transforms/Metadata.Namespaces.xml b/source/androidx.legacy/legacy-preference-v14/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index da0b35faf..000000000
--- a/source/androidx.legacy/legacy-preference-v14/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.legacy/legacy-preference-v14/Transforms/Metadata.xml b/source/androidx.legacy/legacy-preference-v14/Transforms/Metadata.xml
index afc073ceb..6b1a9865a 100644
--- a/source/androidx.legacy/legacy-preference-v14/Transforms/Metadata.xml
+++ b/source/androidx.legacy/legacy-preference-v14/Transforms/Metadata.xml
@@ -1,5 +1,4 @@
 <metadata>
-    <attr path="/api/package[@name='androidx.preference']" name="managedName">AndroidX.Preference</attr>
     <attr path="/api/package[@name='androidx.preference']/class[@name='MultiSelectListPreference']/method[@name='getValues' and count(parameter)=0]" name="propertyName"></attr>
     <!--
 	<remove-node path="/api/package[@name='androidx.preference']/class[@name='MultiSelectListPreference']/method[@name='getValues' and count(parameter)=0]" />
diff --git a/source/androidx.legacy/legacy-support-core-ui/Transforms/Metadata.Namespaces.xml b/source/androidx.legacy/legacy-support-core-ui/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 08e9c1295..000000000
--- a/source/androidx.legacy/legacy-support-core-ui/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.legacy.app']" name="managedName">AndroidX.Legacy.App</attr>
-    <attr path="/api/package[@name='androidx.legacy.widget']" name="managedName">AndroidX.Legacy.Widget</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.legacy/legacy-support-core-utils/Transforms/Metadata.Namespaces.xml b/source/androidx.legacy/legacy-support-core-utils/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 9ddde10ff..000000000
--- a/source/androidx.legacy/legacy-support-core-utils/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.legacy.content']" name="managedName">AndroidX.Legacy.Content</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.legacy/legacy-support-v13/Transforms/Metadata.Namespaces.xml b/source/androidx.legacy/legacy-support-v13/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 3aa803bca..000000000
--- a/source/androidx.legacy/legacy-support-v13/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.legacy.app']" name="managedName">AndroidX.Legacy.App</attr>
-    <attr path="/api/package[@name='androidx.legacy.view']" name="managedName">AndroidX.Legacy.View</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.legacy/legacy-support-v4/Transforms/Metadata.Namespaces.xml b/source/androidx.legacy/legacy-support-v4/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index da0b35faf..000000000
--- a/source/androidx.legacy/legacy-support-v4/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.lifecycle/lifecycle-common-java8/Transforms/Metadata.Namespaces.xml b/source/androidx.lifecycle/lifecycle-common-java8/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index da0b35faf..000000000
--- a/source/androidx.lifecycle/lifecycle-common-java8/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.lifecycle/lifecycle-common/Transforms/Metadata.Namespaces.xml b/source/androidx.lifecycle/lifecycle-common/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 1397ca20c..000000000
--- a/source/androidx.lifecycle/lifecycle-common/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.lifecycle']" name="managedName">AndroidX.Lifecycle</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.lifecycle/lifecycle-extensions/Transforms/Metadata.Namespaces.xml b/source/androidx.lifecycle/lifecycle-extensions/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 1397ca20c..000000000
--- a/source/androidx.lifecycle/lifecycle-extensions/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.lifecycle']" name="managedName">AndroidX.Lifecycle</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.lifecycle/lifecycle-livedata-core-ktx/Transforms/Metadata.Namespaces.xml b/source/androidx.lifecycle/lifecycle-livedata-core-ktx/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index dc21c4463..000000000
--- a/source/androidx.lifecycle/lifecycle-livedata-core-ktx/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.lifecycle']" 
-        name="managedName"
-        >
-        AndroidX.Lifecycle
-    </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.lifecycle/lifecycle-livedata-core/Transforms/Metadata.Namespaces.xml b/source/androidx.lifecycle/lifecycle-livedata-core/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 1397ca20c..000000000
--- a/source/androidx.lifecycle/lifecycle-livedata-core/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.lifecycle']" name="managedName">AndroidX.Lifecycle</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.lifecycle/lifecycle-livedata-ktx/Transforms/Metadata.Namespaces.xml b/source/androidx.lifecycle/lifecycle-livedata-ktx/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index dc21c4463..000000000
--- a/source/androidx.lifecycle/lifecycle-livedata-ktx/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.lifecycle']" 
-        name="managedName"
-        >
-        AndroidX.Lifecycle
-    </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.lifecycle/lifecycle-livedata/Transforms/Metadata.Namespaces.xml b/source/androidx.lifecycle/lifecycle-livedata/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 1397ca20c..000000000
--- a/source/androidx.lifecycle/lifecycle-livedata/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.lifecycle']" name="managedName">AndroidX.Lifecycle</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.lifecycle/lifecycle-process/Transforms/Metadata.Namespaces.xml b/source/androidx.lifecycle/lifecycle-process/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 1397ca20c..000000000
--- a/source/androidx.lifecycle/lifecycle-process/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.lifecycle']" name="managedName">AndroidX.Lifecycle</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.lifecycle/lifecycle-reactivestreams-ktx/Transforms/Metadata.Namespaces.xml b/source/androidx.lifecycle/lifecycle-reactivestreams-ktx/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index dc21c4463..000000000
--- a/source/androidx.lifecycle/lifecycle-reactivestreams-ktx/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.lifecycle']" 
-        name="managedName"
-        >
-        AndroidX.Lifecycle
-    </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.lifecycle/lifecycle-reactivestreams/Transforms/Metadata.Namespaces.xml b/source/androidx.lifecycle/lifecycle-reactivestreams/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index dc21c4463..000000000
--- a/source/androidx.lifecycle/lifecycle-reactivestreams/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.lifecycle']" 
-        name="managedName"
-        >
-        AndroidX.Lifecycle
-    </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.lifecycle/lifecycle-runtime-ktx/Transforms/Metadata.Namespaces.xml b/source/androidx.lifecycle/lifecycle-runtime-ktx/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index dc21c4463..000000000
--- a/source/androidx.lifecycle/lifecycle-runtime-ktx/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.lifecycle']" 
-        name="managedName"
-        >
-        AndroidX.Lifecycle
-    </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.lifecycle/lifecycle-runtime/Transforms/Metadata.Namespaces.xml b/source/androidx.lifecycle/lifecycle-runtime/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 1397ca20c..000000000
--- a/source/androidx.lifecycle/lifecycle-runtime/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.lifecycle']" name="managedName">AndroidX.Lifecycle</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.lifecycle/lifecycle-service/Transforms/Metadata.Namespaces.xml b/source/androidx.lifecycle/lifecycle-service/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 1397ca20c..000000000
--- a/source/androidx.lifecycle/lifecycle-service/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.lifecycle']" name="managedName">AndroidX.Lifecycle</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.lifecycle/lifecycle-viewmodel-ktx/Transforms/Metadata.Namespaces.xml b/source/androidx.lifecycle/lifecycle-viewmodel-ktx/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index dc21c4463..000000000
--- a/source/androidx.lifecycle/lifecycle-viewmodel-ktx/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.lifecycle']" 
-        name="managedName"
-        >
-        AndroidX.Lifecycle
-    </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.lifecycle/lifecycle-viewmodel-savedstate/Transforms/Metadata.Namespaces.xml b/source/androidx.lifecycle/lifecycle-viewmodel-savedstate/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 97abb821a..000000000
--- a/source/androidx.lifecycle/lifecycle-viewmodel-savedstate/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.lifecycle']" 
-        name="managedName"
-        >
-        AndroidX.Lifecycle
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.lifecycle/lifecycle-viewmodel/Transforms/Metadata.Namespaces.xml b/source/androidx.lifecycle/lifecycle-viewmodel/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 1397ca20c..000000000
--- a/source/androidx.lifecycle/lifecycle-viewmodel/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.lifecycle']" name="managedName">AndroidX.Lifecycle</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.loader/loader/Transforms/Metadata.Namespaces.xml b/source/androidx.loader/loader/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index d9175446a..000000000
--- a/source/androidx.loader/loader/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.loader.app']" name="managedName">AndroidX.Loader.App</attr>
-    <attr path="/api/package[@name='androidx.loader.content']" name="managedName">AndroidX.Loader.Content</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.localbroadcastmanager/localbroadcastmanager/Transforms/Metadata.Namespaces.xml b/source/androidx.localbroadcastmanager/localbroadcastmanager/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 3c27355bb..000000000
--- a/source/androidx.localbroadcastmanager/localbroadcastmanager/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.localbroadcastmanager.content']" name="managedName">AndroidX.LocalBroadcastManager.Content</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.media/media/Transforms/Metadata.Namespaces.xml b/source/androidx.media/media/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 658fc38f5..000000000
--- a/source/androidx.media/media/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<metadata>
-    <!-- That's right, still has support here :( -->
-    <attr path="/api/package[@name='android.support.v4.media']" name="managedName">Android.Support.V4.Media</attr>
-    <attr path="/api/package[@name='android.support.v4.media.session']" name="managedName">Android.Support.V4.Media.Session</attr>
-    <attr path="/api/package[@name='androidx.media']" name="managedName">AndroidX.Media</attr>
-    <attr path="/api/package[@name='androidx.media.app']" name="managedName">AndroidX.Media.App</attr>
-    <attr path="/api/package[@name='androidx.media.session']" name="managedName">AndroidX.Media.Session</attr>
-    <attr path="/api/package[@name='androidx.media.utils']" name="managedName">AndroidX.Media.Utils</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.media2/media2-common/Transforms/Metadata.Namespaces.xml b/source/androidx.media2/media2-common/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 7f1f197ef..000000000
--- a/source/androidx.media2/media2-common/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.media2.common']" 
-        name="managedName"
-        >
-        AndroidX.Media2.Common
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.common.futures']" 
-        name="managedName"
-        >
-        AndroidX.Media2.Common.Futures
-    </attr>
-    
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.media2/media2-exoplayer/Transforms/Metadata.Namespaces.xml b/source/androidx.media2/media2-exoplayer/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 1b57675c0..000000000
--- a/source/androidx.media2/media2-exoplayer/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,267 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.analytics']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Analytics
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.audio']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Audio
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.decoder']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Decoder
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.drm']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Drm
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.extractor']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Extractor
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.extractor.amr']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Extractor.Amr
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.extractor.flv']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Extractor.Flv
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.extractor.mkv']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Extractor.Mkv
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.extractor.mp3']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Extractor.Mp3
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.extractor.mp4']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Extractor.Mp4
-    </attr>
-    
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.extractor.ogg']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Extractor.Ogg
-    </attr>
-    
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.extractor.rawcc']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Extractor.Rawcc
-    </attr>
-    
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.extractor.ts']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Extractor.Ts
-    </attr>    
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.extractor.wav']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Extractor.Wav
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.mediacodec']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.MediaCodec
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.metadata']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.MetaData
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.metadata.emsg']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.MetaData.Emsg
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.metadata.icy']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.MetaData.Icy
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.metadata.id3']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.MetaData.Id3
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.metadata.scte35']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.MetaData.Scte35
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.offline']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Offline
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.source']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Source
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.source.ads']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Source.Ads
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.source.chunk']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Source.Chunk
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.source.hls']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Source.Hls
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.source.hls.playlist']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Source.Hls.PlayList
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.text']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Text
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.text.cea']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Text.Cea
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.text.dvb']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Text.Dvb
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.text.pgs']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Text.Pgs
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.text.ssa']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Text.Ssa
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.text.subrip']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Text.SubRip
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.text.ttml']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Text.Ttml
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.text.tx3g']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Text.Tx3g
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.text.webvtt']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Text.WebVtt
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.trackselection']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.TrackSelection
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.upstream']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.UpStream
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.upstream.crypto']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.UpStream.Crypto
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.util']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Util
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.video']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Video
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.exoplayer.external.video.spherical']" 
-        name="managedName"
-        >
-        AndroidX.Media2.ExoPlayer.External.Video.Spherical
-    </attr>
-    
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.media2/media2-player/Transforms/Metadata.Namespaces.xml b/source/androidx.media2/media2-player/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index c4c118812..000000000
--- a/source/androidx.media2/media2-player/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.media2.player']"
-        name="managedName"
-        >
-        AndroidX.Media2.Player
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.player.common']" 
-        name="managedName"
-        >
-        AndroidX.Media2.Player.Common
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.player.exoplayer']" 
-        name="managedName"
-        >
-        AndroidX.Media2.Player.ExoPlayer
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.player.futures']" 
-        name="managedName"
-        >
-        AndroidX.Media2.Player.Futures
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.media2.player.subtitle']" 
-        name="managedName"
-        >
-        AndroidX.Media2.Player.Subtitle
-    </attr>
-    
-        
-        
-        
-
-
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.media2/media2-session/Transforms/Metadata.Namespaces.xml b/source/androidx.media2/media2-session/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 3912f835f..000000000
--- a/source/androidx.media2/media2-session/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.media2.session']" 
-        name="managedName"
-        >
-        AndroidX.Media2.Session
-        </attr>
-    
-    <attr 
-        path="/api/package[@name='androidx.media2.session.futures']" 
-        name="managedName"
-        >
-        AndroidX.Media2.Session.Futures
-        </attr>
-    
-    
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.media2/media2-widget/Transforms/Metadata.Namespaces.xml b/source/androidx.media2/media2-widget/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index d2a5011f3..000000000
--- a/source/androidx.media2/media2-widget/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.media2.widget']" 
-        name="managedName"
-        >
-        AndroidX.Media2.Widget
-        </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.mediarouter/mediarouter/Transforms/Metadata.Namespaces.xml b/source/androidx.mediarouter/mediarouter/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index bbe0b4893..000000000
--- a/source/androidx.mediarouter/mediarouter/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.mediarouter.app']" name="managedName">AndroidX.MediaRouter.App</attr>
-    <attr path="/api/package[@name='androidx.mediarouter.media']" name="managedName">AndroidX.MediaRouter.Media</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.multidex/multidex/Transforms/Metadata.Namespaces.xml b/source/androidx.multidex/multidex/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 20b694022..000000000
--- a/source/androidx.multidex/multidex/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1 +0,0 @@
-<metadata></metadata>
\ No newline at end of file
diff --git a/source/androidx.navigation/navigation-common-ktx/Transforms/Metadata.Namespaces.xml b/source/androidx.navigation/navigation-common-ktx/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 0aed37363..000000000
--- a/source/androidx.navigation/navigation-common-ktx/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.navigation']"
-        name="managedName"
-        >
-        AndroidX.Navigation
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.navigation/navigation-common/Transforms/Metadata.Namespaces.xml b/source/androidx.navigation/navigation-common/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 668ffbeee..000000000
--- a/source/androidx.navigation/navigation-common/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.navigation']" 
-        name="managedName"
-        >
-        AndroidX.Navigation
-        </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.navigation/navigation-fragment-ktx/Transforms/Metadata.Namespaces.xml b/source/androidx.navigation/navigation-fragment-ktx/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index bd5e9070b..000000000
--- a/source/androidx.navigation/navigation-fragment-ktx/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.navigation']"
-        name="managedName"
-        >
-        AndroidX.Navigation
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.navigation.fragment']"
-        name="managedName"
-        >
-        AndroidX.Navigation.Fragment
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.navigation/navigation-fragment/Transforms/Metadata.Namespaces.xml b/source/androidx.navigation/navigation-fragment/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index ce7dab1fa..000000000
--- a/source/androidx.navigation/navigation-fragment/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.navigation.fragment']"
-        name="managedName"
-        >
-        AndroidX.Navigation.Fragment
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.navigation']"
-        name="managedName"
-        >
-        AndroidX.Navigation
-    </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.navigation/navigation-runtime-ktx/Transforms/Metadata.Namespaces.xml b/source/androidx.navigation/navigation-runtime-ktx/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 0aed37363..000000000
--- a/source/androidx.navigation/navigation-runtime-ktx/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.navigation']"
-        name="managedName"
-        >
-        AndroidX.Navigation
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.navigation/navigation-runtime/Transforms/Metadata.Namespaces.xml b/source/androidx.navigation/navigation-runtime/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 6db7dafc2..000000000
--- a/source/androidx.navigation/navigation-runtime/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.navigation']" 
-        name="managedName"
-        >
-        AndroidX.Navigation
-    </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.navigation/navigation-ui-ktx/Transforms/Metadata.Namespaces.xml b/source/androidx.navigation/navigation-ui-ktx/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 82a53be36..000000000
--- a/source/androidx.navigation/navigation-ui-ktx/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<metadata>
-
-    <attr 
-        path="/api/package[@name='androidx.navigation.ui']" 
-        name="managedName"
-        >
-        AndroidX.Navigation.UI
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.navigation/navigation-ui/Transforms/Metadata.Namespaces.xml b/source/androidx.navigation/navigation-ui/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 23f638f80..000000000
--- a/source/androidx.navigation/navigation-ui/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.navigation.ui']"
-        name="managedName"
-        >
-        AndroidX.Navigation.UI
-    </attr>
-    
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.paging/paging-common-ktx/Transforms/Metadata.Namespaces.xml b/source/androidx.paging/paging-common-ktx/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 63c6f4c66..000000000
--- a/source/androidx.paging/paging-common-ktx/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.paging']" 
-        name="managedName"
-        >
-        AndroidX.Paging
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.paging/paging-common/Transforms/Metadata.Namespaces.xml b/source/androidx.paging/paging-common/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 154b18f57..000000000
--- a/source/androidx.paging/paging-common/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.paging']" 
-        name="managedName"
-        >
-        AndroidX.Paging
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.paging.multicast']" 
-        name="managedName"
-        >
-        AndroidX.Paging.MultiCast
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.paging/paging-runtime-ktx/Transforms/Metadata.Namespaces.xml b/source/androidx.paging/paging-runtime-ktx/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index a87d60cd8..000000000
--- a/source/androidx.paging/paging-runtime-ktx/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.paging']" 
-        name="managedName"
-        >
-        AndroidX.Paging
-    </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.paging/paging-runtime/Transforms/Metadata.Namespaces.xml b/source/androidx.paging/paging-runtime/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index ad0d41522..000000000
--- a/source/androidx.paging/paging-runtime/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.paging']" 
-        name="managedName"
-        >
-        AndroidX.Paging
-    </attr>
-    
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.paging/paging-rxjava2-ktx/Transforms/Metadata.Namespaces.xml b/source/androidx.paging/paging-rxjava2-ktx/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index cbf86ea73..000000000
--- a/source/androidx.paging/paging-rxjava2-ktx/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.paging']" 
-        name="managedName"
-        >
-        AndroidX.Paging
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.paging.rxjava2']" 
-        name="managedName"
-        >
-        AndroidX.Paging.RxJava2
-    </attr>
-    
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.paging/paging-rxjava2/Transforms/Metadata.Namespaces.xml b/source/androidx.paging/paging-rxjava2/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index cbf86ea73..000000000
--- a/source/androidx.paging/paging-rxjava2/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.paging']" 
-        name="managedName"
-        >
-        AndroidX.Paging
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.paging.rxjava2']" 
-        name="managedName"
-        >
-        AndroidX.Paging.RxJava2
-    </attr>
-    
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.palette/palette-ktx/Transforms/Metadata.Namespaces.xml b/source/androidx.palette/palette-ktx/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 0eeaaf1b0..000000000
--- a/source/androidx.palette/palette-ktx/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.palette.graphics']" 
-        name="managedName"
-        >
-        AndroidX.Palette.Graphics
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.palette/palette/Transforms/Metadata.Namespaces.xml b/source/androidx.palette/palette/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index f0089424f..000000000
--- a/source/androidx.palette/palette/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.palette.graphics']" name="managedName">AndroidX.Palette.Graphics</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.percentlayout/percentlayout/Transforms/Metadata.Namespaces.xml b/source/androidx.percentlayout/percentlayout/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 37a575b8a..000000000
--- a/source/androidx.percentlayout/percentlayout/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.percentlayout.widget']" name="managedName">AndroidX.PercentLayout.Widget</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.preference/preference-ktx/Transforms/Metadata.Namespaces.xml b/source/androidx.preference/preference-ktx/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index e085e4d16..000000000
--- a/source/androidx.preference/preference-ktx/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.preference']" 
-        name="managedName">
-        AndroidX.Preference
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.preference.internal']" 
-        name="managedName">
-        AndroidX.Preference.Internal
-    </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.preference/preference/Transforms/Metadata.Namespaces.xml b/source/androidx.preference/preference/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 05e8aa545..000000000
--- a/source/androidx.preference/preference/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.preference']" name="managedName">AndroidX.Preference</attr>
-    <attr path="/api/package[@name='androidx.preference.internal']" name="managedName">AndroidX.Preference.Internal</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.preference/preference/Transforms/Metadata.xml b/source/androidx.preference/preference/Transforms/Metadata.xml
index ad9777edc..7c435e932 100644
--- a/source/androidx.preference/preference/Transforms/Metadata.xml
+++ b/source/androidx.preference/preference/Transforms/Metadata.xml
@@ -1,6 +1,4 @@
 <metadata>
-    <attr path="/api/package[@name='androidx.preference']" name="managedName">AndroidX.Preference</attr>
-    <attr path="/api/package[@name='androidx.preference.internal']" name="managedName">AndroidX.Preference.Internal</attr>
     <remove-node path="/api/package[@name='androidx.preference']/interface[@name='Preference.OnPreferenceChangeInternalListener']" />
     <attr path="/api/package[@name='androidx.preference']/class[@name='Preference']/method[@name='compareTo']/parameter[1]" name="managedType">Java.Lang.Object</attr>
     <!-- Fix generics -->
diff --git a/source/androidx.print/print/Transforms/Metadata.Namespaces.xml b/source/androidx.print/print/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index fd8046a80..000000000
--- a/source/androidx.print/print/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.print']" name="managedName">AndroidX.Print</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.profileinstaller/profileinstaller/Transforms/Metadata.Namespaces.xml b/source/androidx.profileinstaller/profileinstaller/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index df04441a6..000000000
--- a/source/androidx.profileinstaller/profileinstaller/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<metadata>
-    <!--
-    ProfileInstallers class exists!
-    -->
-    <attr 
-        path="/api/package[@name='androidx.profileinstaller']" 
-        name="managedName"
-        >
-        AndroidX.ProfileInstallers
-    </attr>    
-    
-    
-    
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.recommendation/recommendation/Transforms/Metadata.Namespaces.xml b/source/androidx.recommendation/recommendation/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 3d2997ed2..000000000
--- a/source/androidx.recommendation/recommendation/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.recommendation.app']" name="managedName">AndroidX.Recommendation.App</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.recyclerview/recyclerview-selection/Transforms/Metadata.Namespaces.xml b/source/androidx.recyclerview/recyclerview-selection/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index e3aad680c..000000000
--- a/source/androidx.recyclerview/recyclerview-selection/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.recyclerview.selection']" name="managedName">AndroidX.RecyclerView.Selection</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.recyclerview/recyclerview-selection/Transforms/Metadata.xml b/source/androidx.recyclerview/recyclerview-selection/Transforms/Metadata.xml
index 9b0ef00ea..a520076f7 100644
--- a/source/androidx.recyclerview/recyclerview-selection/Transforms/Metadata.xml
+++ b/source/androidx.recyclerview/recyclerview-selection/Transforms/Metadata.xml
@@ -1,5 +1,4 @@
 <metadata>
-    <attr path="/api/package[@name='androidx.recyclerview.selection']" name="managedName">AndroidX.RecyclerView.Selection</attr>
     <attr path="/api/package[@name='androidx.recyclerview.selection']/class[@name='StableIdKeyProvider']/method[@name='getPosition' and count(parameter)=1 and parameter[1][@type='java.lang.Long']]/parameter[1]" name="managedType">Java.Lang.Object</attr>
     <attr path="/api/package[@name='androidx.recyclerview.selection']/class[@name='StableIdKeyProvider']/method[@name='getKey' and count(parameter)=1 and parameter[1][@type='int']]" name="managedReturn">Java.Lang.Object</attr>
     <remove-node path="/api/package[@name='androidx.recyclerview.selection']/class[@name='DefaultSelectionTracker']/method[@name='getSelection' and count(parameter)=0]" />
diff --git a/source/androidx.recyclerview/recyclerview/Transforms/Metadata.Namespaces.xml b/source/androidx.recyclerview/recyclerview/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 1c9ff3d05..000000000
--- a/source/androidx.recyclerview/recyclerview/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.recyclerview.widget']" name="managedName">AndroidX.RecyclerView.Widget</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.resourceinspection/resourceinspection-annotation/Transforms/Metadata.Namespaces.xml b/source/androidx.resourceinspection/resourceinspection-annotation/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index cceb61026..000000000
--- a/source/androidx.resourceinspection/resourceinspection-annotation/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<metadata>
-    <attr
-        path="/api/package[@name='androidx.resourceinspection.annotation']"
-        name="managedName"
-        >
-        AndroidX.ResourceInspection.Annotation
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.room/room-common/Transforms/Metadata.xml b/source/androidx.room/room-common/Transforms/Metadata.xml
index 05c090c01..f5da9828b 100644
--- a/source/androidx.room/room-common/Transforms/Metadata.xml
+++ b/source/androidx.room/room-common/Transforms/Metadata.xml
@@ -1,3 +1,2 @@
 <metadata>
-    <attr path="/api/package[@name='androidx.room']" name="managedName">AndroidX.Room</attr>
 </metadata>
\ No newline at end of file
diff --git a/source/androidx.room/room-guava/Transforms/Metadata.Namespaces.xml b/source/androidx.room/room-guava/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 9df4afd39..000000000
--- a/source/androidx.room/room-guava/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.room.guava']" 
-        name="managedName"
-        >
-        AndroidX.Room.Guava
-        </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.room/room-ktx/Transforms/Metadata.Namespaces.xml b/source/androidx.room/room-ktx/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 234265d4a..000000000
--- a/source/androidx.room/room-ktx/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.room']" 
-        name="managedName"
-        >
-        AndroidX.Room
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.room.migration']" 
-        name="managedName"
-        >
-        AndroidX.Room.Migration
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.room/room-runtime/Transforms/Metadata.xml b/source/androidx.room/room-runtime/Transforms/Metadata.xml
index ed967bda9..be00c2722 100644
--- a/source/androidx.room/room-runtime/Transforms/Metadata.xml
+++ b/source/androidx.room/room-runtime/Transforms/Metadata.xml
@@ -1,9 +1,4 @@
 <metadata>
-    <attr path="/api/package[@name='androidx.room']" name="managedName">AndroidX.Room</attr>
-    <attr path="/api/package[@name='androidx.room.migration']" name="managedName">AndroidX.Room.Migration</attr>
-    <attr path="/api/package[@name='androidx.room.paging']" name="managedName">AndroidX.Room.Paging</attr>
-    <attr path="/api/package[@name='androidx.room.util']" name="managedName">AndroidX.Room.Util</attr>
-
     <remove-node path="/api/package[@name='androidx.room']/class[@name='EntityDeletionOrUpdateAdapter']/method[@name='createQuery' and count(parameter)=0]" />
 
     <remove-node path="/api/package[@name='androidx.room.util']/class[@name='TableInfo.ForeignKeyWithSequence']/implements" />
diff --git a/source/androidx.room/room-rxjava2/Transforms/Metadata.Namespaces.xml b/source/androidx.room/room-rxjava2/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 5104c9343..000000000
--- a/source/androidx.room/room-rxjava2/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.room']" 
-        name="managedName"
-        >
-        AndroidX.Room
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.room/room-rxjava3/Transforms/Metadata.Namespaces.xml b/source/androidx.room/room-rxjava3/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 1a32f3081..000000000
--- a/source/androidx.room/room-rxjava3/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.room.rxjava3']" 
-        name="managedName"
-        >
-        AndroidX.Room.RxJava3
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.savedstate/savedstate-ktx/Transforms/Metadata.Namespaces.xml b/source/androidx.savedstate/savedstate-ktx/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index e89548f7a..000000000
--- a/source/androidx.savedstate/savedstate-ktx/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.savedstate']" 
-        name="managedName"
-        >
-        AndroidX.SavedState
-    </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.savedstate/savedstate/Transforms/Metadata.Namespaces.xml b/source/androidx.savedstate/savedstate/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 49dc65324..000000000
--- a/source/androidx.savedstate/savedstate/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.savedstate']"
-        name="managedName"
-        >
-        AndroidX.SavedState
-        </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.security/security-crypto/Transforms/Metadata.Namespaces.xml b/source/androidx.security/security-crypto/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 230ebcadd..000000000
--- a/source/androidx.security/security-crypto/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<metadata>
-
-    <attr 
-        path="/api/package[@name='androidx.security.crypto']"
-        name="managedName"
-        >
-        AndroidX.Security.Crypto
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.slice/slice-builders/Transforms/Metadata.Namespaces.xml b/source/androidx.slice/slice-builders/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 8b79b2bf8..000000000
--- a/source/androidx.slice/slice-builders/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.slice.builders']" name="managedName">AndroidX.Slice.Builders</attr>
-    <attr path="/api/package[@name='androidx.slice.builders.impl']" name="managedName">AndroidX.Slice.Builders.Impl</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.slice/slice-builders/Transforms/Metadata.xml b/source/androidx.slice/slice-builders/Transforms/Metadata.xml
index 6f97d609d..f30bf045c 100644
--- a/source/androidx.slice/slice-builders/Transforms/Metadata.xml
+++ b/source/androidx.slice/slice-builders/Transforms/Metadata.xml
@@ -1,5 +1,4 @@
 <metadata>
-    <attr path="/api/package[@name='androidx.slice.builders']" name="managedName">AndroidX.Slice.Builders</attr>
     <remove-node path="/api/package[@name='androidx.slice.builders.impl']" />
     <attr path="/api/package[@name='androidx.slice.builders']/class[@name='SliceAction']/method[@name='setChecked' and count(parameter)=1 and parameter[1][@type='boolean']]" name="managedReturn">AndroidX.Slice.Core.ISliceAction</attr>
     <attr path="/api/package[@name='androidx.slice.builders']/class[@name='SliceAction']/method[@name='setContentDescription' and count(parameter)=1 and parameter[1][@type='java.lang.CharSequence']]" name="managedReturn">AndroidX.Slice.Core.ISliceAction</attr>
diff --git a/source/androidx.slice/slice-core/Transforms/Metadata.Namespaces.xml b/source/androidx.slice/slice-core/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index efa9d4982..000000000
--- a/source/androidx.slice/slice-core/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.slice']" name="managedName">AndroidX.Slice</attr>
-    <attr path="/api/package[@name='androidx.slice.compat']" name="managedName">AndroidX.Slice.Compat</attr>
-    <attr path="/api/package[@name='androidx.slice.core']" name="managedName">AndroidX.Slice.Core</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.slice/slice-core/Transforms/Metadata.xml b/source/androidx.slice/slice-core/Transforms/Metadata.xml
index efb369dc6..b54598817 100644
--- a/source/androidx.slice/slice-core/Transforms/Metadata.xml
+++ b/source/androidx.slice/slice-core/Transforms/Metadata.xml
@@ -1,7 +1,4 @@
 <metadata>
-    <attr path="/api/package[@name='androidx.slice']" name="managedName">AndroidX.Slice</attr>
-    <attr path="/api/package[@name='androidx.slice.compat']" name="managedName">AndroidX.Slice.Compat</attr>
-    <attr path="/api/package[@name='androidx.slice.core']" name="managedName">AndroidX.Slice.Core</attr>
     <attr path="/api/package[@name='androidx.slice.core']/class[@name='SliceActionImpl']/method[@name='setChecked' and count(parameter)=1 and parameter[1][@type='boolean']]" name="managedReturn">AndroidX.Slice.Core.ISliceAction</attr>
     <attr path="/api/package[@name='androidx.slice.core']/class[@name='SliceActionImpl']/method[@name='setContentDescription' and count(parameter)=1 and parameter[1][@type='java.lang.CharSequence']]" name="managedReturn">AndroidX.Slice.Core.ISliceAction</attr>
     <attr path="/api/package[@name='androidx.slice.core']/class[@name='SliceActionImpl']/method[@name='setPriority' and count(parameter)=1 and parameter[1][@type='int']]" name="managedReturn">AndroidX.Slice.Core.ISliceAction</attr>
diff --git a/source/androidx.slice/slice-view/Transforms/Metadata.Namespaces.xml b/source/androidx.slice/slice-view/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index e5ab70d6d..000000000
--- a/source/androidx.slice/slice-view/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.slice']" name="managedName">AndroidX.Slice</attr>
-    <attr path="/api/package[@name='androidx.slice.widget']" name="managedName">AndroidX.Slice.Widget</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.slidingpanelayout/slidingpanelayout/Transforms/Metadata.Namespaces.xml b/source/androidx.slidingpanelayout/slidingpanelayout/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index b90402612..000000000
--- a/source/androidx.slidingpanelayout/slidingpanelayout/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.slidingpanelayout.widget']" name="managedName">AndroidX.SlidingPaneLayout.Widget</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.sqlite/sqlite-framework/Transforms/Metadata.xml b/source/androidx.sqlite/sqlite-framework/Transforms/Metadata.xml
index 6a02eed64..f5da9828b 100644
--- a/source/androidx.sqlite/sqlite-framework/Transforms/Metadata.xml
+++ b/source/androidx.sqlite/sqlite-framework/Transforms/Metadata.xml
@@ -1,3 +1,2 @@
 <metadata>
-    <attr path="/api/package[@name='androidx.sqlite.db.framework']" name="managedName">AndroidX.Sqlite.Db.Framework</attr>
 </metadata>
\ No newline at end of file
diff --git a/source/androidx.sqlite/sqlite/Transforms/Metadata.xml b/source/androidx.sqlite/sqlite/Transforms/Metadata.xml
index 4478b4554..f5da9828b 100644
--- a/source/androidx.sqlite/sqlite/Transforms/Metadata.xml
+++ b/source/androidx.sqlite/sqlite/Transforms/Metadata.xml
@@ -1,3 +1,2 @@
 <metadata>
-    <attr path="/api/package[@name='androidx.sqlite.db']" name="managedName">AndroidX.Sqlite.Db</attr>
 </metadata>
\ No newline at end of file
diff --git a/source/androidx.startup/startup-runtime/Transforms/Metadata.Namespaces.xml b/source/androidx.startup/startup-runtime/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 0410b7d1e..000000000
--- a/source/androidx.startup/startup-runtime/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.startup']" 
-        name="managedName"
-        >
-        AndroidX.Startup
-    </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.swiperefreshlayout/swiperefreshlayout/Transforms/Metadata.Namespaces.xml b/source/androidx.swiperefreshlayout/swiperefreshlayout/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index b9e34a1ca..000000000
--- a/source/androidx.swiperefreshlayout/swiperefreshlayout/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.swiperefreshlayout.widget']" name="managedName">AndroidX.SwipeRefreshLayout.Widget</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.tracing/tracing/Transforms/Metadata.Namespaces.xml b/source/androidx.tracing/tracing/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 5a6b5d536..000000000
--- a/source/androidx.tracing/tracing/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<metadata>
-
-    <attr 
-        path="/api/package[@name='androidx.tracing']"
-        name="managedName"
-        >
-        AndroidX.Tracing
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.transition/transition/Transforms/Metadata.Namespaces.xml b/source/androidx.transition/transition/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 1ce4b8698..000000000
--- a/source/androidx.transition/transition/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.transition']" name="managedName">AndroidX.Transition</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.transition/transition/Transforms/Metadata.xml b/source/androidx.transition/transition/Transforms/Metadata.xml
index 2d4bbe5cc..c323a7cd3 100644
--- a/source/androidx.transition/transition/Transforms/Metadata.xml
+++ b/source/androidx.transition/transition/Transforms/Metadata.xml
@@ -1,5 +1,4 @@
 <metadata>
-    <attr path="/api/package[@name='androidx.transition']" name="managedName">AndroidX.Transitions</attr>
     <!-- Fix params for some inherited parcelable types -->
     <attr path="/api/*/*/method[@name='createFromParcel']/parameter[@name='p0']" name="managedName">source</attr>
     <attr path="/api/*/*/method[@name='newArray']/parameter[@name='p0']" name="managedName">size</attr>
diff --git a/source/androidx.tvprovider/tvprovider/Transforms/Metadata.Namespaces.xml b/source/androidx.tvprovider/tvprovider/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index ad7baab7d..000000000
--- a/source/androidx.tvprovider/tvprovider/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.tvprovider.media.tv']" name="managedName">AndroidX.TvProvider.Media.Tv</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.vectordrawable/vectordrawable-animated/Transforms/Metadata.Namespaces.xml b/source/androidx.vectordrawable/vectordrawable-animated/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 7d6a777f1..000000000
--- a/source/androidx.vectordrawable/vectordrawable-animated/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.vectordrawable.graphics.drawable']" name="managedName">AndroidX.VectorDrawable.Graphics.Drawable</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.vectordrawable/vectordrawable/Transforms/Metadata.Namespaces.xml b/source/androidx.vectordrawable/vectordrawable/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 7d6a777f1..000000000
--- a/source/androidx.vectordrawable/vectordrawable/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.vectordrawable.graphics.drawable']" name="managedName">AndroidX.VectorDrawable.Graphics.Drawable</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.versionedparcelable/versionedparcelable/Transforms/Metadata.Namespaces.xml b/source/androidx.versionedparcelable/versionedparcelable/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 6124e7252..000000000
--- a/source/androidx.versionedparcelable/versionedparcelable/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.versionedparcelable']" name="managedName">AndroidX.VersionedParcelable</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.viewpager/viewpager/Transforms/Metadata.Namespaces.xml b/source/androidx.viewpager/viewpager/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 3e964c453..000000000
--- a/source/androidx.viewpager/viewpager/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.viewpager.widget']" name="managedName">AndroidX.ViewPager.Widget</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.viewpager2/viewpager2/Transforms/Metadata.Namespaces.xml b/source/androidx.viewpager2/viewpager2/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 69b335d3a..000000000
--- a/source/androidx.viewpager2/viewpager2/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr 
-        path="/api/package[@name='androidx.viewpager2.adapter']" 
-        name="managedName"
-        >
-        AndroidX.ViewPager2.Adapter
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.viewpager2.widget']" 
-        name="managedName"
-        >
-        AndroidX.ViewPager2.Widget
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.wear/wear-input/Transforms/Metadata.Namespaces.xml b/source/androidx.wear/wear-input/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 1f949ac49..000000000
--- a/source/androidx.wear/wear-input/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.wear']"
-        name="managedName"
-        >
-        AndroidX.Wear
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.wear.input']"
-        name="managedName"
-        >
-        AndroidX.Wear.Input
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.wear/wear-ongoing/Transforms/Metadata.Namespaces.xml b/source/androidx.wear/wear-ongoing/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 9b2feb845..000000000
--- a/source/androidx.wear/wear-ongoing/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.wear']"
-        name="managedName"
-        >
-        AndroidX.Wear
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.wear.ongoing']"
-        name="managedName"
-        >
-        AndroidX.Wear.Ongoing
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.wear/wear-phone-interactions/Transforms/Metadata.Namespaces.xml b/source/androidx.wear/wear-phone-interactions/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 5f6355953..000000000
--- a/source/androidx.wear/wear-phone-interactions/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.wear']"
-        name="managedName"
-        >
-        AndroidX.Wear
-    </attr>
-    <attr 
-        path="/api/package[@name='android.support.wearable.authentication']"
-        name="managedName"
-        >
-        Android.Support.Wearable.Authentication
-    </attr>
-    <attr 
-        path="/api/package[@name='android.support.wearable.notifications']"
-        name="managedName"
-        >
-        Android.Support.Wearable.Notifications
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.wear.phone.interactions']"
-        name="managedName"
-        >
-        AndroidX.Wear.Phone.Interactions
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.wear.phone.interactions.authentication']"
-        name="managedName"
-        >
-        AndroidX.Wear.Phone.Interactions.Authentication
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.wear.phone.interactions.notifications']"
-        name="managedName"
-        >
-        AndroidX.Wear.Phone.Interactions.Notifications
-    </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.wear/wear-remote-interactions/Transforms/Metadata.Namespaces.xml b/source/androidx.wear/wear-remote-interactions/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index b3a67ba05..000000000
--- a/source/androidx.wear/wear-remote-interactions/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.wear']"
-        name="managedName"
-        >
-        AndroidX.Wear
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.wear.remote']"
-        name="managedName"
-        >
-        AndroidX.Wear.Remote
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.wear.remote.interactions']"
-        name="managedName"
-        >
-        AndroidX.Wear.Remote.Interactions
-    </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.wear/wear/Transforms/Metadata.Namespaces.xml b/source/androidx.wear/wear/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index ead3a4e43..000000000
--- a/source/androidx.wear/wear/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.wear.activity']" name="managedName">AndroidX.Wear.Activity</attr>
-    <attr path="/api/package[@name='androidx.wear.ambient']" name="managedName">AndroidX.Wear.Ambient</attr>
-    <attr path="/api/package[@name='androidx.wear.internal.widget']" name="managedName">AndroidX.Wear.Internal.Widget</attr>
-    <attr path="/api/package[@name='androidx.wear.internal.widget.drawer']" name="managedName">AndroidX.Wear.Internal.Widget.Drawer</attr>
-    <attr path="/api/package[@name='androidx.wear.utils']" name="managedName">AndroidX.Wear.Utils</attr>
-    <attr path="/api/package[@name='androidx.wear.widget']" name="managedName">AndroidX.Wear.Widget</attr>
-    <attr path="/api/package[@name='androidx.wear.widget.drawer']" name="managedName">AndroidX.Wear.Widget.Drawer</attr>
-
-    <attr 
-        path="/api/package[@name='androidx.wear.provider']"
-        name="managedName"
-        >
-        AndroidX.Wear.Provider
-    </attr>
-
-    <attr 
-        path="/api/package[@name='androidx.wear.wear-ongoing']"
-        name="managedName"
-        >
-        AndroidX.Wear.Ongoing
-    </attr>
-
-    <attr 
-        path="/api/package[@name='androidx.wear.wear-input']"
-        name="managedName"
-        >
-        AndroidX.Wear.Input
-    </attr>
-
-    <attr 
-        path="/api/package[@name='androidx.wear.wear-phone-interactions']"
-        name="managedName"
-        >
-        AndroidX.Wear.PhoneInteractions
-    </attr>
-
-    <attr 
-        path="/api/package[@name='androidx.wear.wear-remote-interactions']"
-        name="managedName"
-        >
-        AndroidX.Wear.RemoteInteractions
-    </attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.webkit/webkit/Transforms/Metadata.Namespaces.xml b/source/androidx.webkit/webkit/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 6734b0536..000000000
--- a/source/androidx.webkit/webkit/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='androidx.webkit']" name="managedName">AndroidX.WebKit</attr>
-    <attr path="/api/package[@name='androidx.webkit.internal']" name="managedName">AndroidX.WebKit.Internal</attr>
-    <attr path="/api/package[@name='org.chromium.support_lib_boundary']" name="managedName">AndroidX.WebKit.ChromiumLibBoundary</attr>
-    <attr path="/api/package[@name='org.chromium.support_lib_boundary.util']" name="managedName">AndroidX.WebKit.ChromiumLibBoundary.Util</attr>
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.window/window-extensions/Transforms/Metadata.Namespaces.xml b/source/androidx.window/window-extensions/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index c159a5296..000000000
--- a/source/androidx.window/window-extensions/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<metadata>
-
-    <attr 
-        path="/api/package[@name='androidx.window.extensions']"
-        name="managedName"
-        >
-        AndroidX.Window.Extensions
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.window/window-java/Transforms/Metadata.Namespaces.xml b/source/androidx.window/window-java/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index fd82e9f88..000000000
--- a/source/androidx.window/window-java/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<metadata>
-
-    <attr 
-        path="/api/package[@name='androidx.window.java.layout']"
-        name="managedName"
-        >
-        AndroidX.Window.Java.Layout
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.window/window/Transforms/Metadata.Namespaces.xml b/source/androidx.window/window/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index ccb3fb71e..000000000
--- a/source/androidx.window/window/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<metadata>
-
-    <attr 
-        path="/api/package[@name='androidx.window']"
-        name="managedName"
-        >
-        AndroidX.Window
-    </attr>
-
-    <attr 
-        path="/api/package[@name='androidx.window.layout']"
-        name="managedName"
-        >
-        AndroidX.Window.Layout
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.window.core']"
-        name="managedName"
-        >
-        AndroidX.Window.Core
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.window.embedding']"
-        name="managedName"
-        >
-        AndroidX.Window.Embedding
-    </attr>
-   
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.work/work-runtime-ktx/Transforms/Metadata.Namespaces.xml b/source/androidx.work/work-runtime-ktx/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index d197a721c..000000000
--- a/source/androidx.work/work-runtime-ktx/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<metadata>
-    <attr 
-        path="/api/package[@name='androidx.work']" 
-        name="managedName"
-        >
-        AndroidX.Work
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/androidx.work/work-runtime/Transforms/Metadata.xml b/source/androidx.work/work-runtime/Transforms/Metadata.xml
index a6c88d4e1..3999b9411 100644
--- a/source/androidx.work/work-runtime/Transforms/Metadata.xml
+++ b/source/androidx.work/work-runtime/Transforms/Metadata.xml
@@ -1,7 +1,5 @@
 
 <metadata>
-    <attr path="/api/package[@name='androidx.work']" name="managedName">AndroidX.Work</attr>
-    
     <attr path="/api/package[@name='androidx.work']/class[@name='WorkRequest.Builder']/method[@name='build']" name="managedReturn">AndroidX.Work.WorkRequest</attr>
     <attr path="/api/package[@name='androidx.work']/class[@name='WorkRequest.Builder']/method[@name='addTag']" name="managedReturn">AndroidX.Work.WorkRequest.Builder</attr>
     <attr path="/api/package[@name='androidx.work']/class[@name='WorkRequest.Builder']/method[@name='keepResultsForAtLeast']" name="managedReturn">AndroidX.Work.WorkRequest.Builder</attr>
@@ -13,91 +11,6 @@
     <attr path="/api/package[@name='androidx.work']/class[@name='WorkRequest.Builder']/method[@name='setInputData']" name="managedReturn">AndroidX.Work.WorkRequest.Builder</attr>
     <attr path="/api/package[@name='androidx.work']/class[@name='WorkRequest.Builder']/method[@name='setPeriodStartTime']" name="managedReturn">AndroidX.Work.WorkRequest.Builder</attr>
     <attr path="/api/package[@name='androidx.work']/class[@name='WorkRequest.Builder']/method[@name='setScheduleRequestedAt']" name="managedReturn">AndroidX.Work.WorkRequest.Builder</attr>
-
-    <attr 
-        path="/api/package[@name='androidx.work.impl']" 
-        name="managedName"
-        >
-        AndroidX.Work.Impl
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.work.impl.background']" 
-        name="managedName"
-        >
-        AndroidX.Work.Impl.Background
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.work.impl.foreground']" 
-        name="managedName"
-        >
-        AndroidX.Work.Impl.Foreground
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.work.impl.background.greedy']" 
-        name="managedName"
-        >
-        AndroidX.Work.Impl.Background.Greedy
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.work.impl.background.systemjob']" 
-        name="managedName"
-        >
-        AndroidX.Work.Impl.Background.SystemJob
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.work.impl.background.systemalarm']" 
-        name="managedName"
-        >
-        AndroidX.Work.Impl.Background.SystemAlarm
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.work.impl.constraints']" 
-        name="managedName"
-        >
-        AndroidX.Work.Impl.Constraints  
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.work.impl.constraints.controllers']" 
-        name="managedName"
-        >
-        AndroidX.Work.Impl.Constraints.Controllers
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.work.impl.constraints.trackers']" 
-        name="managedName"
-        >
-        AndroidX.Work.Impl.Constraints.Trackers  
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.work.impl.utils']" 
-        name="managedName"
-        >
-        AndroidX.Work.Impl.Utils
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.work.impl.utils.futures']" 
-        name="managedName"
-        >
-        AndroidX.Work.Impl.Utils.Futures
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.work.impl.utils.taskexecutor']" 
-        name="managedName"
-        >
-        AndroidX.Work.Impl.Utils.TaskExecutor
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.work.impl.model']" 
-        name="managedName"
-        >
-        AndroidX.Work.Impl.Model
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.work.impl.workers']" 
-        name="managedName"
-        >
-        AndroidX.Work.Impl.Workers
-    </attr>
     
     <remove-node
         path="/api/package[@name='androidx.work']/class[@name='WorkRequest.Builder']/typeParameters" 
@@ -207,25 +120,6 @@
     <remove-node
         path="/api/package[@name='androidx.work.impl']"
         />
-
-    <attr 
-        path="/api/package[@name='androidx.work.impl.foreground']" 
-        name="managedName"
-        >
-        AndroidX.Work.Impl.Foreground
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.work.multiprocess']"
-        name="managedName"
-        >
-        AndroidX.Work.MultiProcess
-    </attr>
-    <attr 
-        path="/api/package[@name='androidx.work.impl.diagnostics']"
-        name="managedName"
-        >
-        AndroidX.Work.Impl.Diagnostics
-    </attr>
     
 
     <attr 
diff --git a/source/com.google.android.material/Xamarin.Google.Android.Material.Extensions/transforms/Metadata.Namespaces.xml b/source/com.google.android.material/Xamarin.Google.Android.Material.Extensions/transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 74e69d49c..000000000
--- a/source/com.google.android.material/Xamarin.Google.Android.Material.Extensions/transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<metadata>
-    <!--
-    -->
-    <attr 
-        path="/api/package[@name='com.xamarin.google.android.material.extensions']"
-        name="managedName"
-        >
-        Xamarin.Google.Android.Material.Extensions
-    </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/com.google.android.material/material/Transforms/Metadata.Namespaces.xml b/source/com.google.android.material/material/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index e17510cef..000000000
--- a/source/com.google.android.material/material/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-    <attr path="/api/package[@name='com.google.android.material.animation']" name="managedName">Google.Android.Material.Animation</attr>
-    <attr path="/api/package[@name='com.google.android.material.appbar']" name="managedName">Google.Android.Material.AppBar</attr>
-    <attr path="/api/package[@name='com.google.android.material.behavior']" name="managedName">Google.Android.Material.Behavior</attr>
-    <attr path="/api/package[@name='com.google.android.material.bottomappbar']" name="managedName">Google.Android.Material.BottomAppBar</attr>
-    <attr path="/api/package[@name='com.google.android.material.bottomnavigation']" name="managedName">Google.Android.Material.BottomNavigation</attr>
-    <attr path="/api/package[@name='com.google.android.material.bottomsheet']" name="managedName">Google.Android.Material.BottomSheet</attr>
-    <attr path="/api/package[@name='com.google.android.material.button']" name="managedName">Google.Android.Material.Button</attr>
-    <attr path="/api/package[@name='com.google.android.material.canvas']" name="managedName">Google.Android.Material.Canvas</attr>
-    <attr path="/api/package[@name='com.google.android.material.card']" name="managedName">Google.Android.Material.Card</attr>
-    <attr path="/api/package[@name='com.google.android.material.chip']" name="managedName">Google.Android.Material.Chip</attr>
-    <attr path="/api/package[@name='com.google.android.material.circularreveal']" name="managedName">Google.Android.Material.CircularReveal</attr>
-    <attr path="/api/package[@name='com.google.android.material.circularreveal.cardview']" name="managedName">Google.Android.Material.CircularReveal.CardView</attr>
-    <attr path="/api/package[@name='com.google.android.material.circularreveal.coordinatorlayout']" name="managedName">Google.Android.Material.CircularReveal.CoordinatorLayout</attr>
-    <attr path="/api/package[@name='com.google.android.material.drawable']" name="managedName">Google.Android.Material.Drawable</attr>
-    <attr path="/api/package[@name='com.google.android.material.expandable']" name="managedName">Google.Android.Material.Expandable</attr>
-    <attr path="/api/package[@name='com.google.android.material.floatingactionbutton']" name="managedName">Google.Android.Material.FloatingActionButton</attr>
-    <attr path="/api/package[@name='com.google.android.material.imageview']" name="managedName">Google.Android.Material.ImageView</attr>
-    <attr path="/api/package[@name='com.google.android.material.internal']" name="managedName">Google.Android.Material.Internal</attr>
-    <attr path="/api/package[@name='com.google.android.material.math']" name="managedName">Google.Android.Material.Math</attr>
-    <attr path="/api/package[@name='com.google.android.material.navigation']" name="managedName">Google.Android.Material.Navigation</attr>
-    <attr path="/api/package[@name='com.google.android.material.resources']" name="managedName">Google.Android.Material.Resources</attr>
-    <attr path="/api/package[@name='com.google.android.material.ripple']" name="managedName">Google.Android.Material.Ripple</attr>
-    <attr path="/api/package[@name='com.google.android.material.shadow']" name="managedName">Google.Android.Material.Shadow</attr>
-    <attr path="/api/package[@name='com.google.android.material.shape']" name="managedName">Google.Android.Material.Shape</attr>
-    <attr path="/api/package[@name='com.google.android.material.slider']" name="managedName">Google.Android.Material.Slider</attr>
-    <attr path="/api/package[@name='com.google.android.material.snackbar']" name="managedName">Google.Android.Material.Snackbar</attr>
-    <attr path="/api/package[@name='com.google.android.material.stateful']" name="managedName">Google.Android.Material.Stateful</attr>
-    <attr path="/api/package[@name='com.google.android.material.tabs']" name="managedName">Google.Android.Material.Tabs</attr>
-    <attr path="/api/package[@name='com.google.android.material.textfield']" name="managedName">Google.Android.Material.TextField</attr>
-    <attr path="/api/package[@name='com.google.android.material.theme']" name="managedName">Google.Android.Material.Theme</attr>
-    <attr path="/api/package[@name='com.google.android.material.theme.overlay']" name="managedName">Google.Android.Material.Theme.Overlay</attr>
-    <attr path="/api/package[@name='com.google.android.material.tooltip']" name="managedName">Google.Android.Material.Tooltip</attr>
-    <attr path="/api/package[@name='com.google.android.material.transformation']" name="managedName">Google.Android.Material.Transformation</attr>
-    <attr path="/api/package[@name='com.google.android.material.transition']" name="managedName">Google.Android.Material.Transition</attr>
-    <attr path="/api/package[@name='com.google.android.material.transition.platform']" name="managedName">Google.Android.Material.Transition.Platform</attr>
-
-  <attr
-    path="/api/package[@name='com.google.android.material.badge']"
-    name="managedName"
-    >
-    Google.Android.Material.Badge
-  </attr>
-  <attr
-    path="/api/package[@name='com.google.android.material.checkbox']"
-    name="managedName"
-    >
-    Google.Android.Material.CheckBox
-  </attr>
-  <attr
-    path="/api/package[@name='com.google.android.material.color']"
-    name="managedName"
-    >
-    Google.Android.Material.Color
-  </attr>
-  <attr
-    path="/api/package[@name='com.google.android.material.datepicker']"
-    name="managedName"
-    >
-    Google.Android.Material.DatePicker
-  </attr>
-  <attr
-    path="/api/package[@name='com.google.android.material.dialog']"
-    name="managedName"
-    >
-    Google.Android.Material.Dialog
-  </attr>
-  <attr
-    path="/api/package[@name='com.google.android.material.elevation']"
-    name="managedName"
-    >
-    Google.Android.Material.Elevation
-  </attr>
-  <attr
-    path="/api/package[@name='com.google.android.material.radiobutton']"
-    name="managedName"
-    >
-    Google.Android.Material.RadioButton
-  </attr>
-  <attr
-    path="/api/package[@name='com.google.android.material.switchmaterial']"
-    name="managedName"
-    >
-    Google.Android.Material.SwitchMaterial
-  </attr>
-  <attr
-    path="/api/package[@name='com.google.android.material.textview']"
-    name="managedName"
-    >
-    Google.Android.Material.TextView
-  </attr>
-
-  <attr
-    path="/api/package[@name='com.google.android.material.progressindicator']"
-    name="managedName"
-    >
-    Google.Android.Material.ProgressIndicator    
-  </attr>
-  <attr
-    path="/api/package[@name='com.google.android.material.timepicker']"
-    name="managedName"
-    >
-    Google.Android.Material.TimePicker
-  </attr>
-  <attr
-    path="/api/package[@name='com.google.android.material.navigationrail']"
-    name="managedName"
-    >
-    Google.Android.Material.NavigationRail
-  </attr>
-
-  <attr
-    path="/api/package[@name='com.google.android.material.motion']"
-    name="managedName"
-    >
-    Google.Android.Material.Motion
-  </attr>
-  <attr
-    path="/api/package[@name='com.google.android.material.divider']"
-    name="managedName"
-    >
-    Google.Android.Material.Divider
-  </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/com.google.auto.value/auto-value-annotations/Transforms/Metadata.xml b/source/com.google.auto.value/auto-value-annotations/Transforms/Metadata.xml
index 61bbb5a6b..c049ec0bc 100644
--- a/source/com.google.auto.value/auto-value-annotations/Transforms/Metadata.xml
+++ b/source/com.google.auto.value/auto-value-annotations/Transforms/Metadata.xml
@@ -1,18 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata>
+  <!-- Preserve non-standard namespace renames -->
 	<attr path="/api/package[@name='com.google.auto.value']" name="managedName">Google.AutoValue.Annotations</attr>
 	<attr path="/api/package[@name='com.google.auto.value.extension.memoized']" name="managedName">Google.AutoValue.Annotations</attr>
-
-	<attr 
-		path="/api/package[@name='com.google.auto.value.extension.serializable']"
-		name="managedName"
-		>
-		Google.AutoValue.Extension.Serializable
-	</attr>
-	<attr 
-		path="/api/package[@name='com.google.auto.value.extension.toprettystring']"
-		name="managedName"
-		>
-		Google.AutoValue.Extension.ToPrettyString
-	</attr>
 </metadata>
\ No newline at end of file
diff --git a/source/com.google.code.gson/gson/Transforms/Metadata.xml b/source/com.google.code.gson/gson/Transforms/Metadata.xml
index 5b7cc1a49..9b55a3ac6 100644
--- a/source/com.google.code.gson/gson/Transforms/Metadata.xml
+++ b/source/com.google.code.gson/gson/Transforms/Metadata.xml
@@ -1,10 +1,4 @@
 <metadata>
-	<!-- namespaces -->
-	<attr path="/api/package[@name='com.google.gson']" name="managedName">GoogleGson</attr>
-	<attr path="/api/package[@name='com.google.gson.annotations']" name="managedName">GoogleGson.Annotations</attr>
-	<attr path="/api/package[@name='com.google.gson.reflect']" name="managedName">GoogleGson.Reflect</attr>
-	<attr path="/api/package[@name='com.google.gson.stream']" name="managedName">GoogleGson.Stream</attr>
-
 	<attr path="/api/package[@name='com.google.gson']/class[@name='JsonStreamParser']/method[@name='next']" name="managedReturn">Java.Lang.Object</attr>
 	
 	<!-- remove private/internal/implementation/deprecated types -->
diff --git a/source/com.google.crypto.tink/tink-android/Transforms/Metadata.Namespaces.xml b/source/com.google.crypto.tink/tink-android/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 5eb982d72..000000000
--- a/source/com.google.crypto.tink/tink-android/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<metadata>
-  <attr path="/api/package[@name='com.google.crypto.tink.aead']" name="managedName">Xamarin.Google.Crypto.Tink.Aead</attr>
-  <attr path="/api/package[@name='com.google.crypto.tink.aead.subtle']" name="managedName">Xamarin.Google.Crypto.Tink.Aead.Subtle</attr>
-  <attr path="/api/package[@name='com.google.crypto.tink.annotations']" name="managedName">Xamarin.Google.Crypto.Tink.Annotations</attr>
-  <attr path="/api/package[@name='com.google.crypto.tink.daead']" name="managedName">Xamarin.Google.Crypto.Tink.DAead</attr>
-  <attr path="/api/package[@name='com.google.crypto.tink.hybrid']" name="managedName">Xamarin.Google.Crypto.Tink.Hybrid</attr>
-  <attr path="/api/package[@name='com.google.crypto.tink.hybrid.subtle']" name="managedName">Xamarin.Google.Crypto.Tink.Hybrid.Subtle</attr>
-  <attr path="/api/package[@name='com.google.crypto.tink.integration.android']" name="managedName">Xamarin.Google.Crypto.Tink.Integration.Android</attr>
-  <attr path="/api/package[@name='com.google.crypto.tink.mac']" name="managedName">Xamarin.Google.Crypto.Tink.Mac</attr>
-  <attr path="/api/package[@name='com.google.crypto.tink.prf']" name="managedName">Xamarin.Google.Crypto.Tink.Prf</attr>
-  <attr path="/api/package[@name='com.google.crypto.tink.proto']" name="managedName">Xamarin.Google.Crypto.Tink.Proto</attr>
-  <attr path="/api/package[@name='com.google.crypto.tink.signature']" name="managedName">Xamarin.Google.Crypto.Tink.Signature</attr>
-  <attr path="/api/package[@name='com.google.crypto.tink.signature.internal']" name="managedName">Xamarin.Google.Crypto.Tink.Signature.Internal</attr>
-  <attr path="/api/package[@name='com.google.crypto.tink.streamingaead']" name="managedName">Xamarin.Google.Crypto.Tink.StreamingAead</attr>
-  <attr path="/api/package[@name='com.google.crypto.tink.subtle.prf']" name="managedName">Xamarin.Google.Crypto.Tink.Subtle.Prf</attr>
-  <attr path="/api/package[@name='com.google.crypto.tink.tinkkey']" name="managedName">Xamarin.Google.Crypto.Tink.Tinkkey</attr>
-
-  <attr
-      path="/api/package[@name='com.google.crypto.tink']" 
-      name="managedName"
-      >
-      Xamarin.Google.Crypto.Tink
-  </attr>
-  <attr
-      path="/api/package[@name='com.google.crypto.tink.shaded.protobuf']" 
-      name="managedName"
-      >
-      Xamarin.Google.Crypto.Tink.Shaded.Protobuf
-  </attr>
-  <attr
-      path="/api/package[@name='com.google.crypto.tink.subtle']" 
-      name="managedName"
-      >
-      Xamarin.Google.Crypto.Tink.Subtle
-  </attr>
-  <!--
-    switching Config to Configs (plural)
-    more according to .NET naming and there is type Config!!!!
-  -->
-  <attr 
-      path="/api/package[@name='com.google.crypto.tink.config']" 
-      name="managedName"
-      >
-      Xamarin.Google.Crypto.Tink.Configs
-  </attr>
-
-</metadata>
\ No newline at end of file
diff --git a/source/com.google.guava/failureaccess/Transforms/Transforms.xml b/source/com.google.guava/failureaccess/Transforms/Transforms.xml
index b9d501621..26c2f6238 100644
--- a/source/com.google.guava/failureaccess/Transforms/Transforms.xml
+++ b/source/com.google.guava/failureaccess/Transforms/Transforms.xml
@@ -1,19 +1,2 @@
 <metadata>
-  <!-- Rename Namespaces -->
-  <attr path="/api/package[@name='com.google.common.util.concurrent.internal']" name="managedName">Google.Common.Util.Concurrent.Internal</attr>
-
-  <attr 
-    path="/api/package[@name='com.google.common.util.concurrent']" 
-    name="managedName"
-    >
-    Google.Common.Util.Concurrent
-  </attr>
-  <attr 
-    path="/api/package[@name='com.google.common.util.concurrent.internal']"
-    name="managedName"
-    >
-    Google.Common.Util.Concurrent.Internal
-  </attr>
-
-
 </metadata>
diff --git a/source/com.google.guava/listenablefuture/Transforms/Transforms.xml b/source/com.google.guava/listenablefuture/Transforms/Transforms.xml
index 75307b500..26c2f6238 100644
--- a/source/com.google.guava/listenablefuture/Transforms/Transforms.xml
+++ b/source/com.google.guava/listenablefuture/Transforms/Transforms.xml
@@ -1,13 +1,2 @@
 <metadata>
-  <!-- Rename Namespaces -->
-  <attr path="/api/package[@name='com.google.common.util.concurrent']" name="managedName">Google.Common.Util.Concurrent</attr>
-
-
-  <attr 
-    path="/api/package[@name='com.google.common.util.concurrent']"
-    name="managedName"
-    >
-    Google.Common.Util.Concurrent
-  </attr>
-
 </metadata>
diff --git a/source/io.reactivex.rxjava2/RxJava/Transforms/Metadata.Namespaces.xml b/source/io.reactivex.rxjava2/RxJava/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index 53e9dfed3..000000000
--- a/source/io.reactivex.rxjava2/RxJava/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<metadata>
-
-    <attr
-        path="/api/package[@name='io.reactivex']"
-        name="managedName"
-        >
-        ReactiveX
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.annotations']"
-        name="managedName"
-        >
-        ReactiveX.Annotations
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.disposables']"
-        name="managedName"
-        >
-        ReactiveX.Disposables
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.exceptions']"
-        name="managedName"
-        >
-        ReactiveX.Exceptions
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.flowables']"
-        name="managedName"
-        >
-        ReactiveX.Flowables
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.functions']"
-        name="managedName"
-        >
-        ReactiveX.Functions
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.internal.disposables']"
-        name="managedName"
-        >
-        ReactiveX.Internal.Disposables
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.internal.functions']"
-        name="managedName"
-        >
-        ReactiveX.Internal.Functions
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.internal.fuseable']"
-        name="managedName"
-        >
-        ReactiveX.Internal.Fuseable
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.internal.observers']"
-        name="managedName"
-        >
-        ReactiveX.Internal.Observers
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.internal.operators.completable']"
-        name="managedName"
-        >
-        ReactiveX.Internal.Operators.Completable
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.internal.operators.flowable']"
-        name="managedName"
-        >
-        ReactiveX.Internal.Operators.Flowable
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.internal.operators.maybe']"
-        name="managedName"
-        >
-        ReactiveX.Internal.Operators.Maybe
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.internal.operators.mixed']"
-        name="managedName"
-        >
-        ReactiveX.Internal.Operators.Mixed
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.internal.operators.observable']"
-        name="managedName"
-        >
-        ReactiveX.Internal.Operators.Observable
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.internal.operators.parallel']"
-        name="managedName"
-        >
-        ReactiveX.Internal.Operators.Parallel
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.internal.operators.single']"
-        name="managedName"
-        >
-        ReactiveX.Internal.Operators.Single
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.internal.queue']"
-        name="managedName"
-        >
-        ReactiveX.Internal.Queue
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.internal.schedulers']"
-        name="managedName"
-        >
-        ReactiveX.Internal.Schedulers
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.internal.subscribers']"
-        name="managedName"
-        >
-        ReactiveX.Internal.Subscribers
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.internal.subscriptions']"
-        name="managedName"
-        >
-        ReactiveX.Internal.Subscriptions
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.internal.util']"
-        name="managedName"
-        >
-        ReactiveX.Internal.Util
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.observables']"
-        name="managedName"
-        >
-        ReactiveX.Observables
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.observers']"
-        name="managedName"
-        >
-        ReactiveX.Observers
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.parallel']"
-        name="managedName"
-        >
-        ReactiveX.Parallel
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.plugins']"
-        name="managedName"
-        >
-        ReactiveX.Plugins
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.processors']"
-        name="managedName"
-        >
-        ReactiveX.Processors
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.schedulers']"
-        name="managedName"
-        >
-        ReactiveX.Schedulers
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.subjects']"
-        name="managedName"
-        >
-        ReactiveX.Subjects
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.subscribers']"
-        name="managedName"
-        >
-        ReactiveX.Subscribers
-    </attr>
-  
-</metadata>
diff --git a/source/io.reactivex.rxjava3/RxJava/Transforms/Metadata.Namespaces.xml b/source/io.reactivex.rxjava3/RxJava/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index cd240bf09..000000000
--- a/source/io.reactivex.rxjava3/RxJava/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<metadata>
-
-    <attr
-        path="/api/package[@name='io.reactivex']"
-        name="managedName"
-        >
-        ReactiveX
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.annotations']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Annotations
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.disposables']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Disposables
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.exceptions']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Exceptions
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.flowables']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Flowables
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.functions']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Functions
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.internal.disposables']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Internal.Disposables
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.internal.functions']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Internal.Functions
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.internal.fuseable']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Internal.Fuseable
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.internal.observers']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Internal.Observers
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.internal.operators.completable']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Internal.Operators.Completable
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.internal.operators.flowable']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Internal.Operators.Flowable
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.internal.operators.maybe']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Internal.Operators.Maybe
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.internal.operators.mixed']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Internal.Operators.Mixed
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.internal.operators.observable']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Internal.Operators.Observable
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.internal.operators.parallel']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Internal.Operators.Parallel
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.internal.operators.single']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Internal.Operators.Single
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.internal.queue']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Internal.Queue
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.internal.schedulers']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Internal.Schedulers
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.internal.subscribers']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Internal.Subscribers
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.internal.subscriptions']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Internal.Subscriptions
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.internal.util']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Internal.Util
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.observables']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Observables
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.observers']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Observers
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.parallel']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Parallel
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.plugins']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Plugins
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.processors']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Processors
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.schedulers']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Schedulers
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.subjects']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Subjects
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.subscribers']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Subscribers
-    </attr>
-
-
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.core']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Core
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.internal.jdk8']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Internal.JDK8
-    </attr>
-    <attr
-        path="/api/package[@name='io.reactivex.rxjava3.operators']"
-        name="managedName"
-        >
-        ReactiveX.RxJava3.Operators
-    </attr>
-
-</metadata>
diff --git a/source/io.reactivex.rxjava3/RxJava/Transforms/Metadata.xml b/source/io.reactivex.rxjava3/RxJava/Transforms/Metadata.xml
index 1afb81437..4fb5a7fef 100644
--- a/source/io.reactivex.rxjava3/RxJava/Transforms/Metadata.xml
+++ b/source/io.reactivex.rxjava3/RxJava/Transforms/Metadata.xml
@@ -1,4 +1,12 @@
 <metadata>
+    <!-- Preserve non-preferred capitalization of "JDK8" for backwards compatibility -->
+    <attr
+        path="/api/package[@name='io.reactivex.rxjava3.internal.jdk8']"
+        name="managedName"
+        >
+        ReactiveX.RxJava3.Internal.JDK8
+    </attr>
+    
     <add-node
         path="/api/package[@name='io.reactivex.rxjava3.internal.observers']/class[@name='BasicFuseableObserver']"
         >
diff --git a/source/org.jetbrains.kotlinx/kotlinx-coroutines-android/Transforms/Metadata.xml b/source/org.jetbrains.kotlinx/kotlinx-coroutines-android/Transforms/Metadata.xml
index f19582523..278b7226e 100644
--- a/source/org.jetbrains.kotlinx/kotlinx-coroutines-android/Transforms/Metadata.xml
+++ b/source/org.jetbrains.kotlinx/kotlinx-coroutines-android/Transforms/Metadata.xml
@@ -1,6 +1,7 @@
 <metadata>
-
+    <!-- Preserve "Coroutines" duplication for backward compatibility -->
     <attr path="/api/package[@name='kotlinx.coroutines.android']" name="managedName">Xamarin.KotlinX.Coroutines.CoroutinesAndroid</attr>
+    
     <attr path="/api/package[@name='kotlinx.coroutines.android']/class[@name='HandlerDispatcher']/method[@name='getImmediate' and count(parameter)=0]" name="managedReturn">Xamarin.KotlinX.Coroutines.MainCoroutineDispatcher</attr>
 
 </metadata>
diff --git a/source/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/Transforms/Metadata.xml b/source/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/Transforms/Metadata.xml
index e2f3a75ca..1579cf1b2 100644
--- a/source/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/Transforms/Metadata.xml
+++ b/source/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/Transforms/Metadata.xml
@@ -1,16 +1,5 @@
 <metadata>
 
-      <!-- namespaces -->
-      <attr path="/api/package[@name='kotlinx.coroutines']" name="managedName">Xamarin.KotlinX.Coroutines</attr>
-      <attr path="/api/package[@name='kotlinx.coroutines.channels']" name="managedName">Xamarin.KotlinX.Coroutines.Channels</attr>
-      <attr path="/api/package[@name='kotlinx.coroutines.debug']" name="managedName">Xamarin.KotlinX.Coroutines.Debug</attr>
-      <attr path="/api/package[@name='kotlinx.coroutines.flow']" name="managedName">Xamarin.KotlinX.Coroutines.Flow</attr>
-      <attr path="/api/package[@name='kotlinx.coroutines.intrinsics']" name="managedName">Xamarin.KotlinX.Coroutines.Intrinsics</attr>
-      <attr path="/api/package[@name='kotlinx.coroutines.scheduling']" name="managedName">Xamarin.KotlinX.Coroutines.Scheduling</attr>
-      <attr path="/api/package[@name='kotlinx.coroutines.selects']" name="managedName">Xamarin.KotlinX.Coroutines.Selects</attr>
-      <attr path="/api/package[@name='kotlinx.coroutines.sync']" name="managedName">Xamarin.KotlinX.Coroutines.Sync</attr>
-      <attr path="/api/package[@name='kotlinx.coroutines.test']" name="managedName">Xamarin.KotlinX.Coroutines.Test</attr>
-    
       <!-- remove the internal, internal classes -->
       <remove-node path="/api/package[starts-with(@name,'kotlinx.coroutines.internal')]" />
       <remove-node path="/api/package[starts-with(@name,'kotlinx.coroutines.debug.internal')]" />
diff --git a/source/org.jetbrains.kotlinx/kotlinx-coroutines-core/Transforms/Metadata.xml b/source/org.jetbrains.kotlinx/kotlinx-coroutines-core/Transforms/Metadata.xml
index 70e557ca4..daeac17bb 100644
--- a/source/org.jetbrains.kotlinx/kotlinx-coroutines-core/Transforms/Metadata.xml
+++ b/source/org.jetbrains.kotlinx/kotlinx-coroutines-core/Transforms/Metadata.xml
@@ -1,15 +1,4 @@
 <metadata>
-    <!-- namespaces -->
-    <attr path="/api/package[@name='kotlinx.coroutines']" name="managedName">Xamarin.KotlinX.Coroutines</attr>
-    <attr path="/api/package[@name='kotlinx.coroutines.channels']" name="managedName">Xamarin.KotlinX.Coroutines.Channels</attr>
-    <attr path="/api/package[@name='kotlinx.coroutines.debug']" name="managedName">Xamarin.KotlinX.Coroutines.Debug</attr>
-    <attr path="/api/package[@name='kotlinx.coroutines.flow']" name="managedName">Xamarin.KotlinX.Coroutines.Flow</attr>
-    <attr path="/api/package[@name='kotlinx.coroutines.intrinsics']" name="managedName">Xamarin.KotlinX.Coroutines.Intrinsics</attr>
-    <attr path="/api/package[@name='kotlinx.coroutines.scheduling']" name="managedName">Xamarin.KotlinX.Coroutines.Scheduling</attr>
-    <attr path="/api/package[@name='kotlinx.coroutines.selects']" name="managedName">Xamarin.KotlinX.Coroutines.Selects</attr>
-    <attr path="/api/package[@name='kotlinx.coroutines.sync']" name="managedName">Xamarin.KotlinX.Coroutines.Sync</attr>
-    <attr path="/api/package[@name='kotlinx.coroutines.test']" name="managedName">Xamarin.KotlinX.Coroutines.Test</attr>
-    
     <!-- remove the internal, internal classes -->
     <remove-node path="/api/package[starts-with(@name,'kotlinx.coroutines.internal')]" />
     <remove-node path="/api/package[starts-with(@name,'kotlinx.coroutines.debug.internal')]" />
diff --git a/source/org.jetbrains.kotlinx/kotlinx-coroutines-guava/Transforms/Metadata.xml b/source/org.jetbrains.kotlinx/kotlinx-coroutines-guava/Transforms/Metadata.xml
index ea727d88b..911422352 100644
--- a/source/org.jetbrains.kotlinx/kotlinx-coroutines-guava/Transforms/Metadata.xml
+++ b/source/org.jetbrains.kotlinx/kotlinx-coroutines-guava/Transforms/Metadata.xml
@@ -1,9 +1,2 @@
 <metadata>
-
-    <attr 
-        path="/api/package[@name='kotlinx.coroutines.guava']" 
-        name="managedName"
-        >
-        Xamarin.KotlinX.Coroutines.Guava
-    </attr>
 </metadata>
diff --git a/source/org.jetbrains.kotlinx/kotlinx-coroutines-jdk8/Transforms/Metadata.xml b/source/org.jetbrains.kotlinx/kotlinx-coroutines-jdk8/Transforms/Metadata.xml
index 7438337f1..911422352 100644
--- a/source/org.jetbrains.kotlinx/kotlinx-coroutines-jdk8/Transforms/Metadata.xml
+++ b/source/org.jetbrains.kotlinx/kotlinx-coroutines-jdk8/Transforms/Metadata.xml
@@ -1,6 +1,2 @@
 <metadata>
-
-    <attr path="/api/package[@name='kotlinx.coroutines.future']" name="managedName">Xamarin.KotlinX.Coroutines.Future</attr>
-    <attr path="/api/package[@name='kotlinx.coroutines.stream']" name="managedName">Xamarin.KotlinX.Coroutines.Stream</attr>
-    <attr path="/api/package[@name='kotlinx.coroutines.time']" name="managedName">Xamarin.KotlinX.Coroutines.Time</attr>
 </metadata>
diff --git a/source/org.jetbrains.kotlinx/kotlinx-coroutines-reactive/Transforms/Metadata.xml b/source/org.jetbrains.kotlinx/kotlinx-coroutines-reactive/Transforms/Metadata.xml
index 36b3a5dc9..911422352 100644
--- a/source/org.jetbrains.kotlinx/kotlinx-coroutines-reactive/Transforms/Metadata.xml
+++ b/source/org.jetbrains.kotlinx/kotlinx-coroutines-reactive/Transforms/Metadata.xml
@@ -1,4 +1,2 @@
 <metadata>
-
-    <attr path="/api/package[@name='kotlinx.coroutines.reactive']" name="managedName">Xamarin.KotlinX.Coroutines.Reactive</attr>
 </metadata>
diff --git a/source/org.jetbrains.kotlinx/kotlinx-coroutines-rx2/Transforms/Metadata.xml b/source/org.jetbrains.kotlinx/kotlinx-coroutines-rx2/Transforms/Metadata.xml
index b17a097bf..911422352 100644
--- a/source/org.jetbrains.kotlinx/kotlinx-coroutines-rx2/Transforms/Metadata.xml
+++ b/source/org.jetbrains.kotlinx/kotlinx-coroutines-rx2/Transforms/Metadata.xml
@@ -1,4 +1,2 @@
 <metadata>
-
-    <attr path="/api/package[@name='kotlinx.coroutines.rx2']" name="managedName">Xamarin.KotlinX.Coroutines.Rx2</attr>
 </metadata>
diff --git a/source/org.reactivestreams/reactive-streams/Transforms/Metadata.xml b/source/org.reactivestreams/reactive-streams/Transforms/Metadata.xml
index cb3005b2b..911422352 100644
--- a/source/org.reactivestreams/reactive-streams/Transforms/Metadata.xml
+++ b/source/org.reactivestreams/reactive-streams/Transforms/Metadata.xml
@@ -1,3 +1,2 @@
 <metadata>
-  <attr path="/api/package[@name='org.reactivestreams']" name="managedName">ReactiveStreams</attr>
 </metadata>
diff --git a/source/template-group-id/template-artifact/Transforms/Metadata.Namespaces.xml b/source/template-group-id/template-artifact/Transforms/Metadata.Namespaces.xml
deleted file mode 100644
index da0b35faf..000000000
--- a/source/template-group-id/template-artifact/Transforms/Metadata.Namespaces.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<metadata>
-    <!--
-    <attr 
-        path="/api/package[@name='package']" 
-        name="managedName"
-        >
-        Package
-    </attr>
-    -->
-</metadata>
\ No newline at end of file