Renamed to match naming conventions