The modern view is that m² = E² - p² corresponds to the first Casimir of the Poincare group - but Einstein would hate that! So I guess the only (historically correct) way is to deal with the "relativistic mass" which Einstein didn't like, too, as you can see from some remarks like the following one from a 1948 letter to Lincoln Barnett:
"It is not good to introduce the concept of the mass M = m/(1-v²/c²)½ of a body for which no clear definition can be given. It is better to introduce no other mass than 'the rest mass' m. Instead of introducing M, it is better to mention the expression for the momentum and energy of a body in motion."