diff --git a/src/Microsoft.Health.Fhir.CodeGen/Language/Firely/CSharpFirely2.cs b/src/Microsoft.Health.Fhir.CodeGen/Language/Firely/CSharpFirely2.cs
index c96fd9b06..cbf52971b 100644
--- a/src/Microsoft.Health.Fhir.CodeGen/Language/Firely/CSharpFirely2.cs
+++ b/src/Microsoft.Health.Fhir.CodeGen/Language/Firely/CSharpFirely2.cs
@@ -1535,8 +1535,6 @@ private void WriteInterfaceComponent(
 
         string fhirTypeConstructor = $"\"{complexName}\",\"{complex.cgUrl()}\"";
 
-        //_writer.WriteLineIndented($"[FhirType({fhirTypeConstructor}, IsResource=true)]");
-
         StructureDefinition? parentInterface = _info.GetParentInterface(complex.Structure);
 
         if (parentInterface == null)
@@ -1868,15 +1866,7 @@ private void WriteComponent(
         WriteSerializable();
 
         string fhirTypeConstructor = $"\"{complexName}\",\"{complex.cgUrl()}\"";
-
-        if (isResource)
-        {
-            _writer.WriteLineIndented($"[FhirType({fhirTypeConstructor}, IsResource=true)]");
-        }
-        else
-        {
-            _writer.WriteLineIndented($"[FhirType({fhirTypeConstructor})]");
-        }
+        _writer.WriteLineIndented($"[FhirType({fhirTypeConstructor})]");
 
         var isPatientClass = false;
 
@@ -2646,16 +2636,10 @@ private void WriteBackboneComponent(
         */
 
         bool useConcatenationInName = complex.Structure.Name == "Citation";
-
-        string explicitNamePart = string.IsNullOrEmpty(explicitName)
-            ? complex.cgName(NamingConvention.PascalCase, useConcatenationInName, useConcatenationInName)
-            : explicitName;
-        string componentName = parentExportName + "#" + explicitNamePart;
+        string componentName = complex.Element.Path;
 
         WriteSerializable();
-        _writer.WriteLineIndented($"[FhirType(\"{componentName}\", IsNestedType=true)]");
-
-        _writer.WriteLineIndented($"[BackboneType(\"{complex.Element.Path}\")]");
+        _writer.WriteLineIndented($"[FhirType(\"{componentName}\", IsBackboneType=true)]");
 
         _writer.WriteLineIndented(
             $"public partial class" +