Renamed to comply with naming convention