complying with naming conventions and some doc updates