Renamed some variables from old rafix template