Fixing typo
Renaming a few files & variables.