Make some name changes because of PyLint recomendations.