Rename variables and use the table helper

Follow @jmontoya recomendations.