@sgalineau @glazou make sure the new names are extensible, somehow.