Corresponding name fixes