Fix name on return objects.