Improve naming convention

Signed-off-by: David Fisher-Moreau <deiform87@gmail.com>