Renamed constructor parameters to be more consistent