diff --git a/tools/smokes/v2/profiles/quick/core/binop/self_param_binop_vm.sh b/tools/smokes/v2/profiles/quick/core/binop/self_param_binop_vm.sh
index 9610920a..fd9000e9 100644
--- a/tools/smokes/v2/profiles/quick/core/binop/self_param_binop_vm.sh
+++ b/tools/smokes/v2/profiles/quick/core/binop/self_param_binop_vm.sh
@@ -12,7 +12,7 @@ test_self_param_binop() {
 using "lang/src/llvm_ir/instructions/binop.hako" as BinOpInst
 static box Main {
   method main() {
-    local s = new BinOpInst.LLVMBinOpInstructionBox().lower_binop("+", 1, 2, 3)
+    local s = new LLVMBinOpInstructionBox().lower_binop("+", 1, 2, 3)
     if s.contains("\"op\":\"binop\"") && s.contains("\"operation\":\"+\"") { print(1) } else { print(0) }
   }
 }
diff --git a/tools/smokes/v2/profiles/quick/core/branch/self_param_branch_vm.sh b/tools/smokes/v2/profiles/quick/core/branch/self_param_branch_vm.sh
index be0c5bbd..93425838 100644
--- a/tools/smokes/v2/profiles/quick/core/branch/self_param_branch_vm.sh
+++ b/tools/smokes/v2/profiles/quick/core/branch/self_param_branch_vm.sh
@@ -11,7 +11,7 @@ test_self_param_branch() {
   local src='
 using "lang/src/llvm_ir/instructions/branch.hako" as B
 static box Main { method main() {
-  local s = new B.LLVMBranchInstructionBox().lower_branch(3, 1, 2)
+  local s = new LLVMBranchInstructionBox().lower_branch(3, 1, 2)
   if s.contains("\"op\":\"branch\"") && s.contains("\"then\":1") { print(1) } else { print(0) }
 } }
 '
diff --git a/tools/smokes/v2/profiles/quick/core/compare/self_param_compare_vm.sh b/tools/smokes/v2/profiles/quick/core/compare/self_param_compare_vm.sh
index f33992c4..15890e1a 100644
--- a/tools/smokes/v2/profiles/quick/core/compare/self_param_compare_vm.sh
+++ b/tools/smokes/v2/profiles/quick/core/compare/self_param_compare_vm.sh
@@ -11,7 +11,7 @@ test_self_param_compare() {
   local src='
 using "lang/src/llvm_ir/instructions/compare.hako" as C
 static box Main { method main() {
-  local s = new C.LLVMCompareInstructionBox().lower_compare("<", 1, 2, 3)
+  local s = new LLVMCompareInstructionBox().lower_compare("<", 1, 2, 3)
   if s.contains("\"op\":\"compare\"") && s.contains("\"operation\":\"<\"") { print(1) } else { print(0) }
 } }
 '
diff --git a/tools/smokes/v2/profiles/quick/core/const/self_param_const_vm.sh b/tools/smokes/v2/profiles/quick/core/const/self_param_const_vm.sh
index 584847a0..08e68be0 100644
--- a/tools/smokes/v2/profiles/quick/core/const/self_param_const_vm.sh
+++ b/tools/smokes/v2/profiles/quick/core/const/self_param_const_vm.sh
@@ -13,7 +13,7 @@ using "lang/src/llvm_ir/instructions/const.hako" as ConstInst
 static box Main {
   method main() {
     local v = new MapBox(); v.set("type","i64"); v.set("value",42)
-    local s = new ConstInst.LLVMConstInstructionBox().lower_const(1, v)
+    local s = new LLVMConstInstructionBox().lower_const(1, v)
     if s.contains("\"op\":\"const\"") && s.contains("\"i64\"") { print(1) } else { print(0) }
   }
 }
diff --git a/tools/smokes/v2/profiles/quick/core/jump/self_param_jump_vm.sh b/tools/smokes/v2/profiles/quick/core/jump/self_param_jump_vm.sh
index 8e401f8d..8fbfb4c7 100644
--- a/tools/smokes/v2/profiles/quick/core/jump/self_param_jump_vm.sh
+++ b/tools/smokes/v2/profiles/quick/core/jump/self_param_jump_vm.sh
@@ -11,7 +11,7 @@ test_self_param_jump() {
   local src='
 using "lang/src/llvm_ir/instructions/jump.hako" as J
 static box Main { method main() {
-  local s = new J.LLVMJumpInstructionBox().lower_jump(5)
+  local s = new LLVMJumpInstructionBox().lower_jump(5)
   if s.contains("\"op\":\"jump\"") && s.contains("\"target\":5") { print(1) } else { print(0) }
 } }
 '
diff --git a/tools/smokes/v2/profiles/quick/core/phi/self_param_phi_vm.sh b/tools/smokes/v2/profiles/quick/core/phi/self_param_phi_vm.sh
index 35f9a638..1d5a0898 100644
--- a/tools/smokes/v2/profiles/quick/core/phi/self_param_phi_vm.sh
+++ b/tools/smokes/v2/profiles/quick/core/phi/self_param_phi_vm.sh
@@ -14,7 +14,7 @@ static box Main {
   method main() {
     local incoming = new ArrayBox()
     local item = new MapBox(); item.set("value", 1); item.set("block", 0); incoming.push(item)
-    local phi = new PhiInst.LLVMPhiInstructionBox().lower_phi(5, incoming)
+    local phi = new LLVMPhiInstructionBox().lower_phi(5, incoming)
     # 判定: 生成文字列に op":"phi が含まれるか（最小）
     if phi.contains("\"op\":\"phi\"") { print(1) } else { print(0) }
   }
diff --git a/tools/smokes/v2/profiles/quick/core/ret/self_param_ret_vm.sh b/tools/smokes/v2/profiles/quick/core/ret/self_param_ret_vm.sh
index dfe7b515..0aec6e7f 100644
--- a/tools/smokes/v2/profiles/quick/core/ret/self_param_ret_vm.sh
+++ b/tools/smokes/v2/profiles/quick/core/ret/self_param_ret_vm.sh
@@ -11,7 +11,7 @@ test_self_param_ret() {
   local src='
 using "lang/src/llvm_ir/instructions/ret.hako" as R
 static box Main { method main() {
-  local s = new R.LLVMRetInstructionBox().lower_return(7)
+  local s = new LLVMRetInstructionBox().lower_return(7)
   if s.contains("\"op\":\"ret\"") && s.contains("\"value\":7") { print(1) } else { print(0) }
 } }
 '