diff --git a/Barotrauma/BarotraumaServer/ServerSource/GameMain.cs b/Barotrauma/BarotraumaServer/ServerSource/GameMain.cs
index 589881d1c..f7a7174cc 100644
--- a/Barotrauma/BarotraumaServer/ServerSource/GameMain.cs
+++ b/Barotrauma/BarotraumaServer/ServerSource/GameMain.cs
@@ -399,7 +399,7 @@ namespace Barotrauma
                 prevTicks = currTicks;
                 while (Timing.Accumulator >= Timing.Step)
                 {
-                    performanceMeasurement.Start();
+                    performanceCounterTimer.Start();
 
                     Timing.TotalTime += Timing.Step;
                     DebugConsole.Update();
@@ -415,9 +415,9 @@ namespace Barotrauma
 
                     GameMain.Lua.Update();
                     GameMain.Lua.hook.Call("think", new object[] { });
-                    performanceMeasurement.Stop();
-                    LuaSetup.LuaTimer.LastUpdateTime = performanceMeasurement.ElapsedMilliseconds;
-                    performanceMeasurement.Reset();
+                    performanceCounterTimer.Stop();
+                    LuaSetup.LuaTimer.LastUpdateTime = performanceCounterTimer.ElapsedMilliseconds;
+                    performanceCounterTimer.Reset();
 
                     Timing.Accumulator -= Timing.Step;
                     updateCount++;
diff --git a/Barotrauma/BarotraumaShared/SharedSource/Networking/ChatMessage.cs b/Barotrauma/BarotraumaShared/SharedSource/Networking/ChatMessage.cs
index 36dbbb1b9..d3c30f149 100644
--- a/Barotrauma/BarotraumaShared/SharedSource/Networking/ChatMessage.cs
+++ b/Barotrauma/BarotraumaShared/SharedSource/Networking/ChatMessage.cs
@@ -79,16 +79,16 @@ namespace Barotrauma.Networking
 
         public readonly string SenderName;
 
-        private Color? customColor = null;
+        private Color? customTextColor = null;
 
         public Color Color
         {
             get 
             { 
-                if(customColor == null) return MessageColor[(int)Type];
-                return (Color)customColor;
+                if(customTextColor == null) return MessageColor[(int)Type];
+                return (Color)customTextColor;
             }
-			set { customColor = value; }
+			set { customTextColor = value; }
         }
 
         public static string GetTimeStamp()