Fix name assignment/nonrequirement