Watts benchmark fixes

[jerhard]

This PR changes the name of the configurations for the watts benchmarks and separates the scalability benchmarks to a different group.