renamed some classes to make it more  obvious what they do