Correct naming issues