renamed some params to be compatible with future changes