diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go
index 1e54c40f40..9f4bafbc7f 100644
--- a/core/vm/runtime/runtime_test.go
+++ b/core/vm/runtime/runtime_test.go
@@ -494,7 +494,7 @@ func BenchmarkSimpleLoop(b *testing.B) {
 	//Execute(loopingCode, nil, &Config{
 	//	EVMConfig: vm.Config{
 	//		Debug:  true,
-	//		JSTracer: tracer,
+	//		Tracer: tracer,
 	//	}})
 	// 100M gas
 	benchmarkNonModifyingCode(100000000, staticCallIdentity, "staticcall-identity-100M", "", b)
diff --git a/eth/tracers/api.go b/eth/tracers/api.go
index 41bae92a52..dd66996d43 100644
--- a/eth/tracers/api.go
+++ b/eth/tracers/api.go
@@ -866,7 +866,7 @@ func (api *API) traceTx(ctx context.Context, message core.Message, txctx *Contex
 		go func() {
 			<-deadlineCtx.Done()
 			if deadlineCtx.Err() == context.DeadlineExceeded {
-				tracer.(*JSTracer).Stop(errors.New("execution timeout"))
+				tracer.Stop(errors.New("execution timeout"))
 			}
 		}()
 		defer cancel()
diff --git a/eth/tracers/tracer_test.go b/eth/tracers/tracer_test.go
index 6834947f05..defd12d398 100644
--- a/eth/tracers/tracer_test.go
+++ b/eth/tracers/tracer_test.go
@@ -223,7 +223,7 @@ func TestIsPrecompile(t *testing.T) {
 		t.Error(err)
 	}
 	if string(res) != "false" {
-		t.Errorf("JSTracer should not consider blake2f as precompile in byzantium")
+		t.Errorf("Tracer should not consider blake2f as precompile in byzantium")
 	}
 
 	tracer, _ = New("{addr: toAddress('0000000000000000000000000000000000000009'), res: null, step: function() { this.res = isPrecompiled(this.addr); }, fault: function() {}, result: function() { return this.res; }}", new(Context))
@@ -233,7 +233,7 @@ func TestIsPrecompile(t *testing.T) {
 		t.Error(err)
 	}
 	if string(res) != "true" {
-		t.Errorf("JSTracer should consider blake2f as precompile in istanbul")
+		t.Errorf("Tracer should consider blake2f as precompile in istanbul")
 	}
 }