bug-fix commit: changed a few variable-names