! Make sure to change variable names when copying code... (Fixes #828)

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #842 from Oldiesmann/release-2.1

! Make sure to change variable names when copying code... (Fixes #828)