Improve classes' name #182