Give args names rather than reference by number

Change-Id: Idfa8a33b22268195908bb4a0f446e0d8a49f42b4