Rename and factorize the verification code