Feature #5893 : missing to rename some stuff