various name fixes