Code: Variable names changed

Minor fixes.