diff --git a/Samples.meta b/Runtime/HumanoidFree/Prefabs/Characters/Resources.meta
similarity index 77%
rename from Samples.meta
rename to Runtime/HumanoidFree/Prefabs/Characters/Resources.meta
index a1fabf7..ff24e8d 100644
--- a/Samples.meta
+++ b/Runtime/HumanoidFree/Prefabs/Characters/Resources.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 31905e5b2805d2e42a3349be1b860d55
+guid: ed397d272bcc7c14eb9d4a69d7ba578f
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Runtime/HumanoidFree/Prefabs/Characters/MakeHuman_simple_TP.prefab b/Runtime/HumanoidFree/Prefabs/Characters/Resources/MakeHuman_simple_TP.prefab
similarity index 100%
rename from Runtime/HumanoidFree/Prefabs/Characters/MakeHuman_simple_TP.prefab
rename to Runtime/HumanoidFree/Prefabs/Characters/Resources/MakeHuman_simple_TP.prefab
diff --git a/Runtime/HumanoidFree/Prefabs/Characters/MakeHuman_simple_TP.prefab.meta b/Runtime/HumanoidFree/Prefabs/Characters/Resources/MakeHuman_simple_TP.prefab.meta
similarity index 100%
rename from Runtime/HumanoidFree/Prefabs/Characters/MakeHuman_simple_TP.prefab.meta
rename to Runtime/HumanoidFree/Prefabs/Characters/Resources/MakeHuman_simple_TP.prefab.meta
diff --git a/Runtime/HumanoidFree/Prefabs/Networking/Resources/RemoteHumanoid.prefab b/Runtime/HumanoidFree/Prefabs/Networking/Resources/RemoteHumanoid.prefab
index c34fc4b..1a68642 100644
--- a/Runtime/HumanoidFree/Prefabs/Networking/Resources/RemoteHumanoid.prefab
+++ b/Runtime/HumanoidFree/Prefabs/Networking/Resources/RemoteHumanoid.prefab
@@ -163,7 +163,7 @@ MonoBehaviour:
   animatorParameterSidewardIndex: 0
   animatorParameterRotationIndex: 0
   animatorParameterHeightIndex: 0
-  isRemote: 0
+  isRemote: 1
   nwId: 0
   id: -1
 --- !u!1 &1438423234026816
diff --git a/Runtime/HumanoidFree/Scripts/Networking/HumanoidNetworking.cs b/Runtime/HumanoidFree/Scripts/Networking/HumanoidNetworking.cs
index 9755ce3..189e0f0 100644
--- a/Runtime/HumanoidFree/Scripts/Networking/HumanoidNetworking.cs
+++ b/Runtime/HumanoidFree/Scripts/Networking/HumanoidNetworking.cs
@@ -154,7 +154,7 @@ namespace Passer.Humanoid {
                     name = humanoid.gameObject.name;
 
                 if (humanoid.remoteAvatar == null)
-                    avatarPrefabName = humanoid.avatarRig.name.Substring(0, humanoid.avatarRig.name.Length - 7);
+                    avatarPrefabName = humanoid.avatarRig.name; // .Substring(0, humanoid.avatarRig.name.Length - 7); 
                 else
                     avatarPrefabName = humanoid.remoteAvatar.name;