Revert "Revert "Revert "Modificando nomes de algumas classes"""

This reverts commit 5bc9a88f867df6b5cc2916297121494a02732ed9.