renamed the classes to more intuitive ones

[debespindola]

the style it's still bugged, but I solved the problem of classes with the same name.