New file naming convention

Signed-off-by: Helio Perroni Filho <xperroni@gmail.com>
Corrections to comments

Signed-off-by: Helio Perroni Filho <xperroni@gmail.com>