Rename and add light form validation