diff --git a/src/org/apollo/fs/decoder/StaticObjectDecoder.java b/src/org/apollo/fs/decoder/GameObjectDecoder.java
similarity index 96%
rename from src/org/apollo/fs/decoder/StaticObjectDecoder.java
rename to src/org/apollo/fs/decoder/GameObjectDecoder.java
index 2a144546..9b2f05af 100644
--- a/src/org/apollo/fs/decoder/StaticObjectDecoder.java
+++ b/src/org/apollo/fs/decoder/GameObjectDecoder.java
@@ -18,7 +18,7 @@ import org.apollo.util.CompressionUtil;
  * 
  * @author Chris Fletcher
  */
-public final class StaticObjectDecoder {
+public final class GameObjectDecoder {
 
 	/**
 	 * The {@link IndexedFileSystem}.
@@ -30,7 +30,7 @@ public final class StaticObjectDecoder {
 	 * 
 	 * @param fs The indexed file system.
 	 */
-	public StaticObjectDecoder(IndexedFileSystem fs) {
+	public GameObjectDecoder(IndexedFileSystem fs) {
 		this.fs = fs;
 	}
 
diff --git a/src/org/apollo/game/model/World.java b/src/org/apollo/game/model/World.java
index 8ba47c18..01f0edde 100644
--- a/src/org/apollo/game/model/World.java
+++ b/src/org/apollo/game/model/World.java
@@ -13,7 +13,7 @@ import org.apollo.fs.IndexedFileSystem;
 import org.apollo.fs.decoder.ItemDefinitionDecoder;
 import org.apollo.fs.decoder.NpcDefinitionDecoder;
 import org.apollo.fs.decoder.ObjectDefinitionDecoder;
-import org.apollo.fs.decoder.StaticObjectDecoder;
+import org.apollo.fs.decoder.GameObjectDecoder;
 import org.apollo.game.command.CommandDispatcher;
 import org.apollo.game.login.LoginDispatcher;
 import org.apollo.game.login.LogoutDispatcher;
@@ -260,7 +260,7 @@ public final class World {
 		ObjectDefinition.init(objDefs);
 		logger.info("Loaded " + objDefs.length + " object definitions.");
 
-		StaticObjectDecoder staticDecoder = new StaticObjectDecoder(fs);
+		GameObjectDecoder staticDecoder = new GameObjectDecoder(fs);
 		GameObject[] objects = staticDecoder.decode();
 		placeEntities(objects);
 		logger.info("Loaded " + objects.length + " static objects.");