diff --git a/ml_amt/Main.cs b/ml_amt/Main.cs
index 8093c37..82a8926 100644
--- a/ml_amt/Main.cs
+++ b/ml_amt/Main.cs
@@ -22,9 +22,9 @@ namespace ml_amt
                 new HarmonyLib.HarmonyMethod(typeof(AvatarMotionTweaker).GetMethod(nameof(OnAvatarClear_Postfix), BindingFlags.NonPublic | BindingFlags.Static))
             );
             HarmonyInstance.Patch(
-                typeof(PlayerSetup).GetMethod(nameof(PlayerSetup.CalibrateAvatar)),
+                typeof(PlayerSetup).GetMethod(nameof(PlayerSetup.SetupAvatar)),
                 null,
-                new HarmonyLib.HarmonyMethod(typeof(AvatarMotionTweaker).GetMethod(nameof(OnCalibrateAvatar_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
+                new HarmonyLib.HarmonyMethod(typeof(AvatarMotionTweaker).GetMethod(nameof(OnSetupAvatar_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
             );
 
             MelonLoader.MelonCoroutines.Start(WaitForLocalPlayer());
@@ -69,13 +69,13 @@ namespace ml_amt
             }
         }
 
-        static void OnCalibrateAvatar_Postfix() => ms_instance?.OnCalibrateAvatar();
-        void OnCalibrateAvatar()
+        static void OnSetupAvatar_Postfix() => ms_instance?.OnSetupAvatar();
+        void OnSetupAvatar()
         {
             try
             {
                 if(m_localTweaker != null)
-                    m_localTweaker.OnCalibrateAvatar();
+                    m_localTweaker.OnSetupAvatar();
             }
             catch(System.Exception l_exception)
             {
diff --git a/ml_amt/MotionTweaker.cs b/ml_amt/MotionTweaker.cs
index 90aa85a..f86cbac 100644
--- a/ml_amt/MotionTweaker.cs
+++ b/ml_amt/MotionTweaker.cs
@@ -220,7 +220,7 @@ namespace ml_amt
             m_parameters.Clear();
         }
 
-        public void OnCalibrateAvatar()
+        public void OnSetupAvatar()
         {
             m_vrIk = PlayerSetup.Instance._avatar.GetComponent<VRIK>();
             m_locomotionLayer = PlayerSetup.Instance._animator.GetLayerIndex("Locomotion/Emotes");
diff --git a/ml_dht/HeadTracked.cs b/ml_dht/HeadTracked.cs
index b1b3da1..228cbff 100644
--- a/ml_dht/HeadTracked.cs
+++ b/ml_dht/HeadTracked.cs
@@ -102,7 +102,7 @@ namespace ml_dht
             }
         }
 
-        public void OnCalibrateAvatar()
+        public void OnSetupAvatar()
         {
             m_avatarDescriptor = PlayerSetup.Instance._avatar.GetComponent<CVRAvatar>();
             m_headBone = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.Head);
diff --git a/ml_dht/Main.cs b/ml_dht/Main.cs
index 327195f..1c918ce 100644
--- a/ml_dht/Main.cs
+++ b/ml_dht/Main.cs
@@ -33,9 +33,9 @@ namespace ml_dht
                 new HarmonyLib.HarmonyMethod(typeof(DesktopHeadTracking).GetMethod(nameof(OnAvatarClear_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
             );
             HarmonyInstance.Patch(
-                typeof(PlayerSetup).GetMethod(nameof(PlayerSetup.CalibrateAvatar)),
+                typeof(PlayerSetup).GetMethod(nameof(PlayerSetup.SetupAvatar)),
                 null,
-                new HarmonyLib.HarmonyMethod(typeof(DesktopHeadTracking).GetMethod(nameof(OnCalibrateAvatar_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
+                new HarmonyLib.HarmonyMethod(typeof(DesktopHeadTracking).GetMethod(nameof(OnSetupAvatar_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
             );
             HarmonyInstance.Patch(
                 typeof(CVREyeController).GetMethod("Update", BindingFlags.Instance | BindingFlags.NonPublic),
@@ -84,13 +84,13 @@ namespace ml_dht
             }
         }
 
-        static void OnCalibrateAvatar_Postfix() => ms_instance?.OnCalibrateAvatar();
-        void OnCalibrateAvatar()
+        static void OnSetupAvatar_Postfix() => ms_instance?.OnSetupAvatar();
+        void OnSetupAvatar()
         {
             try
             {
                 if(m_localTracked != null)
-                    m_localTracked.OnCalibrateAvatar();
+                    m_localTracked.OnSetupAvatar();
             }
             catch(System.Exception e)
             {
diff --git a/ml_fpt/Main.cs b/ml_fpt/Main.cs
index e26b8d2..f748e3a 100644
--- a/ml_fpt/Main.cs
+++ b/ml_fpt/Main.cs
@@ -44,9 +44,9 @@ namespace ml_fpt
                 new HarmonyLib.HarmonyMethod(typeof(FourPointTracking).GetMethod(nameof(OnAvatarClear_Postfix), BindingFlags.NonPublic | BindingFlags.Static))
             );
             HarmonyInstance.Patch(
-                typeof(PlayerSetup).GetMethod(nameof(PlayerSetup.CalibrateAvatar)),
+                typeof(PlayerSetup).GetMethod(nameof(PlayerSetup.SetupAvatar)),
                 null,
-                new HarmonyLib.HarmonyMethod(typeof(FourPointTracking).GetMethod(nameof(OnCalibrateAvatar_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
+                new HarmonyLib.HarmonyMethod(typeof(FourPointTracking).GetMethod(nameof(OnSetupAvatar_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
             );
 
             MelonLoader.MelonCoroutines.Start(WaitForMainMenuView());
@@ -253,8 +253,8 @@ namespace ml_fpt
             }
         }
 
-        static void OnCalibrateAvatar_Postfix() => ms_instance?.OnCalibrateAvatar();
-        void OnCalibrateAvatar()
+        static void OnSetupAvatar_Postfix() => ms_instance?.OnSetupAvatar();
+        void OnSetupAvatar()
         {
             try
             {
diff --git a/ml_lme/LeapTracked.cs b/ml_lme/LeapTracked.cs
index 7f97c1c..bddae6f 100644
--- a/ml_lme/LeapTracked.cs
+++ b/ml_lme/LeapTracked.cs
@@ -211,7 +211,7 @@ namespace ml_lme
             m_rightHandTarget.localRotation = Quaternion.identity;
         }
 
-        public void OnCalibrateAvatar()
+        public void OnSetupAvatar()
         {
             m_vrIK = PlayerSetup.Instance._animator.GetComponent<VRIK>();
 
diff --git a/ml_lme/Main.cs b/ml_lme/Main.cs
index d25d22f..d67f73a 100644
--- a/ml_lme/Main.cs
+++ b/ml_lme/Main.cs
@@ -53,9 +53,9 @@ namespace ml_lme
                 new HarmonyLib.HarmonyMethod(typeof(LeapMotionExtension).GetMethod(nameof(OnAvatarClear_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
             );
             HarmonyInstance.Patch(
-                typeof(PlayerSetup).GetMethod(nameof(PlayerSetup.CalibrateAvatar)),
+                typeof(PlayerSetup).GetMethod(nameof(PlayerSetup.SetupAvatar)),
                 null,
-                new HarmonyLib.HarmonyMethod(typeof(LeapMotionExtension).GetMethod(nameof(OnCalibrateAvatar_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
+                new HarmonyLib.HarmonyMethod(typeof(LeapMotionExtension).GetMethod(nameof(OnSetupAvatar_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
             );
 
 
@@ -341,13 +341,13 @@ namespace ml_lme
             }
         }
 
-        static void OnCalibrateAvatar_Postfix() => ms_instance?.OnCalibrateAvatar();
-        void OnCalibrateAvatar()
+        static void OnSetupAvatar_Postfix() => ms_instance?.OnSetupAvatar();
+        void OnSetupAvatar()
         {
             try
             {
                 if(m_leapTracked != null)
-                    m_leapTracked.OnCalibrateAvatar();
+                    m_leapTracked.OnSetupAvatar();
 
                 OnHeadAttachChange(Settings.HeadAttach);
             }