I'm surprised to see that not a single one of you commenters here is using mass.
In industry practice, both terms are used interchangeably, albeit incorrectly. Functionally, it matters little .. just a little "g" here and there in the equations ..
But you are quite correct, we should refer to mass. I don't see that happening across the board any time soon, though.