Bug Fix: Conflicting variable names

Corrected a bug where Two variables that had different uses also had the
same name, creating a conflict.