Use name from definition block

Fixes handler calling problems related to naming inconsistency.