Minor method and variable name changes