Correct mistakes of naming