Fixed a few variable renaming issues.
prototyping error