diff --git a/resources.json b/resources.json
index afe256f..47abf01 100644
--- a/resources.json
+++ b/resources.json
@@ -616,7 +616,7 @@
     "name": "HDVideo.mp4"
   },
   "public/avatars/Adam.gltf": {
-    "type": "avatar",
+    "type": "asset",
     "tags": [
       "Model"
     ],
@@ -687,21 +687,21 @@
     "dependencies": [],
     "name": "ffd667f5c4c57f61a582c47337035d704ae616104df6ee505b3c715455c4c11c.ktx2"
   },
-  "public/avatars/Test Avaturn.glb": {
-    "type": "avatar",
+  "public/avatars/Test_Avaturn.glb": {
+    "type": "asset",
     "tags": [
       "Model"
     ],
     "dependencies": [],
-    "name": "Test Avaturn.glb"
+    "name": "Test_Avaturn.glb"
   },
-  "public/avatars/Test RPM.glb": {
-    "type": "avatar",
+  "public/avatars/Test_RPM.glb": {
+    "type": "asset",
     "tags": [
       "Model"
     ],
     "dependencies": [],
-    "name": "Test RPM.glb"
+    "name": "Test_RPM.glb"
   },
   "public/scenes/animations-test.envmap.ktx2": {
     "type": "asset",
diff --git a/src/examples/Retargeting.tsx b/src/examples/Retargeting.tsx
index 28237b7..341a4e3 100644
--- a/src/examples/Retargeting.tsx
+++ b/src/examples/Retargeting.tsx
@@ -299,7 +299,7 @@ const RetargetingDND = () => {
     const originalBoneName = useHookstate(() => bone.name)
 
     const boneHelper = getComponent(
-      NameComponent.entitiesByName[boneName.value + '--helper'][0],
+      NameComponent.getEntitiesByName(boneName.value + '--helper')[0],
       GroupComponent
     )[0] as Mesh<ConeGeometry, MeshBasicMaterial>
     const isBone = bone.type === 'Bone'
@@ -315,7 +315,7 @@ const RetargetingDND = () => {
       boneHelper.name = name + '--helper'
       const currentBoneName = boneName.value as MixamoBoneNames
       boneName.set(name)
-      const helperEntity = NameComponent.entitiesByName[currentBoneName + '--helper'][0]
+      const helperEntity = NameComponent.getEntitiesByName(currentBoneName + '--helper')[0]
       setComponent(helperEntity, NameComponent, name + '--helper')
     }