Fix variable names post-move in 0a0efd0