I notice alot of people on the boards suggesting words being used incorrectly who aren't correct.
official
1.) Of or relating to an office or a post of authority: official duties.
[From Middle English, ecclesiastical officer, from Old French, from Latin officilis, an attendant of an office, from officium, duty, service. See office.]
The American Heritage Dictionary of the English Language, Fourth Edition
I believe I would say that all government officials are public servants and see no issue with using either term to refer to say your congress critter.
Also on the list is arsenal, which I notice people trying to correct others on:
1.) A governmental establishment for the storing, development, manufacturing, testing, or repairing of arms, ammunition, and other war materiel.
2.) A stock of weapons.
3.) A store or supply: an arsenal of retorts.
My gun safe is my arsenal. If you want to use battery feel free, although popular use of the word seems to suggest its more appropriate for large scale weapons and artillery.