Docblock changes and variable name changes