Fix bad name and fullname