Some annotation and variable name changes.