Correct errors in naming