Small name fixes