diff --git a/fml/common/cpw/mods/fml/common/TickType.java b/fml/common/cpw/mods/fml/common/TickType.java
index 92576306b..15b230865 100644
--- a/fml/common/cpw/mods/fml/common/TickType.java
+++ b/fml/common/cpw/mods/fml/common/TickType.java
@@ -19,7 +19,7 @@ import java.util.EnumSet;
 public enum TickType {
     /**
      * Fired during the world evaluation loop
-     * server side
+     * server and client side
      * 
      * arg 0 : The world that is ticking
      */
@@ -67,11 +67,11 @@ public enum TickType {
      */
     public EnumSet<TickType> partnerTicks()
     {
-        if (this==WORLD) return EnumSet.of(RENDER,WORLDLOAD);
-        if (this==RENDER) return EnumSet.of(WORLD, WORLDLOAD);
+        if (this==GAME) return EnumSet.of(RENDER,WORLDLOAD);
+        if (this==RENDER) return EnumSet.of(GAME, WORLDLOAD);
         if (this==GUI) return EnumSet.of(WORLDGUI, GUILOAD);
         if (this==WORLDGUI) return EnumSet.of(GUI, GUILOAD);
-        if (this==WORLDLOAD) return EnumSet.of(WORLD, RENDER);
+        if (this==WORLDLOAD) return EnumSet.of(GAME, RENDER);
         if (this==GUILOAD) return EnumSet.of(GUI, WORLDGUI);
         return null;
     }
diff --git a/fml/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java b/fml/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java
index 8d6034196..c785946fc 100644
--- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java
+++ b/fml/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java
@@ -40,11 +40,11 @@ public class ModLoaderHelper
         } else {
             ticks.remove(TickType.RENDER);
         }
-        // If we're enabled but we want clock ticks, or we're server side we get world ticks 
+        // If we're enabled but we want clock ticks, or we're server side we get game ticks 
         if (enable && (useClock || FMLCommonHandler.instance().getSide().isServer())) {
-            ticks.add(TickType.WORLD);
+            ticks.add(TickType.GAME);
         } else {
-            ticks.remove(TickType.WORLD);
+            ticks.remove(TickType.GAME);
         }
         
         if (enable) {