Code Cleanup
- Changing naming conventions.