Renamed to keep existing naming convention