issue #28 - consistent var names to match the rest of the code