Some authors, e.g. Taylor and Wheeler in Spacetime Physics, do use the word "energy" for p0, the time component of the energy-momentum 4-vector, which is gamma times rest mass, with the appropriate scaling factor: [itex]E = p^0 = \gamma m_0 \, c^2[/itex]. They deprecate the term "relativistic mass", and give the name "mass" (="rest mass") to this vector's magnitude. For Taylor and Wheeler, [itex]E = m \,c^2[/itex], or equivalently for them [itex]E = m_0 \,c^2[/itex], means: rest energy equals mass; in a frame where the system is at rest (where its 3-momentum vanishes), the time component of its energy-momentum 4-vector equals the magnitude of its energy-momentum 4-vector.
Others do as you do and give the name "relativistic mass" to [itex]\gamma m_0 \, c^2[/itex], which Taylor and Wheeler call energy.
Someone posted link to a good article on this subject here a while ago. I thought I'd bookmarked it, but I can't find it now. I think the gist of it was that Einstein himself, except in some early papers, always made it clear that for him the famous equation meant [itex]E = m_0 \,c^2[/itex], rest energy equals mass (times the appropriate scaling factor).