fix names
name fixes