From 2bf7ebf7cd5b8f40e1c5e54d38bf5e51905ee312 Mon Sep 17 00:00:00 2001
From: Kevin Jones <kevin@vcsjones.com>
Date: Fri, 29 Aug 2025 12:33:09 -0400
Subject: [PATCH] Rename SecurityTransforms to AppleCrypto

---
 ...forms.cs => ECDiffieHellmanAppleCrypto.cs} | 24 ++++++------
 ...urityTransforms.cs => ECDsaAppleCrypto.cs} | 10 ++---
 ...ecurityTransforms.cs => EccAppleCrypto.cs} |  4 +-
 ...ransforms.iOS.cs => EccAppleCrypto.iOS.cs} |  2 +-
 ...forms.macOS.cs => EccAppleCrypto.macOS.cs} |  2 +-
 ...ecurityTransforms.cs => RSAAppleCrypto.cs} | 10 ++---
 ...ransforms.iOS.cs => RSAAppleCrypto.iOS.cs} |  2 +-
 ...forms.macOS.cs => RSAAppleCrypto.macOS.cs} |  2 +-
 .../src/System.Security.Cryptography.csproj   | 38 +++++++++----------
 ... => ECDiffieHellman.Create.AppleCrypto.cs} |  2 +-
 ...nsforms.cs => ECDsa.Create.AppleCrypto.cs} |  2 +-
 ...ransforms.cs => RSA.Create.AppleCrypto.cs} |  2 +-
 .../RSACryptoServiceProvider.Unix.cs          |  2 +-
 .../AppleCertificatePal.Keys.macOS.cs         |  6 +--
 .../X509Certificates/AppleCertificatePal.cs   |  6 +--
 .../X509CertificateLoader.iOS.cs              |  4 +-
 .../X509CertificateLoader.macOS.cs            |  8 ++--
 .../X509Certificates/X509Pal.Apple.ECKey.cs   |  4 +-
 .../X509Certificates/X509Pal.iOS.cs           |  2 +-
 .../X509Certificates/X509Pal.macOS.cs         |  2 +-
 20 files changed, 67 insertions(+), 67 deletions(-)
 rename src/libraries/Common/src/System/Security/Cryptography/{ECDiffieHellmanSecurityTransforms.cs => ECDiffieHellmanAppleCrypto.cs} (90%)
 rename src/libraries/Common/src/System/Security/Cryptography/{ECDsaSecurityTransforms.cs => ECDsaAppleCrypto.cs} (94%)
 rename src/libraries/Common/src/System/Security/Cryptography/{EccSecurityTransforms.cs => EccAppleCrypto.cs} (98%)
 rename src/libraries/Common/src/System/Security/Cryptography/{EccSecurityTransforms.iOS.cs => EccAppleCrypto.iOS.cs} (93%)
 rename src/libraries/Common/src/System/Security/Cryptography/{EccSecurityTransforms.macOS.cs => EccAppleCrypto.macOS.cs} (98%)
 rename src/libraries/Common/src/System/Security/Cryptography/{RSASecurityTransforms.cs => RSAAppleCrypto.cs} (98%)
 rename src/libraries/Common/src/System/Security/Cryptography/{RSASecurityTransforms.iOS.cs => RSAAppleCrypto.iOS.cs} (92%)
 rename src/libraries/Common/src/System/Security/Cryptography/{RSASecurityTransforms.macOS.cs => RSAAppleCrypto.macOS.cs} (97%)
 rename src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/{ECDiffieHellman.Create.SecurityTransforms.cs => ECDiffieHellman.Create.AppleCrypto.cs} (97%)
 rename src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/{ECDsa.Create.SecurityTransforms.cs => ECDsa.Create.AppleCrypto.cs} (96%)
 rename src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/{RSA.Create.SecurityTransforms.cs => RSA.Create.AppleCrypto.cs} (82%)

