Update name definition to use the name from the definition block

Fixes handler calling problems related to naming inconsistency.