diff --git a/Build/Consts.cs b/Build/Consts.cs
index 965100be5..8b27b9eb7 100644
--- a/Build/Consts.cs
+++ b/Build/Consts.cs
@@ -53,7 +53,7 @@ public static class Consts
       ]
     ),
     new(
-      "tekla-structures",
+      "teklastructures",
       [
         new("Connectors/Tekla/Speckle.Connector.Tekla2023", "net48"),
         new("Connectors/Tekla/Speckle.Connector.Tekla2024", "net48")
diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/CorridorHandler.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/CorridorHandler.cs
index 371f614b4..d55ea3343 100644
--- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/CorridorHandler.cs
+++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/CorridorHandler.cs
@@ -91,7 +91,7 @@ CDB.FeatureLineCollection mainFeaturelineCollection in baseline
       }
       if (mainFeatureLines.Count > 0)
       {
-        convertedBaseline["mainBaselineFeatureLines"] = mainFeatureLines;
+        convertedBaseline["@mainBaselineFeatureLines"] = mainFeatureLines;
       }
 
       List<Base> offsetFeatureLines = new();
@@ -109,7 +109,7 @@ CDB.FeatureLineCollection featurelineCollection in offsetFeaturelineCollection.F
       }
       if (offsetFeatureLines.Count > 0)
       {
-        convertedBaseline["offsetBaselineFeatureLines"] = mainFeatureLines;
+        convertedBaseline["@offsetBaselineFeatureLines"] = mainFeatureLines;
       }
 
       // get the baseline regions
@@ -220,7 +220,7 @@ out List<SOG.Mesh>? display
           {
             string subassemblyId = appliedSubassembly.SubassemblyId.GetSpeckleApplicationId();
             string name = subassemblyNameCache.TryGetValue(appliedSubassembly.SubassemblyId, out string? cachedName)
-              ? cachedName
+              ? cachedName!
               : subassemblyId;
 
             Dictionary<string, object?> appliedSubassemblyDict =