Fix name assignment