rename and cleanup challangeresponse related classes