Renamed PyOP2 scenario to Generic - more accurate since it is not limited to PyOP2 (forgot directory)