diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Components/SpeckleReceiver.cs b/Packages/systems.speckle.speckle-unity/Runtime/Components/SpeckleReceiver.cs
index 649ad1b..4058f96 100644
--- a/Packages/systems.speckle.speckle-unity/Runtime/Components/SpeckleReceiver.cs
+++ b/Packages/systems.speckle.speckle-unity/Runtime/Components/SpeckleReceiver.cs
@@ -291,13 +291,13 @@ namespace Speckle.ConnectorUnity.Components
         
         public void Awake()
         {
-            CoreUtils.SetupInit();
             Converter = GetComponent<RecursiveConverter>();
             Initialise(true);
         }
 
         protected void Initialise(bool forceRefresh = false)
         {
+            CoreUtils.SetupInit();
             Account ??= new AccountSelection();
             Stream ??= new StreamSelection(Account);
             Branch ??= new BranchSelection(Stream);
diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Components/SpeckleSender.cs b/Packages/systems.speckle.speckle-unity/Runtime/Components/SpeckleSender.cs
index 667d986..43867ae 100644
--- a/Packages/systems.speckle.speckle-unity/Runtime/Components/SpeckleSender.cs
+++ b/Packages/systems.speckle.speckle-unity/Runtime/Components/SpeckleSender.cs
@@ -179,13 +179,13 @@ namespace Speckle.ConnectorUnity.Components
         
         public void Awake()
         {
-            CoreUtils.SetupInit();
             Initialise(true);
             Converter = GetComponent<RecursiveConverter>();
         }
         
         protected void Initialise(bool forceRefresh = false)
         {
+            CoreUtils.SetupInit();
             Account ??= new AccountSelection();
             Stream ??= new StreamSelection(Account);
             Branch ??= new BranchSelection(Stream);
diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Converter/Unity/ConverterUnity.Geometry.cs b/Packages/systems.speckle.speckle-unity/Runtime/Converter/Unity/ConverterUnity.Geometry.cs
index d6c08e1..155097a 100644
--- a/Packages/systems.speckle.speckle-unity/Runtime/Converter/Unity/ConverterUnity.Geometry.cs
+++ b/Packages/systems.speckle.speckle-unity/Runtime/Converter/Unity/ConverterUnity.Geometry.cs
@@ -252,7 +252,7 @@ namespace Objects.Converter.Unity
                 if(!TryGetMeshFromCache(instance.definition, meshes, out Mesh? nativeMesh, out _))
                 {
                     MeshToNativeMesh(meshes, out nativeMesh);
-                    string name = AssetHelpers.GetObjectName(instance.definition);
+                    string name = AssetHelpers.GenerateObjectName(instance.definition);
                     nativeMesh.name = name;
                     LoadedAssets.TrySaveObject(instance.definition, nativeMesh);
                 }
diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Converter/Unity/ConverterUnity.Mesh.cs b/Packages/systems.speckle.speckle-unity/Runtime/Converter/Unity/ConverterUnity.Mesh.cs
index 0e0c07f..4c15d03 100644
--- a/Packages/systems.speckle.speckle-unity/Runtime/Converter/Unity/ConverterUnity.Mesh.cs
+++ b/Packages/systems.speckle.speckle-unity/Runtime/Converter/Unity/ConverterUnity.Mesh.cs
@@ -223,7 +223,7 @@ namespace Objects.Converter.Unity
             {
                 //Convert a new one
                 MeshToNativeMesh(meshes, out nativeMesh, out center);
-                string name = AssetHelpers.GetObjectName(element);
+                string name = AssetHelpers.GenerateObjectName(element);
                 nativeMesh.name = name;
                 LoadedAssets.TrySaveObject(element, nativeMesh);
             }
@@ -483,7 +483,7 @@ namespace Objects.Converter.Unity
             
             var c = renderMaterial.diffuse.ToUnityColor();
             mat.color = new Color(c.r, c.g, c.b, (float) renderMaterial.opacity);
-            mat.name = AssetHelpers.GetObjectName(renderMaterial);
+            mat.name = AssetHelpers.GenerateObjectName(renderMaterial);
             mat.SetFloat(Metallic, (float) renderMaterial.metalness);
             mat.SetFloat(Glossiness, 1 - (float) renderMaterial.roughness);
             if (renderMaterial.emissive != SColor.Black.ToArgb()) mat.EnableKeyword("_EMISSION");
diff --git a/Packages/systems.speckle.speckle-unity/Runtime/NativeCache/AbstractNativeCache.cs b/Packages/systems.speckle.speckle-unity/Runtime/NativeCache/AbstractNativeCache.cs
index 05d3f50..34f4d55 100644
--- a/Packages/systems.speckle.speckle-unity/Runtime/NativeCache/AbstractNativeCache.cs
+++ b/Packages/systems.speckle.speckle-unity/Runtime/NativeCache/AbstractNativeCache.cs
@@ -69,7 +69,7 @@ namespace Speckle.ConnectorUnity.NativeCache
         public static string GetAssetName(Base speckleObject, Type nativeType)
         {
             string suffix = GetAssetSuffix(nativeType);
-            string name = GetObjectName(speckleObject);
+            string name = GenerateObjectName(speckleObject);
 
             string sanitisedName = new(name.Where(x => !InvalidChars.Contains(x)).ToArray());
             return $"{sanitisedName}{suffix}";
diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Wrappers/Selection/AccountSelection.cs b/Packages/systems.speckle.speckle-unity/Runtime/Wrappers/Selection/AccountSelection.cs
index fadd2e1..8e4849c 100644
--- a/Packages/systems.speckle.speckle-unity/Runtime/Wrappers/Selection/AccountSelection.cs
+++ b/Packages/systems.speckle.speckle-unity/Runtime/Wrappers/Selection/AccountSelection.cs
@@ -18,7 +18,7 @@ namespace Speckle.ConnectorUnity.Wrappers.Selection
             {
                 Account? account = Selected;
                 if (account == null) return client = null;
-                if (client == null || !client.Account.Equals(account)) return client = new Client(Selected);
+                if (client == null || !client.Account.Equals(account)) return client = new Client(account);
                 return client;
             }
         }