complying with naming conventions and some doc updates
Merge pull request #185 from ozone-development/issue-184-cleanup

complying with naming conventions and some doc updates