handle *argv names better

Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>