Improve naming for defs