Renamed to match module