Updated documentation and made property naming consistent.