My own practice in discussing the Second Amendment is to refer to those of us favoring expansive rights as "pro-civil rights." There is an abundant body of proof that the whole of the Bill of Rights was not mere happenstance, but a carefully crafted affirmation of a whole body of rights that had to be recognized to guard against the predations of government and the darker motives of those who would attempt to justify intrusion on one or more of those rights in the name of "good order."
The term, "civil rights" has often been interpreted to focus on the right of equality under the law, but I firmly believe that it accurately describes all our Constitutional rights. I am, in every respect, pro-civil rights. Those who believe that they have the individual prerogative to deny some or all of those rights are anti-civil rights.
I really think that describing our position in this manner suggests a higher purpose than simply focusing on self defense.