diff --git a/ChangeLog b/ChangeLog
index 57bf165..295b3a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Sep 16 02:53:07 2008  Minero Aoki  <aamine@loveruby.net>
+
+	* net/loveruby/cflat/asm/Symbol.java -> LabelRef.java
+
+	* net/loveruby/cflat/asm/*.java: Symbol -> LabelRef.
+
 Tue Sep 16 02:49:21 2008  Minero Aoki  <aamine@loveruby.net>
 
 	* net/loveruby/cflat/asm/AsmEntity.java -> AsmOperand.java
diff --git a/ToDo b/ToDo
index 5023bfb..b9681ee 100644
--- a/ToDo
+++ b/ToDo
@@ -2,7 +2,6 @@
 
 == Current
 
-* AsmEntity -> AsmOperand
 * Symbol -> LabelRef
 * reject struct/union/array on stmt context
 * -O (peephole optimization)
@@ -240,3 +239,4 @@
 - va_list
 - objectify instruction
 - fix &puts
+- AsmEntity -> AsmOperand
diff --git a/net/loveruby/cflat/asm/Assembler.java b/net/loveruby/cflat/asm/Assembler.java
index 3943e2a..8fe7a59 100644
--- a/net/loveruby/cflat/asm/Assembler.java
+++ b/net/loveruby/cflat/asm/Assembler.java
@@ -162,23 +162,23 @@ public class Assembler {
     //
 
     public void jmp(Label label) {
-        insn("jmp", new Symbol(label));
+        insn("jmp", new LabelRef(label));
     }
 
     public void jz(Label label) {
-        insn("jz", new Symbol(label));
+        insn("jz", new LabelRef(label));
     }
 
     public void jnz(Label label) {
-        insn("jnz", new Symbol(label));
+        insn("jnz", new LabelRef(label));
     }
 
     public void je(Label label) {
-        insn("je", new Symbol(label));
+        insn("je", new LabelRef(label));
     }
 
     public void jne(Label label) {
-        insn("jne", new Symbol(label));
+        insn("jne", new LabelRef(label));
     }
 
     public void cmp(Type t, Register a, Register b) {
@@ -239,7 +239,7 @@ public class Assembler {
 
     // call function by relative address
     public void call(String sym) {
-        insn("call", new Symbol(new Label(sym)));
+        insn("call", new LabelRef(new Label(sym)));
     }
 
     // call function by absolute address
diff --git a/net/loveruby/cflat/asm/DirectMemoryReference.java b/net/loveruby/cflat/asm/DirectMemoryReference.java
index 97b7883..58ab9a2 100644
--- a/net/loveruby/cflat/asm/DirectMemoryReference.java
+++ b/net/loveruby/cflat/asm/DirectMemoryReference.java
@@ -4,7 +4,7 @@ public class DirectMemoryReference extends MemoryReference {
     protected Literal value;
 
     public DirectMemoryReference(Label label) {
-        this.value = new Symbol(label);
+        this.value = new LabelRef(label);
     }
 
     public DirectMemoryReference(IntegerLiteral n) {
diff --git a/net/loveruby/cflat/asm/ImmediateValue.java b/net/loveruby/cflat/asm/ImmediateValue.java
index 7519389..527149f 100644
--- a/net/loveruby/cflat/asm/ImmediateValue.java
+++ b/net/loveruby/cflat/asm/ImmediateValue.java
@@ -8,7 +8,7 @@ public class ImmediateValue extends AsmOperand {
     }
 
     public ImmediateValue(Label label) {
-        this(new Symbol(label));
+        this(new LabelRef(label));
     }
 
     public ImmediateValue(AsmOperand entity) {
diff --git a/net/loveruby/cflat/asm/Symbol.java b/net/loveruby/cflat/asm/LabelRef.java
similarity index 75%
rename from net/loveruby/cflat/asm/Symbol.java
rename to net/loveruby/cflat/asm/LabelRef.java
index 27597da..9debe89 100644
--- a/net/loveruby/cflat/asm/Symbol.java
+++ b/net/loveruby/cflat/asm/LabelRef.java
@@ -1,9 +1,9 @@
 package net.loveruby.cflat.asm;
 
-public class Symbol extends Literal {
+public class LabelRef extends Literal {
     protected Label label;
 
-    public Symbol(Label label) {
+    public LabelRef(Label label) {
         this.label = label;
     }