Updated variables files to allow more precise match