changed some of the intrinsic's names