Just making the names look the same (for easy phpunit --filter with a regex).
Merge pull request #3070 from bar/3.0-test

Just making the names look the same.