* Uniform names

	We have a mess of names in the icall.c file, we need to sort that out.