Correct naming errors