diff --git a/Assets/Mirror/Components/NetworkLobbyPlayer.cs b/Assets/Mirror/Components/NetworkLobbyPlayer.cs
index fdbf13650..9042c9158 100644
--- a/Assets/Mirror/Components/NetworkLobbyPlayer.cs
+++ b/Assets/Mirror/Components/NetworkLobbyPlayer.cs
@@ -61,7 +61,6 @@ public void CmdSendLevelLoaded()
 
         private void ReadyStateChanged(bool NewReadyState)
         {
-            ReadyToBegin = NewReadyState;
             OnClientReady(ReadyToBegin);
         }
 
diff --git a/Assets/Mirror/Tests/WeaverTests~/SyncVarsDerivedNetworkBehaviour.cs b/Assets/Mirror/Tests/WeaverTests~/SyncVarsDerivedNetworkBehaviour.cs
index 23da7feaf..5d7349b4e 100644
--- a/Assets/Mirror/Tests/WeaverTests~/SyncVarsDerivedNetworkBehaviour.cs
+++ b/Assets/Mirror/Tests/WeaverTests~/SyncVarsDerivedNetworkBehaviour.cs
@@ -5,7 +5,7 @@ namespace MirrorTest
 {
     class MirrorTestPlayer : NetworkBehaviour
     {
-        [SyncVar(hook="OnChangeHealth")]
+        [SyncVar(hook = nameof(OnChangeHealth))]
         int health;
 
         class MySyncVar : NetworkBehaviour
diff --git a/Assets/Mirror/Tests/WeaverTests~/SyncVarsDerivedScriptableObject.cs b/Assets/Mirror/Tests/WeaverTests~/SyncVarsDerivedScriptableObject.cs
index 2701c63ee..be8c88604 100644
--- a/Assets/Mirror/Tests/WeaverTests~/SyncVarsDerivedScriptableObject.cs
+++ b/Assets/Mirror/Tests/WeaverTests~/SyncVarsDerivedScriptableObject.cs
@@ -5,7 +5,7 @@ namespace MirrorTest
 {
     class MirrorTestPlayer : NetworkBehaviour
     {
-        [SyncVar(hook="OnChangeHealth")]
+        [SyncVar(hook = nameof(OnChangeHealth))]
         int health;
 
         class MySyncVar : ScriptableObject
diff --git a/Assets/Mirror/Tests/WeaverTests~/SyncVarsDifferentModule.cs b/Assets/Mirror/Tests/WeaverTests~/SyncVarsDifferentModule.cs
index 757f44fca..e8ef4f1fb 100644
--- a/Assets/Mirror/Tests/WeaverTests~/SyncVarsDifferentModule.cs
+++ b/Assets/Mirror/Tests/WeaverTests~/SyncVarsDifferentModule.cs
@@ -5,7 +5,7 @@ namespace MirrorTest
 {
     class MirrorTestPlayer : NetworkBehaviour
     {
-        [SyncVar(hook="OnChangeHealth")]
+        [SyncVar(hook = nameof(OnChangeHealth))]
         int health;
 
         [SyncVar]
diff --git a/Assets/Mirror/Tests/WeaverTests~/SyncVarsGenericParam.cs b/Assets/Mirror/Tests/WeaverTests~/SyncVarsGenericParam.cs
index a15d68458..f1c52c265 100644
--- a/Assets/Mirror/Tests/WeaverTests~/SyncVarsGenericParam.cs
+++ b/Assets/Mirror/Tests/WeaverTests~/SyncVarsGenericParam.cs
@@ -5,7 +5,7 @@ namespace MirrorTest
 {
     class MirrorTestPlayer : NetworkBehaviour
     {
-        [SyncVar(hook="OnChangeHealth")]
+        [SyncVar(hook = nameof(OnChangeHealth))]
         int health;
 
         class MySyncVar<T>
diff --git a/Assets/Mirror/Tests/WeaverTests~/SyncVarsInterface.cs b/Assets/Mirror/Tests/WeaverTests~/SyncVarsInterface.cs
index c48c7e27c..a5663f354 100644
--- a/Assets/Mirror/Tests/WeaverTests~/SyncVarsInterface.cs
+++ b/Assets/Mirror/Tests/WeaverTests~/SyncVarsInterface.cs
@@ -5,7 +5,7 @@ namespace MirrorTest
 {
     class MirrorTestPlayer : NetworkBehaviour
     {
-        [SyncVar(hook="OnChangeHealth")]
+        [SyncVar(hook = nameof(OnChangeHealth))]
         int health;
 
         interface MySyncVar
diff --git a/Assets/Mirror/Tests/WeaverTests~/SyncVarsMoreThan63.cs b/Assets/Mirror/Tests/WeaverTests~/SyncVarsMoreThan63.cs
index 4380264f3..63bad385c 100644
--- a/Assets/Mirror/Tests/WeaverTests~/SyncVarsMoreThan63.cs
+++ b/Assets/Mirror/Tests/WeaverTests~/SyncVarsMoreThan63.cs
@@ -5,7 +5,7 @@ namespace MirrorTest
 {
     class MirrorTestPlayer : NetworkBehaviour
     {
-        [SyncVar(hook="OnChangeHealth")]
+        [SyncVar(hook = nameof(OnChangeHealth))]
         int health;
 
         [SyncVar] int var2;
diff --git a/Assets/Mirror/Tests/WeaverTests~/SyncVarsNoHookParams.cs b/Assets/Mirror/Tests/WeaverTests~/SyncVarsNoHookParams.cs
index 2e26ec63b..026fd77a9 100644
--- a/Assets/Mirror/Tests/WeaverTests~/SyncVarsNoHookParams.cs
+++ b/Assets/Mirror/Tests/WeaverTests~/SyncVarsNoHookParams.cs
@@ -5,7 +5,7 @@ namespace MirrorTest
 {
     class MirrorTestPlayer : NetworkBehaviour
     {
-        [SyncVar(hook = "OnChangeHealth")]
+        [SyncVar(hook = nameof(OnChangeHealth))]
         int health;
 
         public void TakeDamage(int amount)
diff --git a/Assets/Mirror/Tests/WeaverTests~/SyncVarsStatic.cs b/Assets/Mirror/Tests/WeaverTests~/SyncVarsStatic.cs
index 5948ec26a..cff291787 100644
--- a/Assets/Mirror/Tests/WeaverTests~/SyncVarsStatic.cs
+++ b/Assets/Mirror/Tests/WeaverTests~/SyncVarsStatic.cs
@@ -5,7 +5,7 @@ namespace MirrorTest
 {
     class MirrorTestPlayer : NetworkBehaviour
     {
-        [SyncVar(hook="OnChangeHealth")]
+        [SyncVar(hook = nameof(OnChangeHealth))]
         int health;
 
         [SyncVar]
diff --git a/Assets/Mirror/Tests/WeaverTests~/SyncVarsSyncList.cs b/Assets/Mirror/Tests/WeaverTests~/SyncVarsSyncList.cs
index 6bb309ae0..65cfffd3a 100644
--- a/Assets/Mirror/Tests/WeaverTests~/SyncVarsSyncList.cs
+++ b/Assets/Mirror/Tests/WeaverTests~/SyncVarsSyncList.cs
@@ -15,7 +15,7 @@ public void OnDeserializeDelta(NetworkReader reader) {}
 
     class MirrorTestPlayer : NetworkBehaviour
     {
-        [SyncVar(hook = "OnChangeHealth")]
+        [SyncVar(hook = nameof(OnChangeHealth))]
         int health;
 
         [SyncVar]
diff --git a/Assets/Mirror/Tests/WeaverTests~/SyncVarsTooManyHookParams.cs b/Assets/Mirror/Tests/WeaverTests~/SyncVarsTooManyHookParams.cs
index f55ca48b7..738333188 100644
--- a/Assets/Mirror/Tests/WeaverTests~/SyncVarsTooManyHookParams.cs
+++ b/Assets/Mirror/Tests/WeaverTests~/SyncVarsTooManyHookParams.cs
@@ -5,7 +5,7 @@ namespace MirrorTest
 {
     class MirrorTestPlayer : NetworkBehaviour
     {
-        [SyncVar(hook = "OnChangeHealth")]
+        [SyncVar(hook = nameof(OnChangeHealth))]
         int health;
 
         public void TakeDamage(int amount)
diff --git a/Assets/Mirror/Tests/WeaverTests~/SyncVarsValid.cs b/Assets/Mirror/Tests/WeaverTests~/SyncVarsValid.cs
index aec7595db..1465d404c 100644
--- a/Assets/Mirror/Tests/WeaverTests~/SyncVarsValid.cs
+++ b/Assets/Mirror/Tests/WeaverTests~/SyncVarsValid.cs
@@ -5,7 +5,7 @@ namespace MirrorTest
 {
     class MirrorTestPlayer : NetworkBehaviour
     {
-        [SyncVar(hook="OnChangeHealth")]
+        [SyncVar(hook = nameof(OnChangeHealth))]
         int health;
 
         [SyncVar] int var2;
diff --git a/Assets/Mirror/Tests/WeaverTests~/SyncVarsWrongHookType.cs b/Assets/Mirror/Tests/WeaverTests~/SyncVarsWrongHookType.cs
index d197c20a1..4a92ee831 100644
--- a/Assets/Mirror/Tests/WeaverTests~/SyncVarsWrongHookType.cs
+++ b/Assets/Mirror/Tests/WeaverTests~/SyncVarsWrongHookType.cs
@@ -5,7 +5,7 @@ namespace MirrorTest
 {
     class MirrorTestPlayer : NetworkBehaviour
     {
-        [SyncVar(hook = "OnChangeHealth")]
+        [SyncVar(hook = nameof(OnChangeHealth))]
         int health;
 
         public void TakeDamage(int amount)