rename ntype.go and nvalue.go to type.go and value.go R=r DELTA=4295 (761 added, 2819 deleted, 715 changed) OCL=31238 CL=31276