Use more descriptive names for variables and definitions

Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>