Correct names of used classes