diff --git a/src/libraries/Common/src/System/Security/Cryptography/ECDiffieHellmanSecurityTransforms.cs b/src/libraries/Common/src/System/Security/Cryptography/ECDiffieHellmanAppleCrypto.cs
similarity index 90%
rename from src/libraries/Common/src/System/Security/Cryptography/ECDiffieHellmanSecurityTransforms.cs
rename to src/libraries/Common/src/System/Security/Cryptography/ECDiffieHellmanAppleCrypto.cs
index cad96d1017f50b..6b27d84f3a30b2 100644
--- a/src/libraries/Common/src/System/Security/Cryptography/ECDiffieHellmanSecurityTransforms.cs
+++ b/src/libraries/Common/src/System/Security/Cryptography/ECDiffieHellmanAppleCrypto.cs
@@ -8,21 +8,21 @@ namespace System.Security.Cryptography
 {
     internal static partial class ECDiffieHellmanImplementation
     {
-        public sealed partial class ECDiffieHellmanSecurityTransforms : ECDiffieHellman
+        public sealed partial class ECDiffieHellmanAppleCrypto : ECDiffieHellman
         {
-            private readonly EccSecurityTransforms _ecc = new EccSecurityTransforms(typeof(ECDiffieHellman));
+            private readonly EccAppleCrypto _ecc = new EccAppleCrypto(typeof(ECDiffieHellman));
 
-            public ECDiffieHellmanSecurityTransforms()
+            public ECDiffieHellmanAppleCrypto()
             {
                 base.KeySize = 521;
             }
 
-            internal ECDiffieHellmanSecurityTransforms(SafeSecKeyRefHandle publicKey)
+            internal ECDiffieHellmanAppleCrypto(SafeSecKeyRefHandle publicKey)
             {
                 KeySizeValue = _ecc.SetKeyAndGetSize(SecKeyPair.PublicOnly(publicKey));
             }
 
-            internal ECDiffieHellmanSecurityTransforms(SafeSecKeyRefHandle publicKey, SafeSecKeyRefHandle privateKey)
+            internal ECDiffieHellmanAppleCrypto(SafeSecKeyRefHandle publicKey, SafeSecKeyRefHandle privateKey)
             {
                 KeySizeValue = _ecc.SetKeyAndGetSize(SecKeyPair.PublicPrivatePair(publicKey, privateKey));
             }
@@ -177,10 +177,10 @@ public override byte[] DeriveRawSecretAgreement(ECDiffieHellmanPublicKey otherPa
 
             private byte[]? DeriveSecretAgreement(ECDiffieHellmanPublicKey otherPartyPublicKey, IncrementalHash? hasher)
             {
-                if (!(otherPartyPublicKey is ECDiffieHellmanSecurityTransformsPublicKey secTransPubKey))
+                if (!(otherPartyPublicKey is ECDiffieHellmanAppleCryptoPublicKey secTransPubKey))
                 {
                     secTransPubKey =
-                        new ECDiffieHellmanSecurityTransformsPublicKey(otherPartyPublicKey.ExportParameters());
+                        new ECDiffieHellmanAppleCryptoPublicKey(otherPartyPublicKey.ExportParameters());
                 }
 
                 try
@@ -244,16 +244,16 @@ public override byte[] DeriveRawSecretAgreement(ECDiffieHellmanPublicKey otherPa
             }
 
             public override ECDiffieHellmanPublicKey PublicKey =>
-                new ECDiffieHellmanSecurityTransformsPublicKey(ExportParameters(false));
+                new ECDiffieHellmanAppleCryptoPublicKey(ExportParameters(false));
 
-            private sealed class ECDiffieHellmanSecurityTransformsPublicKey : ECDiffieHellmanPublicKey
+            private sealed class ECDiffieHellmanAppleCryptoPublicKey : ECDiffieHellmanPublicKey
             {
-                private readonly EccSecurityTransforms _ecc;
+                private readonly EccAppleCrypto _ecc;
 
-                public ECDiffieHellmanSecurityTransformsPublicKey(ECParameters ecParameters)
+                public ECDiffieHellmanAppleCryptoPublicKey(ECParameters ecParameters)
                 {
                     Debug.Assert(ecParameters.D == null);
-                    _ecc = new EccSecurityTransforms(typeof(ECDiffieHellmanPublicKey));
+                    _ecc = new EccAppleCrypto(typeof(ECDiffieHellmanPublicKey));
                     _ecc.ImportParameters(ecParameters);
                 }
 
diff --git a/src/libraries/Common/src/System/Security/Cryptography/ECDsaSecurityTransforms.cs b/src/libraries/Common/src/System/Security/Cryptography/ECDsaAppleCrypto.cs
similarity index 94%
rename from src/libraries/Common/src/System/Security/Cryptography/ECDsaSecurityTransforms.cs
rename to src/libraries/Common/src/System/Security/Cryptography/ECDsaAppleCrypto.cs
index a5812580db12df..e1fae129176054 100644
--- a/src/libraries/Common/src/System/Security/Cryptography/ECDsaSecurityTransforms.cs
+++ b/src/libraries/Common/src/System/Security/Cryptography/ECDsaAppleCrypto.cs
@@ -9,21 +9,21 @@ namespace System.Security.Cryptography
 {
     internal static partial class ECDsaImplementation
     {
-        public sealed partial class ECDsaSecurityTransforms : ECDsa, IRuntimeAlgorithm
+        public sealed partial class ECDsaAppleCrypto : ECDsa, IRuntimeAlgorithm
         {
-            private readonly EccSecurityTransforms _ecc = new EccSecurityTransforms(typeof(ECDsa));
+            private readonly EccAppleCrypto _ecc = new EccAppleCrypto(typeof(ECDsa));
 
-            public ECDsaSecurityTransforms()
+            public ECDsaAppleCrypto()
             {
                 base.KeySize = 521;
             }
 
-            internal ECDsaSecurityTransforms(SafeSecKeyRefHandle publicKey)
+            internal ECDsaAppleCrypto(SafeSecKeyRefHandle publicKey)
             {
                 KeySizeValue = _ecc.SetKeyAndGetSize(SecKeyPair.PublicOnly(publicKey));
             }
 
-            internal ECDsaSecurityTransforms(SafeSecKeyRefHandle publicKey, SafeSecKeyRefHandle privateKey)
+            internal ECDsaAppleCrypto(SafeSecKeyRefHandle publicKey, SafeSecKeyRefHandle privateKey)
             {
                 KeySizeValue = _ecc.SetKeyAndGetSize(SecKeyPair.PublicPrivatePair(publicKey, privateKey));
             }
diff --git a/src/libraries/Common/src/System/Security/Cryptography/EccSecurityTransforms.cs b/src/libraries/Common/src/System/Security/Cryptography/EccAppleCrypto.cs
similarity index 98%
rename from src/libraries/Common/src/System/Security/Cryptography/EccSecurityTransforms.cs
rename to src/libraries/Common/src/System/Security/Cryptography/EccAppleCrypto.cs
index dd1cdca8534bb9..b1a8ab6d33e9ea 100644
--- a/src/libraries/Common/src/System/Security/Cryptography/EccSecurityTransforms.cs
+++ b/src/libraries/Common/src/System/Security/Cryptography/EccAppleCrypto.cs
@@ -10,13 +10,13 @@
 
 namespace System.Security.Cryptography
 {
-    internal sealed partial class EccSecurityTransforms : IDisposable
+    internal sealed partial class EccAppleCrypto : IDisposable
     {
         private SecKeyPair? _keys;
         private bool _disposed;
         private readonly Type _disposedType;
 
-        internal EccSecurityTransforms(Type disposedType)
+        internal EccAppleCrypto(Type disposedType)
         {
             Debug.Assert(disposedType != null);
             _disposedType = disposedType;
diff --git a/src/libraries/Common/src/System/Security/Cryptography/EccSecurityTransforms.iOS.cs b/src/libraries/Common/src/System/Security/Cryptography/EccAppleCrypto.iOS.cs
similarity index 93%
rename from src/libraries/Common/src/System/Security/Cryptography/EccSecurityTransforms.iOS.cs
rename to src/libraries/Common/src/System/Security/Cryptography/EccAppleCrypto.iOS.cs
index b789ea55795d20..16785944f39ad6 100644
--- a/src/libraries/Common/src/System/Security/Cryptography/EccSecurityTransforms.iOS.cs
+++ b/src/libraries/Common/src/System/Security/Cryptography/EccAppleCrypto.iOS.cs
@@ -10,7 +10,7 @@
 
 namespace System.Security.Cryptography
 {
-    internal sealed partial class EccSecurityTransforms
+    internal sealed partial class EccAppleCrypto
     {
 #pragma warning disable IDE0060
         private static ECParameters ExportParametersFromLegacyKey(SecKeyPair keys, bool includePrivateParameters)
diff --git a/src/libraries/Common/src/System/Security/Cryptography/EccSecurityTransforms.macOS.cs b/src/libraries/Common/src/System/Security/Cryptography/EccAppleCrypto.macOS.cs
similarity index 98%
rename from src/libraries/Common/src/System/Security/Cryptography/EccSecurityTransforms.macOS.cs
rename to src/libraries/Common/src/System/Security/Cryptography/EccAppleCrypto.macOS.cs
index b28295ba898a14..fa229bbbda0b24 100644
--- a/src/libraries/Common/src/System/Security/Cryptography/EccSecurityTransforms.macOS.cs
+++ b/src/libraries/Common/src/System/Security/Cryptography/EccAppleCrypto.macOS.cs
@@ -10,7 +10,7 @@
 
 namespace System.Security.Cryptography
 {
-    internal sealed partial class EccSecurityTransforms
+    internal sealed partial class EccAppleCrypto
     {
         private static ECParameters ExportParametersFromLegacyKey(SecKeyPair keys, bool includePrivateParameters)
         {
diff --git a/src/libraries/Common/src/System/Security/Cryptography/RSASecurityTransforms.cs b/src/libraries/Common/src/System/Security/Cryptography/RSAAppleCrypto.cs
similarity index 98%
rename from src/libraries/Common/src/System/Security/Cryptography/RSASecurityTransforms.cs
rename to src/libraries/Common/src/System/Security/Cryptography/RSAAppleCrypto.cs
index aec263855f2864..4842ab98bcce17 100644
--- a/src/libraries/Common/src/System/Security/Cryptography/RSASecurityTransforms.cs
+++ b/src/libraries/Common/src/System/Security/Cryptography/RSAAppleCrypto.cs
@@ -14,7 +14,7 @@ namespace System.Security.Cryptography
 {
     internal static partial class RSAImplementation
     {
-        public sealed partial class RSASecurityTransforms : RSA, IRuntimeAlgorithm
+        public sealed partial class RSAAppleCrypto : RSA, IRuntimeAlgorithm
         {
             private SecKeyPair? _keys;
 
@@ -24,22 +24,22 @@ public sealed partial class RSASecurityTransforms : RSA, IRuntimeAlgorithm
             // 8192 generated successfully, 8192+8 produced errSecParam.
             private static readonly KeySizes s_legalKeySize = new KeySizes(minSize: 1024, maxSize: 8192, skipSize: 8);
 
-            public RSASecurityTransforms()
+            public RSAAppleCrypto()
                 : this(2048)
             {
             }
 
-            public RSASecurityTransforms(int keySize)
+            public RSAAppleCrypto(int keySize)
             {
                 base.KeySize = keySize;
             }
 
-            internal RSASecurityTransforms(SafeSecKeyRefHandle publicKey)
+            internal RSAAppleCrypto(SafeSecKeyRefHandle publicKey)
             {
                 SetKey(SecKeyPair.PublicOnly(publicKey));
             }
 
-            internal RSASecurityTransforms(SafeSecKeyRefHandle publicKey, SafeSecKeyRefHandle privateKey)
+            internal RSAAppleCrypto(SafeSecKeyRefHandle publicKey, SafeSecKeyRefHandle privateKey)
             {
                 SetKey(SecKeyPair.PublicPrivatePair(publicKey, privateKey));
             }
diff --git a/src/libraries/Common/src/System/Security/Cryptography/RSASecurityTransforms.iOS.cs b/src/libraries/Common/src/System/Security/Cryptography/RSAAppleCrypto.iOS.cs
similarity index 92%
rename from src/libraries/Common/src/System/Security/Cryptography/RSASecurityTransforms.iOS.cs
rename to src/libraries/Common/src/System/Security/Cryptography/RSAAppleCrypto.iOS.cs
index 83211a2f2b5c87..bee86fa7db5ff8 100644
--- a/src/libraries/Common/src/System/Security/Cryptography/RSASecurityTransforms.iOS.cs
+++ b/src/libraries/Common/src/System/Security/Cryptography/RSAAppleCrypto.iOS.cs
@@ -15,7 +15,7 @@ namespace System.Security.Cryptography
 {
     internal static partial class RSAImplementation
     {
-        public sealed partial class RSASecurityTransforms
+        public sealed partial class RSAAppleCrypto
         {
 #pragma warning disable IDE0060
             private static RSAParameters ExportParametersFromLegacyKey(SecKeyPair keys, bool includePrivateParameters)
diff --git a/src/libraries/Common/src/System/Security/Cryptography/RSASecurityTransforms.macOS.cs b/src/libraries/Common/src/System/Security/Cryptography/RSAAppleCrypto.macOS.cs
similarity index 97%
rename from src/libraries/Common/src/System/Security/Cryptography/RSASecurityTransforms.macOS.cs
rename to src/libraries/Common/src/System/Security/Cryptography/RSAAppleCrypto.macOS.cs
index 9913e6515ce89a..68d375f23c68f7 100644
--- a/src/libraries/Common/src/System/Security/Cryptography/RSASecurityTransforms.macOS.cs
+++ b/src/libraries/Common/src/System/Security/Cryptography/RSAAppleCrypto.macOS.cs
@@ -15,7 +15,7 @@ namespace System.Security.Cryptography
 {
     internal static partial class RSAImplementation
     {
-        public sealed partial class RSASecurityTransforms : RSA
+        public sealed partial class RSAAppleCrypto : RSA
         {
             private static RSAParameters ExportParametersFromLegacyKey(SecKeyPair keys, bool includePrivateParameters)
             {
diff --git a/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj b/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj
index aceaf6690a43f9..c55a7454e0d140 100644
--- a/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj
+++ b/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj
@@ -1364,22 +1364,22 @@
              Link="Common\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs" />
     <Compile Include="$(CommonPath)System\Security\Cryptography\CompositeMLDsaImplementation.NotSupported.cs"
              Link="Common\System\Security\Cryptography\CompositeMLDsaImplementation.NotSupported.cs" />
-    <Compile Include="$(CommonPath)System\Security\Cryptography\EccSecurityTransforms.cs"
-             Link="Common\System\Security\Cryptography\EccSecurityTransforms.cs" />
+    <Compile Include="$(CommonPath)System\Security\Cryptography\EccAppleCrypto.cs"
+             Link="Common\System\Security\Cryptography\EccAppleCrypto.cs" />
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDiffieHellmanDerivation.cs"
              Link="Common\System\Security\Cryptography\ECDiffieHellmanDerivation.cs" />
-    <Compile Include="$(CommonPath)System\Security\Cryptography\ECDiffieHellmanSecurityTransforms.cs"
-             Link="Common\System\Security\Cryptography\ECDiffieHellmanSecurityTransforms.cs" />
-    <Compile Include="$(CommonPath)System\Security\Cryptography\ECDsaSecurityTransforms.cs"
-             Link="Common\System\Security\Cryptography\ECDsaSecurityTransforms.cs" />
+    <Compile Include="$(CommonPath)System\Security\Cryptography\ECDiffieHellmanAppleCrypto.cs"
+             Link="Common\System\Security\Cryptography\ECDiffieHellmanAppleCrypto.cs" />
+    <Compile Include="$(CommonPath)System\Security\Cryptography\ECDsaAppleCrypto.cs"
+             Link="Common\System\Security\Cryptography\ECDsaAppleCrypto.cs" />
     <Compile Include="$(CommonPath)System\Security\Cryptography\MLDsaImplementation.NotSupported.cs"
              Link="Common\System\Security\Cryptography\MLDsaImplementation.NotSupported.cs" />
     <Compile Include="$(CommonPath)System\Security\Cryptography\MLKemImplementation.cs"
              Link="Common\System\Security\Cryptography\MLKemImplementation.cs" />
     <Compile Include="$(CommonPath)System\Security\Cryptography\MLKemImplementation.NotSupported.cs"
             Link="Common\System\Security\Cryptography\MLKemImplementation.NotSupported.cs" />
-    <Compile Include="$(CommonPath)System\Security\Cryptography\RSASecurityTransforms.cs"
-             Link="Common\System\Security\Cryptography\RSASecurityTransforms.cs" />
+    <Compile Include="$(CommonPath)System\Security\Cryptography\RSAAppleCrypto.cs"
+             Link="Common\System\Security\Cryptography\RSAAppleCrypto.cs" />
     <Compile Include="$(CommonPath)System\Security\Cryptography\SlhDsaImplementation.NotSupported.cs"
              Link="Common\System\Security\Cryptography\SlhDsaImplementation.NotSupported.cs" />
     <Compile Include="$(CommonPath)System\Security\Cryptography\SP800108HmacCounterKdfImplementationManaged.cs"
@@ -1400,8 +1400,8 @@
     <Compile Include="System\Security\Cryptography\CspKeyContainerInfo.NotSupported.cs" />
     <Compile Include="System\Security\Cryptography\DESCryptoServiceProvider.Unix.cs" />
     <Compile Include="System\Security\Cryptography\DesImplementation.Apple.cs" />
-    <Compile Include="System\Security\Cryptography\ECDiffieHellman.Create.SecurityTransforms.cs" />
-    <Compile Include="System\Security\Cryptography\ECDsa.Create.SecurityTransforms.cs" />
+    <Compile Include="System\Security\Cryptography\ECDiffieHellman.Create.AppleCrypto.cs" />
+    <Compile Include="System\Security\Cryptography\ECDsa.Create.AppleCrypto.cs" />
     <Compile Include="System\Security\Cryptography\HashAlgorithmNames.Apple.cs" />
     <Compile Include="System\Security\Cryptography\HashProviderDispenser.Apple.cs" />
     <Compile Include="System\Security\Cryptography\HKDF.Managed.cs" />
@@ -1416,7 +1416,7 @@
     <Compile Include="System\Security\Cryptography\RandomNumberGeneratorImplementation.Apple.cs" />
     <Compile Include="System\Security\Cryptography\RC2CryptoServiceProvider.Unix.cs" />
     <Compile Include="System\Security\Cryptography\RC2Implementation.Apple.cs" />
-    <Compile Include="System\Security\Cryptography\RSA.Create.SecurityTransforms.cs" />
+    <Compile Include="System\Security\Cryptography\RSA.Create.AppleCrypto.cs" />
     <Compile Include="System\Security\Cryptography\RSACryptoServiceProvider.Unix.cs" />
     <Compile Include="System\Security\Cryptography\Shake128.NonWindows.cs" />
     <Compile Include="System\Security\Cryptography\Shake256.NonWindows.cs" />
@@ -1450,10 +1450,10 @@
              Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecKeyRef.macOS.cs" />
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.X509.macOS.cs"
              Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.X509.macOS.cs" />
-    <Compile Include="$(CommonPath)System\Security\Cryptography\EccSecurityTransforms.macOS.cs"
-             Link="Common\System\Security\Cryptography\EccSecurityTransforms.macOS.cs" />
-    <Compile Include="$(CommonPath)System\Security\Cryptography\RSASecurityTransforms.macOS.cs"
-             Link="Common\System\Security\Cryptography\RSASecurityTransforms.macOS.cs" />
+    <Compile Include="$(CommonPath)System\Security\Cryptography\EccAppleCrypto.macOS.cs"
+             Link="Common\System\Security\Cryptography\EccAppleCrypto.macOS.cs" />
+    <Compile Include="$(CommonPath)System\Security\Cryptography\RSAAppleCrypto.macOS.cs"
+             Link="Common\System\Security\Cryptography\RSAAppleCrypto.macOS.cs" />
     <Compile Include="System\Security\Cryptography\AesCcm.NotSupported.cs" />
     <Compile Include="System\Security\Cryptography\DSA.Create.NotSupported.cs" />
     <Compile Include="System\Security\Cryptography\DSACryptoServiceProvider.Unix.cs" />
@@ -1475,10 +1475,10 @@
              Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Keychain.iOS.cs" />
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.X509.iOS.cs"
              Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.X509.iOS.cs" />
-    <Compile Include="$(CommonPath)System\Security\Cryptography\EccSecurityTransforms.iOS.cs"
-             Link="Common\System\Security\Cryptography\EccSecurityTransforms.iOS.cs" />
-    <Compile Include="$(CommonPath)System\Security\Cryptography\RSASecurityTransforms.iOS.cs"
-             Link="Common\System\Security\Cryptography\RSASecurityTransforms.iOS.cs" />
+    <Compile Include="$(CommonPath)System\Security\Cryptography\EccAppleCrypto.iOS.cs"
+             Link="Common\System\Security\Cryptography\EccAppleCrypto.iOS.cs" />
+    <Compile Include="$(CommonPath)System\Security\Cryptography\RSAAppleCrypto.iOS.cs"
+             Link="Common\System\Security\Cryptography\RSAAppleCrypto.iOS.cs" />
     <Compile Include="System\Security\Cryptography\AesCcm.NotSupported.cs" />
     <Compile Include="System\Security\Cryptography\DSA.Create.NotSupported.cs" />
     <Compile Include="System\Security\Cryptography\DSACryptoServiceProvider.NotSupported.cs" />
diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/ECDiffieHellman.Create.SecurityTransforms.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/ECDiffieHellman.Create.AppleCrypto.cs
similarity index 97%
rename from src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/ECDiffieHellman.Create.SecurityTransforms.cs
rename to src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/ECDiffieHellman.Create.AppleCrypto.cs
index b7e4db2aba097c..d9c7f87985036e 100644
--- a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/ECDiffieHellman.Create.SecurityTransforms.cs
+++ b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/ECDiffieHellman.Create.AppleCrypto.cs
@@ -7,7 +7,7 @@ public abstract partial class ECDiffieHellman : ECAlgorithm
     {
         public static new partial ECDiffieHellman Create()
         {
-            return new ECDiffieHellmanImplementation.ECDiffieHellmanSecurityTransforms();
+            return new ECDiffieHellmanImplementation.ECDiffieHellmanAppleCrypto();
         }
 
         public static partial ECDiffieHellman Create(ECCurve curve)
diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/ECDsa.Create.SecurityTransforms.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/ECDsa.Create.AppleCrypto.cs
similarity index 96%
rename from src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/ECDsa.Create.SecurityTransforms.cs
rename to src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/ECDsa.Create.AppleCrypto.cs
index 0aa9a1b71b8e0e..469fa4e00088a2 100644
--- a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/ECDsa.Create.SecurityTransforms.cs
+++ b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/ECDsa.Create.AppleCrypto.cs
@@ -10,7 +10,7 @@ public partial class ECDsa : ECAlgorithm
         /// </summary>
         public static new partial ECDsa Create()
         {
-            return new ECDsaImplementation.ECDsaSecurityTransforms();
+            return new ECDsaImplementation.ECDsaAppleCrypto();
         }
 
         /// <summary>
diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/RSA.Create.SecurityTransforms.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/RSA.Create.AppleCrypto.cs
similarity index 82%
rename from src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/RSA.Create.SecurityTransforms.cs
rename to src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/RSA.Create.AppleCrypto.cs
index a53e3e1b3cf3ae..2645dffae3048e 100644
--- a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/RSA.Create.SecurityTransforms.cs
+++ b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/RSA.Create.AppleCrypto.cs
@@ -7,7 +7,7 @@ public partial class RSA : AsymmetricAlgorithm
     {
         public static new partial RSA Create()
         {
-            return new RSAImplementation.RSASecurityTransforms();
+            return new RSAImplementation.RSAAppleCrypto();
         }
     }
 }
diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/RSACryptoServiceProvider.Unix.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/RSACryptoServiceProvider.Unix.cs
index c2797ed2701ab9..27456d7e54a950 100644
--- a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/RSACryptoServiceProvider.Unix.cs
+++ b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/RSACryptoServiceProvider.Unix.cs
@@ -163,7 +163,7 @@ public override int KeySize
             set { _impl.KeySize = value; }
         }
 
-        // RSAOpenSsl is (512, 16384, 8), RSASecurityTransforms is (1024, 16384, 8)
+        // RSAOpenSsl is (512, 16384, 8), RSAAppleCrypto is (1024, 16384, 8)
         // Either way the minimum is lifted off of CAPI's 384, due to platform constraints.
         public override KeySizes[] LegalKeySizes => _impl.LegalKeySizes;
 
diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/AppleCertificatePal.Keys.macOS.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/AppleCertificatePal.Keys.macOS.cs
index ebc06e7b5d7744..75f22a3ef3e910 100644
--- a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/AppleCertificatePal.Keys.macOS.cs
+++ b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/AppleCertificatePal.Keys.macOS.cs
@@ -26,7 +26,7 @@ public ICertificatePal CopyWithPrivateKey(DSA privateKey)
 
         public ICertificatePal CopyWithPrivateKey(ECDsa privateKey)
         {
-            var typedKey = privateKey as ECDsaImplementation.ECDsaSecurityTransforms;
+            var typedKey = privateKey as ECDsaImplementation.ECDsaAppleCrypto;
             byte[] ecPrivateKey;
 
             if (typedKey != null)
@@ -61,7 +61,7 @@ public ICertificatePal CopyWithPrivateKey(ECDsa privateKey)
 
         public ICertificatePal CopyWithPrivateKey(ECDiffieHellman privateKey)
         {
-            var typedKey = privateKey as ECDiffieHellmanImplementation.ECDiffieHellmanSecurityTransforms;
+            var typedKey = privateKey as ECDiffieHellmanImplementation.ECDiffieHellmanAppleCrypto;
             byte[] ecPrivateKey;
 
             if (typedKey != null)
@@ -102,7 +102,7 @@ public ICertificatePal CopyWithPrivateKey(MLDsa privateKey)
 
         public ICertificatePal CopyWithPrivateKey(RSA privateKey)
         {
-            var typedKey = privateKey as RSAImplementation.RSASecurityTransforms;
+            var typedKey = privateKey as RSAImplementation.RSAAppleCrypto;
 
             if (typedKey != null)
             {
diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/AppleCertificatePal.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/AppleCertificatePal.cs
index e1ef814155b747..397d1f530008e0 100644
--- a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/AppleCertificatePal.cs
+++ b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/AppleCertificatePal.cs
@@ -333,7 +333,7 @@ public byte[] SubjectPublicKeyInfo
             privateKey.SetParentHandle(_certHandle);
             Debug.Assert(!publicKey.IsInvalid);
 
-            return new RSAImplementation.RSASecurityTransforms(publicKey, privateKey);
+            return new RSAImplementation.RSAAppleCrypto(publicKey, privateKey);
         }
 
         public ECDsa? GetECDsaPrivateKey()
@@ -347,7 +347,7 @@ public byte[] SubjectPublicKeyInfo
             privateKey.SetParentHandle(_certHandle);
             Debug.Assert(!publicKey.IsInvalid);
 
-            return new ECDsaImplementation.ECDsaSecurityTransforms(publicKey, privateKey);
+            return new ECDsaImplementation.ECDsaAppleCrypto(publicKey, privateKey);
         }
 
         public ECDiffieHellman? GetECDiffieHellmanPrivateKey()
@@ -361,7 +361,7 @@ public byte[] SubjectPublicKeyInfo
             privateKey.SetParentHandle(_certHandle);
             Debug.Assert(!publicKey.IsInvalid);
 
-            return new ECDiffieHellmanImplementation.ECDiffieHellmanSecurityTransforms(publicKey, privateKey);
+            return new ECDiffieHellmanImplementation.ECDiffieHellmanAppleCrypto(publicKey, privateKey);
         }
 
         public MLDsa? GetMLDsaPrivateKey()
diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509CertificateLoader.iOS.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509CertificateLoader.iOS.cs
index a6e507864b33d0..3ca49bbdbedc5c 100644
--- a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509CertificateLoader.iOS.cs
+++ b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509CertificateLoader.iOS.cs
@@ -112,11 +112,11 @@ private static partial Pkcs12Return FromCertAndKey(CertAndKey certAndKey, Import
                 case Oids.Rsa or Oids.RsaPss:
                     return new AsymmetricAlgorithmPkcs12PrivateKey(
                         pkcs8,
-                        static () => new RSAImplementation.RSASecurityTransforms());
+                        static () => new RSAImplementation.RSAAppleCrypto());
                 case Oids.EcPublicKey or Oids.EcDiffieHellman:
                     return new AsymmetricAlgorithmPkcs12PrivateKey(
                         pkcs8,
-                        static () => new ECDsaImplementation.ECDsaSecurityTransforms());
+                        static () => new ECDsaImplementation.ECDsaAppleCrypto());
 
                 default:
                     // No DSA or PQC support on iOS / tvOS.
diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509CertificateLoader.macOS.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509CertificateLoader.macOS.cs
index dc652e06322156..3f0ec1eeb93f77 100644
--- a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509CertificateLoader.macOS.cs
+++ b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509CertificateLoader.macOS.cs
@@ -139,11 +139,11 @@ private static partial Pkcs12Return FromCertAndKey(CertAndKey certAndKey, Import
                 case Oids.Rsa or Oids.RsaPss:
                     return new AsymmetricAlgorithmPkcs12PrivateKey(
                         pkcs8,
-                        static () => new RSAImplementation.RSASecurityTransforms());
+                        static () => new RSAImplementation.RSAAppleCrypto());
                 case Oids.EcPublicKey or Oids.EcDiffieHellman:
                     return new AsymmetricAlgorithmPkcs12PrivateKey(
                         pkcs8,
-                        static () => new ECDsaImplementation.ECDsaSecurityTransforms());
+                        static () => new ECDsaImplementation.ECDsaAppleCrypto());
                 default:
                     // No DSA or PQC support on macOS.
                     return null;
@@ -157,7 +157,7 @@ private static partial Pkcs12Return FromCertAndKey(CertAndKey certAndKey, Import
                 return null;
             }
 
-            if (key.Key is RSAImplementation.RSASecurityTransforms rsa)
+            if (key.Key is RSAImplementation.RSAAppleCrypto rsa)
             {
                 byte[] rsaPrivateKey = rsa.ExportRSAPrivateKey();
                 using (PinAndClear.Track(rsaPrivateKey))
@@ -166,7 +166,7 @@ private static partial Pkcs12Return FromCertAndKey(CertAndKey certAndKey, Import
                 }
             }
 
-            if (key.Key is ECDsaImplementation.ECDsaSecurityTransforms ecdsa)
+            if (key.Key is ECDsaImplementation.ECDsaAppleCrypto ecdsa)
             {
                 byte[] ecdsaPrivateKey = ecdsa.ExportECPrivateKey();
                 using (PinAndClear.Track(ecdsaPrivateKey))
diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509Pal.Apple.ECKey.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509Pal.Apple.ECKey.cs
index 01627dfdb2ddf9..3915b9008df6be 100644
--- a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509Pal.Apple.ECKey.cs
+++ b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509Pal.Apple.ECKey.cs
@@ -11,12 +11,12 @@ private sealed partial class AppleX509Pal : IX509Pal
         {
             public ECDsa DecodeECDsaPublicKey(ICertificatePal? certificatePal)
             {
-                return new ECDsaImplementation.ECDsaSecurityTransforms(DecodeECPublicKey(certificatePal));
+                return new ECDsaImplementation.ECDsaAppleCrypto(DecodeECPublicKey(certificatePal));
             }
 
             public ECDiffieHellman DecodeECDiffieHellmanPublicKey(ICertificatePal? certificatePal)
             {
-                return new ECDiffieHellmanImplementation.ECDiffieHellmanSecurityTransforms(DecodeECPublicKey(certificatePal));
+                return new ECDiffieHellmanImplementation.ECDiffieHellmanAppleCrypto(DecodeECPublicKey(certificatePal));
             }
 
             private static SafeSecKeyRefHandle DecodeECPublicKey(ICertificatePal? certificatePal)
diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509Pal.iOS.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509Pal.iOS.cs
index d7ed8dafa04031..797d6362ef3de7 100644
--- a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509Pal.iOS.cs
+++ b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509Pal.iOS.cs
@@ -27,7 +27,7 @@ public AsymmetricAlgorithm DecodePublicKey(Oid oid, byte[] encodedKeyValue, byte
                 {
                     SafeSecKeyRefHandle key = Interop.AppleCrypto.X509GetPublicKey(applePal.CertificateHandle);
                     Debug.Assert(!key.IsInvalid);
-                    return new RSAImplementation.RSASecurityTransforms(key);
+                    return new RSAImplementation.RSAAppleCrypto(key);
                 }
                 else
                 {
diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509Pal.macOS.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509Pal.macOS.cs
index e67c70a2d4e69f..7ef34281c08eae 100644
--- a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509Pal.macOS.cs
+++ b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/X509Pal.macOS.cs
@@ -32,7 +32,7 @@ public AsymmetricAlgorithm DecodePublicKey(Oid oid, byte[] encodedKeyValue, byte
                     if (oid.Value == Oids.Rsa)
                     {
                         Debug.Assert(!key.IsInvalid);
-                        return new RSAImplementation.RSASecurityTransforms(key);
+                        return new RSAImplementation.RSAAppleCrypto(key);
                     }
 
                     key.Dispose();