Some residual renaming
Sugar up :confirmation option