Compositions and methods of making compositions are provided for nitride- and/or oxide-modified electrode compositions. In certain embodiments, the nitride- and/or oxide-modified compositions have the general formula M1−zM′zOaF3−xNy. Such compositions may be used as bulk or surface compositions, and used in a battery as the anode or cathode. In other embodiments, the electrode includes a surface coating composition selected from metal nitrides and metal oxides, and a core composition having the formula M1−zM′zOaF3−x, or an oxide fluoride.