Fixing naming issues.

Reused code, names were incorrect.