improved recovery and naming