corrected some namings, according to conventions
Merge pull request #2118 from vitorgalvao/correct-some-namings

corrected some namings, according to conventions