Renamed to be consistent and fixed tests.