diff --git a/ChocolArm64/Instructions/InstEmitSimdArithmetic.cs b/ChocolArm64/Instructions/InstEmitSimdArithmetic.cs
index eef7005858..e97da6378c 100644
--- a/ChocolArm64/Instructions/InstEmitSimdArithmetic.cs
+++ b/ChocolArm64/Instructions/InstEmitSimdArithmetic.cs
@@ -211,7 +211,7 @@ namespace ChocolArm64.Instructions
             {
                 EmitScalarBinaryOpF(context, () =>
                 {
-                    EmitSoftFloatCall(context, nameof(ASoftFloat32.FPAdd));
+                    EmitSoftFloatCall(context, nameof(SoftFloat32.FPAdd));
                 });
             }
         }
@@ -227,7 +227,7 @@ namespace ChocolArm64.Instructions
             {
                 EmitVectorBinaryOpF(context, () =>
                 {
-                    EmitSoftFloatCall(context, nameof(ASoftFloat32.FPAdd));
+                    EmitSoftFloatCall(context, nameof(SoftFloat32.FPAdd));
                 });
             }
         }
@@ -262,7 +262,7 @@ namespace ChocolArm64.Instructions
             {
                 EmitScalarBinaryOpF(context, () =>
                 {
-                    EmitSoftFloatCall(context, nameof(ASoftFloat32.FPDiv));
+                    EmitSoftFloatCall(context, nameof(SoftFloat32.FPDiv));
                 });
             }
         }
@@ -278,7 +278,7 @@ namespace ChocolArm64.Instructions
             {
                 EmitVectorBinaryOpF(context, () =>
                 {
-                    EmitSoftFloatCall(context, nameof(ASoftFloat32.FPDiv));
+                    EmitSoftFloatCall(context, nameof(SoftFloat32.FPDiv));
                 });
             }
         }
@@ -324,7 +324,7 @@ namespace ChocolArm64.Instructions
             {
                 EmitScalarTernaryRaOpF(context, () =>
                 {
-                    EmitSoftFloatCall(context, nameof(ASoftFloat32.FPMulAdd));
+                    EmitSoftFloatCall(context, nameof(SoftFloat32.FPMulAdd));
                 });
             }
         }
@@ -340,7 +340,7 @@ namespace ChocolArm64.Instructions
             {
                 EmitScalarBinaryOpF(context, () =>
                 {
-                    EmitSoftFloatCall(context, nameof(ASoftFloat32.FPMax));
+                    EmitSoftFloatCall(context, nameof(SoftFloat32.FPMax));
                 });
             }
         }
@@ -356,7 +356,7 @@ namespace ChocolArm64.Instructions
             {
                 EmitVectorBinaryOpF(context, () =>
                 {
-                    EmitSoftFloatCall(context, nameof(ASoftFloat32.FPMax));
+                    EmitSoftFloatCall(context, nameof(SoftFloat32.FPMax));
                 });
             }
         }
@@ -365,7 +365,7 @@ namespace ChocolArm64.Instructions
         {
             EmitScalarBinaryOpF(context, () =>
             {
-                EmitSoftFloatCall(context, nameof(ASoftFloat32.FPMaxNum));
+                EmitSoftFloatCall(context, nameof(SoftFloat32.FPMaxNum));
             });
         }
 
@@ -373,7 +373,7 @@ namespace ChocolArm64.Instructions
         {
             EmitVectorBinaryOpF(context, () =>
             {
-                EmitSoftFloatCall(context, nameof(ASoftFloat32.FPMaxNum));
+                EmitSoftFloatCall(context, nameof(SoftFloat32.FPMaxNum));
             });
         }
 
@@ -381,7 +381,7 @@ namespace ChocolArm64.Instructions
         {
             EmitVectorPairwiseOpF(context, () =>
             {
-                EmitSoftFloatCall(context, nameof(ASoftFloat32.FPMax));
+                EmitSoftFloatCall(context, nameof(SoftFloat32.FPMax));
             });
         }
 
@@ -396,7 +396,7 @@ namespace ChocolArm64.Instructions
             {
                 EmitScalarBinaryOpF(context, () =>
                 {
-                    EmitSoftFloatCall(context, nameof(ASoftFloat32.FPMin));
+                    EmitSoftFloatCall(context, nameof(SoftFloat32.FPMin));
                 });
             }
         }
@@ -412,7 +412,7 @@ namespace ChocolArm64.Instructions
             {
                 EmitVectorBinaryOpF(context, () =>
                 {
-                    EmitSoftFloatCall(context, nameof(ASoftFloat32.FPMin));
+                    EmitSoftFloatCall(context, nameof(SoftFloat32.FPMin));
                 });
             }
         }
@@ -421,7 +421,7 @@ namespace ChocolArm64.Instructions
         {
             EmitScalarBinaryOpF(context, () =>
             {
-                EmitSoftFloatCall(context, nameof(ASoftFloat32.FPMinNum));
+                EmitSoftFloatCall(context, nameof(SoftFloat32.FPMinNum));
             });
         }
 
