documentation updates, naming convention and general cleanup