diff --git a/src/main/java/cactusServer/entities/Character.java b/src/main/java/cactusServer/entities/Character.java
index 9519233..7b67348 100644
--- a/src/main/java/cactusServer/entities/Character.java
+++ b/src/main/java/cactusServer/entities/Character.java
@@ -153,7 +153,7 @@
 		throw new IllegalStateException("Character is in the unknown area.");
 	}
 	
-	public void updateCharacter(Position3D position, Angle angle, String model) {
+	public void update(Position3D position, Angle angle, String model) {
 		setPosition(position);
 		setAngle(angle);
 		setModel(model);
diff --git a/src/main/java/cactusServer/entities/Instance.java b/src/main/java/cactusServer/entities/Instance.java
index 83500ef..b2df2ab 100644
--- a/src/main/java/cactusServer/entities/Instance.java
+++ b/src/main/java/cactusServer/entities/Instance.java
@@ -143,7 +143,7 @@
 
 	public Character updateCharacter(String characterId, Position3D position, Angle angle, String model) {
 		Character character = characterMap.get(characterId);
-		character.updateCharacter(position, angle, model);
+		character.update(position, angle, model);
 		return character;
 	}
 
diff --git a/src/main/java/cactusServer/entities/Player.java b/src/main/java/cactusServer/entities/Player.java
index 4fb7d00..eafe72f 100644
--- a/src/main/java/cactusServer/entities/Player.java
+++ b/src/main/java/cactusServer/entities/Player.java
@@ -103,8 +103,8 @@
 		setEmoteState(new EmoteState(animationClassToStart));
 	}
 	
-	public Player updatePlayer(String CharacterURI, Position3D position, Angle angle, CameraState cameraState, EmoteState.EmoteType animationClassToStart) {
-		setCharacterURI(CharacterURI);
+	public Player update(String characterURI, Position3D position, Angle angle, CameraState cameraState, EmoteState.EmoteType animationClassToStart) {
+		setCharacterURI(characterURI);
 		setPosition(position);
 		setAngle(angle);
 		setCameraState(cameraState);
@@ -139,7 +139,7 @@
 		throw new IllegalStateException("Character is in the unknown area.");
 	}
 
-	public void updateEmoteType(EmoteState.EmoteType animationClassToStart) {
+	private void updateEmoteType(EmoteState.EmoteType animationClassToStart) {
 		this.emoteState.setEmoteType(animationClassToStart);
 	}
 
diff --git a/src/main/java/cactusServer/models/Instances.java b/src/main/java/cactusServer/models/Instances.java
index 8d8fd0e..4d3bc6d 100644
--- a/src/main/java/cactusServer/models/Instances.java
+++ b/src/main/java/cactusServer/models/Instances.java
@@ -4,12 +4,14 @@
 import java.util.HashMap;
 import java.util.List;
 
+import cactusServer.entities.Angle;
 import cactusServer.entities.CameraState;
 import cactusServer.entities.EmoteState;
 import cactusServer.entities.IDAddressedEntity;
 import cactusServer.entities.Instance;
 import cactusServer.entities.Player;
 import cactusServer.utils.RandomStringGenerator;
+import framework.model3D.Position3D;
 
 /**
  * �C���X�^���X���Ǘ�����N���X
@@ -47,8 +49,8 @@
 	 * @return
 	 */
 	public IDAddressedEntity createInstance(String name, Instance.State state, String stageModel) {
-		String id = RandomStringGenerator.generateUniqueString(Instance.UNIQUE_ID_LENGTH, RandomStringGenerator.ALPHA_NUMERIC,
-				instanceMap.keySet());
+		String id = RandomStringGenerator.generateUniqueString(Instance.UNIQUE_ID_LENGTH,
+				RandomStringGenerator.ALPHA_NUMERIC, instanceMap.keySet());
 		Instance instance = new Instance(name, state, stageModel);
 		instanceMap.put(id, instance);
 		return new IDAddressedEntity(id, instance);
@@ -56,8 +58,8 @@
 
 	public IDAddressedEntity createPlayer(String instanceURI, String characterURI, CameraState cameraState,
 			EmoteState.EmoteType animationClassToStart) {
-		String id = RandomStringGenerator.generateUniqueString(Player.UNIQUE_ID_LENGTH, RandomStringGenerator.ALPHA_NUMERIC,
-				playerMap.keySet());
+		String id = RandomStringGenerator.generateUniqueString(Player.UNIQUE_ID_LENGTH,
+				RandomStringGenerator.ALPHA_NUMERIC, playerMap.keySet());
 		Player player = new Player(instanceURI, characterURI, cameraState, animationClassToStart);
 		playerMap.put(id, player);
 		return new IDAddressedEntity(id, player);
@@ -82,6 +84,13 @@
 		return playerMap.get(playerId);
 	}
 
+	public Player updatePlayer(String playerId, String characterURI, Position3D position, Angle angle,
+			CameraState cameraState, EmoteState.EmoteType animationClassToStart) {
+		Player player = playerMap.get(playerId);
+		player.update(characterURI, position, angle, cameraState, animationClassToStart);
+		return player;
+	}
+
 	/**
 	 * ID�ɑΉ�����Instance��Map����폜���ĕԂ�
 	 *