rename and adding in valid-fors