Fix name assignment.

Submitted by: Andrej Zverev