Some fixes and name changes

- I changed the name of some classes
- I fixed some bugs