Some access function names have been fixed.