making government types more uniform, relates to #18