rename variables and methods in conv.py
Merge branch 'estilo-e-design' of https://github.com/loiola/Grupo2-TecProg_RadarParlamentar into estilo-e-design