Housekeeping: rename old params