Naming and docstring fixes.