Renamed variables in Match.java