@@ -429,7 +429,7 @@ namespace ChocolArm64.Instructions
         {
             EmitVectorBinaryOpF(context, () =>
             {
-                EmitSoftFloatCall(context, nameof(ASoftFloat32.FPMinNum));
+                EmitSoftFloatCall(context, nameof(SoftFloat32.FPMinNum));
             });
         }
 
@@ -437,7 +437,7 @@ namespace ChocolArm64.Instructions
         {
             EmitVectorPairwiseOpF(context, () =>
             {
-                EmitSoftFloatCall(context, nameof(ASoftFloat32.FPMin));
+                EmitSoftFloatCall(context, nameof(SoftFloat32.FPMin));
             });
         }
 
@@ -536,7 +536,7 @@ namespace ChocolArm64.Instructions
             {
                 EmitScalarTernaryRaOpF(context, () =>
                 {
-                    EmitSoftFloatCall(context, nameof(ASoftFloat32.FPMulSub));
+                    EmitSoftFloatCall(context, nameof(SoftFloat32.FPMulSub));
                 });
             }
         }
@@ -552,7 +552,7 @@ namespace ChocolArm64.Instructions
             {
                 EmitScalarBinaryOpF(context, () =>
                 {
-                    EmitSoftFloatCall(context, nameof(ASoftFloat32.FPMul));
+                    EmitSoftFloatCall(context, nameof(SoftFloat32.FPMul));
                 });
             }
         }
@@ -573,7 +573,7 @@ namespace ChocolArm64.Instructions
             {
                 EmitVectorBinaryOpF(context, () =>
                 {
-                    EmitSoftFloatCall(context, nameof(ASoftFloat32.FPMul));
+                    EmitSoftFloatCall(context, nameof(SoftFloat32.FPMul));
                 });
             }
         }
@@ -587,7 +587,7 @@ namespace ChocolArm64.Instructions
         {
             EmitScalarBinaryOpF(context, () =>
             {
-                EmitSoftFloatCall(context, nameof(ASoftFloat32.FPMulX));
+                EmitSoftFloatCall(context, nameof(SoftFloat32.FPMulX));
             });
         }
 
@@ -595,7 +595,7 @@ namespace ChocolArm64.Instructions
         {
             EmitScalarBinaryOpByElemF(context, () =>
             {
-                EmitSoftFloatCall(context, nameof(ASoftFloat32.FPMulX));
+                EmitSoftFloatCall(context, nameof(SoftFloat32.FPMulX));
             });
         }
 
@@ -603,7 +603,7 @@ namespace ChocolArm64.Instructions
         {
             EmitVectorBinaryOpF(context, () =>
             {
-                EmitSoftFloatCall(context, nameof(ASoftFloat32.FPMulX));
+                EmitSoftFloatCall(context, nameof(SoftFloat32.FPMulX));
             });
         }
 
@@ -611,7 +611,7 @@ namespace ChocolArm64.Instructions
         {
             EmitVectorBinaryOpByElemF(context, () =>
             {
-                EmitSoftFloatCall(context, nameof(ASoftFloat32.FPMulX));
+                EmitSoftFloatCall(context, nameof(SoftFloat32.FPMulX));
             });
         }
 
@@ -738,7 +738,7 @@ namespace ChocolArm64.Instructions
             {
                 EmitScalarBinaryOpF(context, () =>
                 {
-                    EmitSoftFloatCall(context, nameof(ASoftFloat32.FPRecipStepFused));
+                    EmitSoftFloatCall(context, nameof(SoftFloat32.FPRecipStepFused));
                 });
             }
         }
@@ -793,7 +793,7 @@ namespace ChocolArm64.Instructions
             {
                 EmitVectorBinaryOpF(context, () =>
                 {
-                    EmitSoftFloatCall(context, nameof(ASoftFloat32.FPRecipStepFused));
+                    EmitSoftFloatCall(context, nameof(SoftFloat32.FPRecipStepFused));
                 });
             }
         }
@@ -802,7 +802,7 @@ namespace ChocolArm64.Instructions
         {
             EmitScalarUnaryOpF(context, () =>
             {
-                EmitSoftFloatCall(context, nameof(ASoftFloat32.FPRecpX));
+                EmitSoftFloatCall(context, nameof(SoftFloat32.FPRecpX));
             });
         }
 
@@ -1043,7 +1043,7 @@ namespace ChocolArm64.Instructions
             {
                 EmitScalarBinaryOpF(context, () =>
                 {
-                    EmitSoftFloatCall(context, nameof(ASoftFloat32.FprSqrtStepFused));
+                    EmitSoftFloatCall(context, nameof(SoftFloat32.FprSqrtStepFused));
                 });
             }
         }
@@ -1106,7 +1106,7 @@ namespace ChocolArm64.Instructions
             {
                 EmitVectorBinaryOpF(context, () =>
                 {
-                    EmitSoftFloatCall(context, nameof(ASoftFloat32.FprSqrtStepFused));
+                    EmitSoftFloatCall(context, nameof(SoftFloat32.FprSqrtStepFused));
                 });
             }
         }
