Consistent naming in the tests as well