Cosmetic change of function names. Duh!