Partial: cleaner param names