Corrected name tags in forms