still grappling with name fixes