updating type and argtype naming