SIGH
I really think we are arguing over semantics... You cannot seperate energy from mass, You can say, with equal validity, that the energy or mass of an object goes to infinity as you approach C.
What you can say also is the "rest mass" is constant.