Actually, I'd like to make an alternate-alternate suggestion: leave the names alone, and add a tip to the in-game tips list that comments on the differences. Something like, "Energy weapons and the energy damage type are two distinct, if similarly named, notions. For example, the graviton beam (an energy weapon) does kinetic damage, while the Mjolnir cannon (a ballistic weapon) does energy damage. The graviton beam will see its damage increase from high flux levels, while the Mjolnir cannon will not."