Both terms are used, and one is more formal than the other, and the two characters are slightly different. I am just a bit wary of the posited link, because in actual usage the only distinction between the two terms seems to me to be only the degree of formality. Etymology does not necessarily reflect a difference in meaning. I'll look around to see if there's another source on this, and get back to you.