US44- Refactoring Code

Marcelo Rojas: Fixed some wrong references, then I changed some name in
my class