rename function args to match convention
begin work on Actions