Revert "Modificando nomes de algumas classes"

This reverts commit ab240bf42a99bb5a0a4ff630f71249ed7715e78f.
Revert "Revert "Modificando nomes de algumas classes""

This reverts commit 9e7f22d1577a255d1c694e4a0649c54efccfc2f4.