Rename classes to make them more clear