Fix adding name to entities