Redo change made in 720ebaf, rename variables for #18