Fix variables to comply with documentation changes