Follow the naming and declaration convention

Signed-off-by: Nico Rutishauser <nr@hotmail.ch>