diff --git a/cmd/ewasm/main.go b/cmd/ewasm/main.go
index 80908f44bf..05a1513179 100644
--- a/cmd/ewasm/main.go
+++ b/cmd/ewasm/main.go
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
 
-// ewasm executes eWASM modules.
+// ewasm executes ewasm modules.
 package main
 
 import (
@@ -44,9 +44,9 @@ var (
 var runCommand = cli.Command{
 	Action:      runCmd,
 	Name:        "run",
-	Usage:       "run and arbitrary eWASM module",
+	Usage:       "run and arbitrary ewasm module",
 	ArgsUsage:   "<module name> <input> <gas>",
-	Description: `The run command runs an arbitrary eWASM module.`,
+	Description: `The run command runs an arbitrary ewasm module.`,
 }
 
 func runCmd(ctx *cli.Context) error {
diff --git a/core/vm/ewasm.go b/core/vm/ewasm.go
index 29f814422a..f58835ce7b 100644
--- a/core/vm/ewasm.go
+++ b/core/vm/ewasm.go
@@ -15,7 +15,7 @@
 // along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
 
 // This file lists the EEI functions, so that they can be bound to any
-// eWASM-compatible module, as well as the types of these functions
+// ewasm-compatible module, as well as the types of these functions
 
 package vm
 
@@ -41,7 +41,7 @@ const (
 	TerminateInvalid
 )
 
-// InterpreterEWASM implements the Interpreter interface for eWASM.
+// InterpreterEWASM implements the Interpreter interface for ewasm.
 type InterpreterEWASM struct {
 	vm *exec.VM
 
@@ -60,7 +60,7 @@ type InterpreterEWASM struct {
 	staticMode bool
 }
 
-// NewEWASMInterpreter creates a new wagon-based eWASM interpreter. It
+// NewEWASMInterpreter creates a new wagon-based ewasm interpreter. It
 // currently takes a *vm.EVM pointer as a proxy to the client's internal
 // state; this will be fixed in subsequent updates.
 func NewEWASMInterpreter(evm *EVM, cfg Config) Interpreter {
diff --git a/core/vm/ewasm_eei.go b/core/vm/ewasm_eei.go
index 0ac72d906d..d4fa379836 100644
--- a/core/vm/ewasm_eei.go
+++ b/core/vm/ewasm_eei.go
@@ -15,7 +15,7 @@
 // along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
 
 // This file lists the EEI functions, so that they can be bound to any
-// eWASM-compatible module, as well as the types of these functions
+// ewasm-compatible module, as well as the types of these functions
 
 package vm