Yes. Apologies for the inconsistencies. (To be pedantic, the "-um" ending is neuter, "-on" is male [god or human only]. I'm unsure if gods could be given neuter titles or not, thus the confusion.)