Updated documentation and naming conventions