r2373 fix invalid link, rename vars for consistency