@@ -1122,7 +1122,7 @@ namespace ChocolArm64.Instructions
             {
                 EmitScalarUnaryOpF(context, () =>
                 {
-                    EmitSoftFloatCall(context, nameof(ASoftFloat32.FPSqrt));
+                    EmitSoftFloatCall(context, nameof(SoftFloat32.FPSqrt));
                 });
             }
         }
@@ -1138,7 +1138,7 @@ namespace ChocolArm64.Instructions
             {
                 EmitVectorUnaryOpF(context, () =>
                 {
-                    EmitSoftFloatCall(context, nameof(ASoftFloat32.FPSqrt));
+                    EmitSoftFloatCall(context, nameof(SoftFloat32.FPSqrt));
                 });
             }
         }
@@ -1154,7 +1154,7 @@ namespace ChocolArm64.Instructions
             {
                 EmitScalarBinaryOpF(context, () =>
                 {
-                    EmitSoftFloatCall(context, nameof(ASoftFloat32.FPSub));
+                    EmitSoftFloatCall(context, nameof(SoftFloat32.FPSub));
                 });
             }
         }
@@ -1170,7 +1170,7 @@ namespace ChocolArm64.Instructions
             {
                 EmitVectorBinaryOpF(context, () =>
                 {
-                    EmitSoftFloatCall(context, nameof(ASoftFloat32.FPSub));
+                    EmitSoftFloatCall(context, nameof(SoftFloat32.FPSub));
                 });
             }
         }
diff --git a/ChocolArm64/Instructions/InstEmitSimdCvt.cs b/ChocolArm64/Instructions/InstEmitSimdCvt.cs
index 0bc9428872..0c791721dd 100644
--- a/ChocolArm64/Instructions/InstEmitSimdCvt.cs
+++ b/ChocolArm64/Instructions/InstEmitSimdCvt.cs
@@ -89,7 +89,7 @@ namespace ChocolArm64.Instructions
 
                     context.EmitLdarg(TranslatedSub.StateArgIdx);
 
-                    context.EmitCall(typeof(ASoftFloat1632), nameof(ASoftFloat1632.FPConvert));
+                    context.EmitCall(typeof(SoftFloat1632), nameof(SoftFloat1632.FPConvert));
                 }
                 else /* if (SizeF == 1) */
                 {
@@ -139,7 +139,7 @@ namespace ChocolArm64.Instructions
                 {
                     context.EmitLdarg(TranslatedSub.StateArgIdx);
 
-                    context.EmitCall(typeof(ASoftFloat3216), nameof(ASoftFloat3216.FPConvert));
+                    context.EmitCall(typeof(SoftFloat3216), nameof(SoftFloat3216.FPConvert));
 
                     context.Emit(OpCodes.Conv_U8);
                     EmitVectorInsertTmp(context, part + index, 1);
diff --git a/ChocolArm64/Instructions/InstEmitSimdHelper.cs b/ChocolArm64/Instructions/InstEmitSimdHelper.cs
index 5ba55aeead..ac28b9a4fa 100644
--- a/ChocolArm64/Instructions/InstEmitSimdHelper.cs
+++ b/ChocolArm64/Instructions/InstEmitSimdHelper.cs
@@ -347,8 +347,8 @@ namespace ChocolArm64.Instructions
             IOpCodeSimd op = (IOpCodeSimd)context.CurrOp;
 
             Type type = (op.Size & 1) == 0
-                ? typeof(ASoftFloat32)
-                : typeof(ASoftFloat64);
+                ? typeof(SoftFloat32)
+                : typeof(SoftFloat64);
 
             context.EmitLdarg(TranslatedSub.StateArgIdx);
 
diff --git a/ChocolArm64/Instructions/SoftFloat.cs b/ChocolArm64/Instructions/SoftFloat.cs
index c62d5b2341..79dbe95410 100644
--- a/ChocolArm64/Instructions/SoftFloat.cs
+++ b/ChocolArm64/Instructions/SoftFloat.cs
@@ -197,7 +197,7 @@ namespace ChocolArm64.Instructions
         }
     }
 
-    static class ASoftFloat1632
+    static class SoftFloat1632
     {
         public static float FPConvert(ushort valueBits, CpuThreadState state)
         {
@@ -448,7 +448,7 @@ namespace ChocolArm64.Instructions
         }
     }
 
-    static class ASoftFloat3216
+    static class SoftFloat3216
     {
         public static ushort FPConvert(float value, CpuThreadState state)
         {
@@ -727,7 +727,7 @@ namespace ChocolArm64.Instructions
         }
     }
 
-    static class ASoftFloat32
+    static class SoftFloat32
     {
         public static float FPAdd(float value1, float value2, CpuThreadState state)
         {
@@ -1426,7 +1426,7 @@ namespace ChocolArm64.Instructions
         }
     }
 
-    static class ASoftFloat64
+    static class SoftFloat64
     {
         public static double FPAdd(double value1, double value2, CpuThreadState state)
         {