Improve the names of the Classes