Consistently rename vector args again. Close #33