Use current 3.0 paramater names