diff --git a/src/main/java/cactusServer/entities/Character.java b/src/main/java/cactusServer/entities/Character.java
index 7a3a7e7..fa8a42c 100644
--- a/src/main/java/cactusServer/entities/Character.java
+++ b/src/main/java/cactusServer/entities/Character.java
@@ -13,11 +13,12 @@
 
 public class Character extends Entity {
 	private String accountURI;
+	private String areaURI;
 	private String name;
 	private Position3D position;
 	private Angle angle;
-	private String model;
-	private String areaURI;
+	private String modelID;
+
 	private HashMap<String, Item> itemMap = new HashMap<>();
 	@JSONHint(ignore = true)
 	public static final int UNIQUE_ID_LENGTH = 12;
@@ -26,23 +27,13 @@
 		// JSONDecode���̌Ăяo���p
 	}
 
-	// public Character(String accountURI, String name, Position3D position, Angle
-	// angle, String model) {
-	// setAccountURI(accountURI);
-	// setName(name);
-	// setPosition(position);
-	// setAngle(angle);
-	// setModel(model);
-	// updateAreaURI();
-	// }
-
 	public Character(String instanceId, String accountURI, String name, Position3D position, Angle angle,
-			String model) {
+			String modelID) {
 		setAccountURI(accountURI);
 		setName(name);
 		setPosition(position);
 		setAngle(angle);
-		setModel(model);
+		setModelID(modelID);
 		initAreaURI(instanceId);
 	}
 
@@ -62,8 +53,8 @@
 		return angle;
 	}
 
-	public String getModel() {
-		return model;
+	public String getModelID() {
+		return modelID;
 	}
 
 	public String getAreaURI() {
@@ -96,8 +87,8 @@
 		this.angle = angle;
 	}
 
-	public void setModel(String model) {
-		this.model = model;
+	public void setModelID(String modelID) {
+		this.modelID = modelID;
 	}
 
 	public void setAreaURI(String areaURI) {
@@ -150,11 +141,11 @@
 		return "";
 	}
 
-	public void update(Position3D position, Angle angle, String model, String areaURI) {
+	public void update(Position3D position, Angle angle, String modelID, String areaURI) {
 		setPosition(position);
 		setAngle(angle);
-		if (model != null) {
-			setModel(model);
+		if (modelID != null) {
+			setModelID(modelID);
 		}
 		if (areaURI != null) {
 			setAreaURI(areaURI);
diff --git a/src/main/java/cactusServer/entities/Instance.java b/src/main/java/cactusServer/entities/Instance.java
index 129a44f..8ef544a 100644
--- a/src/main/java/cactusServer/entities/Instance.java
+++ b/src/main/java/cactusServer/entities/Instance.java
@@ -159,9 +159,9 @@
 		return this;
 	}
 
-	public Character updateCharacter(String characterId, Position3D position, Angle angle, String model) {
+	public Character updateCharacter(String characterId, Position3D position, Angle angle, String modelID) {
 		Character character = characterMap.get(characterId);
-		character.update(position, angle, model, null); // areaURI(��4����)�̍X�V�͌Ăяo����Ŏ����ōs����
+		character.update(position, angle, modelID, null); // areaURI(��4����)�̍X�V�͌Ăяo����Ŏ����ōs����
 		return character;
 	}
 
diff --git a/src/main/java/cactusServer/entities/Player.java b/src/main/java/cactusServer/entities/Player.java
index 108e71a..e619951 100644
--- a/src/main/java/cactusServer/entities/Player.java
+++ b/src/main/java/cactusServer/entities/Player.java
@@ -149,7 +149,7 @@
 	}
 
 	private void updateEmoteType(EmoteState.EmoteType animationClassToStart) {
-		this.emoteState.setEmoteType(animationClassToStart);
+		emoteState.setEmoteType(animationClassToStart);
 	}
 	
 	public void changeCharacter(String characterURI) {
diff --git a/src/main/java/cactusServer/models/Instances.java b/src/main/java/cactusServer/models/Instances.java
index 8e419b5..e9eea96 100644
--- a/src/main/java/cactusServer/models/Instances.java
+++ b/src/main/java/cactusServer/models/Instances.java
@@ -41,10 +41,10 @@
 		return theInstance;
 	}
 
-	public IDAddressedEntity createInstance(String name, String stageModel) {
+	public IDAddressedEntity createInstance(String name, String stageID) {
 		String id = RandomStringGenerator.generateUniqueString(Instance.UNIQUE_ID_LENGTH,
 				RandomStringGenerator.ALPHA_NUMERIC, instanceMap.keySet());
-		Instance instance = new Instance(name, Instance.State.AVAILABLE, stageModel);
+		Instance instance = new Instance(name, Instance.State.AVAILABLE, stageID);
 		instanceMap.put(id, instance);
 		return new IDAddressedEntity(id, instance);
 	}
@@ -52,10 +52,10 @@
 	/**
 	 * InstanceRest�Ƃ̃G���[�����p (��ŏ���)
 	 */
-	public IDAddressedEntity createInstance(String name, Instance.State state, String stageModel) {
+	public IDAddressedEntity createInstance(String name, Instance.State state, String stageID) {
 		String id = RandomStringGenerator.generateUniqueString(Instance.UNIQUE_ID_LENGTH,
 				RandomStringGenerator.ALPHA_NUMERIC, instanceMap.keySet());
-		Instance instance = new Instance(name, state, stageModel);
+		Instance instance = new Instance(name, state, stageID);
 		instanceMap.put(id, instance);
 		return new IDAddressedEntity(id, instance);
 	}