diff --git a/bindings/go/evmc/evmc.go b/bindings/go/evmc/evmc.go
index 24e19b8..6379c15 100644
--- a/bindings/go/evmc/evmc.go
+++ b/bindings/go/evmc/evmc.go
@@ -176,10 +176,12 @@ func (instance *Instance) Destroy() {
 }
 
 func (instance *Instance) Name() string {
+	// TODO: consider using C.evmc_vm_name(instance.handle)
 	return C.GoString(instance.handle.name)
 }
 
 func (instance *Instance) Version() string {
+	// TODO: consider using C.evmc_vm_version(instance.handle)
 	return C.GoString(instance.handle.version)
 }
 
diff --git a/include/evmc/helpers.h b/include/evmc/helpers.h
index 30d60de..f7c5fc6 100644
--- a/include/evmc/helpers.h
+++ b/include/evmc/helpers.h
@@ -28,7 +28,7 @@ static inline int evmc_is_abi_compatible(struct evmc_instance *instance)
 /**
  * Returns the name of the VM instance.
  */
-static inline const char* evmc_instance_name(struct evmc_instance *instance)
+static inline const char* evmc_vm_name(struct evmc_instance *instance)
 {
     return instance->name;
 }
@@ -36,7 +36,7 @@ static inline const char* evmc_instance_name(struct evmc_instance *instance)
 /**
  * Returns the version of the VM instance.
  */
-static inline const char* evmc_instance_version(struct evmc_instance *instance)
+static inline const char* evmc_vm_version(struct evmc_instance *instance)
 {
     return instance->version;
 }