Ajay | #3710 | Fixed rename for regular questionnaires