Prop 8 was entirely a terminology war. Prop 8 is not magically the entire concept of gay rights. It only addressed the issue of whether California would have same sex marriage or civil unions with identical treatment.
Federal law doesn't recognize civil unions. Separate but equal is never equal.
There's no etymology war, you can keep the word "marriage", just give everyone equal rights to marry and have their marriage recognized everywhere.