Docs+variable name refactoring