Fixed bug with names.