Minor Changes
Naming bug fixed!