Apparently Aeris was a mistranslation of sorts, which was corrected in later games like Kingdom Hearts, but it doesn't really matter which one you use, as either is correct.
Yeah, that about covers it. And BTW, when Sephiroth or one of the SHM says "mother", they're refering to Jenova. Aeris is, most definantly, not Jenova.