Well, yes. But inertial mass, gravitational mass, rest mass, effective mass etc. is all the same: just mass, right? (And historically there was also transversal mass and longitudinal mass, electromagnetic mass, relativistic mass which is still used sometimes though. Those are things of the past...