Parameterize the benchmark-suite folder name/location. Fix some cut and
paste mistakes in the RC suite.