Better variable names.
Correct documentation to fit new output and variable names.