Renamed implementations to match headers