Name in rasters explicitly.

Also fix bug where not all required args were passed to the calc_chg_traj function.