updated documentation and reverted naming convention