Simon: homogenize naming

Signed-off-by: David Wagner <david@marvid.fr>