doc cleanup + naming refactor