diff --git a/src/elements/ops.rs b/src/elements/ops.rs
index 5be19e8..33527a7 100644
--- a/src/elements/ops.rs
+++ b/src/elements/ops.rs
@@ -266,7 +266,7 @@ pub enum Opcode {
     F64Max,
     F64Copysign,
 
-    I32WarpI64,
+    I32WrapI64,
     I32TruncSF32,
     I32TruncUF32,
     I32TruncSF64,
@@ -560,7 +560,7 @@ impl Deserialize for Opcode {
                 0xa5 => F64Max,
                 0xa6 => F64Copysign,
 
-                0xa7 => I32WarpI64,
+                0xa7 => I32WrapI64,
                 0xa8 => I32TruncSF32,
                 0xa9 => I32TruncUF32,
                 0xaa => I32TruncSF64,
@@ -877,7 +877,7 @@ impl Serialize for Opcode {
             F64Max => op!(writer, 0xa5),
             F64Copysign => op!(writer, 0xa6),
 
-            I32WarpI64 => op!(writer, 0xa7),
+            I32WrapI64 => op!(writer, 0xa7),
             I32TruncSF32 => op!(writer, 0xa8),
             I32TruncUF32 => op!(writer, 0xa9),
             I32TruncSF64 => op!(writer, 0xaa),
@@ -1134,7 +1134,7 @@ impl fmt::Display for Opcode {
             F64Max => write!(f, "f64.max"),
             F64Copysign => write!(f, "f64.copysign"),
 
-            I32WarpI64 => write!(f, "i32.wrap/i64"),
+            I32WrapI64 => write!(f, "i32.wrap/i64"),
             I32TruncSF32 => write!(f, "i32.trunc_s/f32"),
             I32TruncUF32 => write!(f, "i32.trunc_u/f32"),
             I32TruncSF64 => write!(f, "i32.trunc_s/f64"),
diff --git a/src/interpreter/runner.rs b/src/interpreter/runner.rs
index 2842249..609385c 100644
--- a/src/interpreter/runner.rs
+++ b/src/interpreter/runner.rs
@@ -316,7 +316,7 @@ impl Interpreter {
 			&Opcode::F64Max => Interpreter::run_max::<f64>(context),
 			&Opcode::F64Copysign => Interpreter::run_copysign::<f64>(context),
 
-			&Opcode::I32WarpI64 => Interpreter::run_wrap::<i64, i32>(context),
+			&Opcode::I32WrapI64 => Interpreter::run_wrap::<i64, i32>(context),
 			&Opcode::I32TruncSF32 => Interpreter::run_trunc_to_int::<f32, i32, i32>(context),
 			&Opcode::I32TruncUF32 => Interpreter::run_trunc_to_int::<f32, u32, i32>(context),
 			&Opcode::I32TruncSF64 => Interpreter::run_trunc_to_int::<f64, i32, i32>(context),
diff --git a/src/interpreter/tests/wabt.rs b/src/interpreter/tests/wabt.rs
index e32c507..8bb5111 100644
--- a/src/interpreter/tests/wabt.rs
+++ b/src/interpreter/tests/wabt.rs
@@ -489,7 +489,7 @@ fn call_1() {
 
 	let body2 = Opcodes::new(vec![
 		Opcode::GetLocal(1),
-		Opcode::I32WarpI64,
+		Opcode::I32WrapI64,
 		Opcode::GetLocal(0),
 		Opcode::I32Add,
 		Opcode::GetLocal(2),
@@ -2293,7 +2293,7 @@ fn convert_i32() {
 			.signature().return_type().i32().build()
 			.body().with_opcodes(Opcodes::new(vec![
 				Opcode::I64Const(-1),
-				Opcode::I32WarpI64,
+				Opcode::I32WrapI64,
 				Opcode::End,
 			])).build()
 			.build()
diff --git a/src/interpreter/validator.rs b/src/interpreter/validator.rs
index a6db4b3..eab8014 100644
--- a/src/interpreter/validator.rs
+++ b/src/interpreter/validator.rs
@@ -283,7 +283,7 @@ impl Validator {
 			&Opcode::F64Max => Validator::validate_binop(context, ValueType::F64.into()),
 			&Opcode::F64Copysign => Validator::validate_binop(context, ValueType::F64.into()),
 
-			&Opcode::I32WarpI64 => Validator::validate_cvtop(context, ValueType::I64.into(), ValueType::I32.into()),
+			&Opcode::I32WrapI64 => Validator::validate_cvtop(context, ValueType::I64.into(), ValueType::I32.into()),
 			&Opcode::I32TruncSF32 => Validator::validate_cvtop(context, ValueType::F32.into(), ValueType::I32.into()),
 			&Opcode::I32TruncUF32 => Validator::validate_cvtop(context, ValueType::F32.into(), ValueType::I32.into()),
 			&Opcode::I32TruncSF64 => Validator::validate_cvtop(context, ValueType::F64.into(), ValueType::I32.into()),
diff --git a/src/validation/func.rs b/src/validation/func.rs
index 6920b42..48148ab 100644
--- a/src/validation/func.rs
+++ b/src/validation/func.rs
@@ -281,7 +281,7 @@ impl Validator {
 			F64Max => Validator::validate_binop(context, ValueType::F64),
 			F64Copysign => Validator::validate_binop(context, ValueType::F64),
 
-			I32WarpI64 => Validator::validate_cvtop(context, ValueType::I64, ValueType::I32),
+			I32WrapI64 => Validator::validate_cvtop(context, ValueType::I64, ValueType::I32),
 			I32TruncSF32 => Validator::validate_cvtop(context, ValueType::F32, ValueType::I32),
 			I32TruncUF32 => Validator::validate_cvtop(context, ValueType::F32, ValueType::I32),
 			I32TruncSF64 => Validator::validate_cvtop(context, ValueType::F64, ValueType::I32),