Name conventions

Signed-off-by: Stefano Azzolini <lastguest@gmail.com>