#1101: Fix name assigning